Merge in 'release/2.1' changes

build/SharedFx.targets

@@ -402,26 +402,19 @@
       <SymbolsPackageId>runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix)</SymbolsPackageId>
     </PropertyGroup>
 
-    <ItemGroup>
-      <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" />
-      <SymbolFiles Include="@(_SymbolFiles)">
-        <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
-      </SymbolFiles>
-    </ItemGroup>
-
     <!-- Create Layout -->
     <Copy
-      SourceFiles="$(_TemplatesDir)SharedFxSymbols\SharedFrameworkSymbols.nuspec"
+      SourceFiles="$(_TemplatesDir)SharedFxSymbols\SharedFrameworkSymbols.csproj"
-      DestinationFiles="$(SymbolsWorkDir)$(SymbolsPackageId).nuspec"
+      DestinationFiles="$(SymbolsWorkDir)$(SymbolsPackageId).csproj"
       OverwriteReadOnlyFiles="True" />
 
     <!-- Produce symbols nupkg -->
-    <PackNuspec NuspecPath="$(SymbolsWorkDir)$(SymbolsPackageId).nuspec"
+    <MSBuild Projects="$(SymbolsWorkDir)$(SymbolsPackageId).csproj"
-      OutputPath="$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))symbols\$(SymbolsPackageId).$(PackageVersion).symbols.nupkg"
+                Targets="Restore;Pack"
-      Properties="version=$(PackageVersion);id=$(SymbolsPackageId);description=$(Description);Configuration=$(Configuration)"
+                Properties="SymbolsWorkDir=$(SymbolsWorkDir);PackageId=$(SymbolsPackageId);PackageVersion=$(PackageVersion);PackageOutputPath=$(IntermediateDir);PackageDescription=$(Description)" />
-      Overwrite="true"
+    <Copy
-      PackageFiles="@(SymbolFiles)"
+      SourceFiles="$(IntermediateDir)$(SymbolsPackageId).$(PackageVersion).symbols.nupkg"
-      BasePath="$(SymbolsWorkDir)" />
+      DestinationFolder="$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))symbols\" />
   </Target>
 
   <Target Name="PackSharedFx" DependsOnTargets="DefineSharedFxPrerequisites" >

build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.csproj

@@ -0,0 +1,30 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <Authors>Microsoft</Authors>
+    <Copyright>Copyright © Microsoft Corporation</Copyright>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</PackageLicenseUrl>
+    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageProjectUrl>https://asp.net</PackageProjectUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageTags>aspnetcore</PackageTags>
+    <ContentTargetFolders></ContentTargetFolders>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" />
+    <Content Include="@(_SymbolFiles)">
+      <PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
+    </Content>
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <Target Name="Compile" />
+  <Target Name="CopyFilesToOutputDirectory" />
+
+</Project>

build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>$ID$</id>
-    <version>$VERSION$</version>
-    <description>$DESCRIPTION$</description>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <copyright>Copyright © Microsoft Corporation</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</licenseUrl>
-    <iconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <projectUrl>https://asp.net</projectUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <serviceable Condition="'$(Configuration)' == 'Release'">true</serviceable>
-    <tags>aspnetcore</tags>
-  </metadata>
-  <files />
-</package>