Re-enable signing validation (dotnet#13899)

dougbu · web-flow · commit 4ba64f54705e · 2019-11-19T07:14:34.000-08:00
- dotnet#13864 - use latest Arcade from '.NET 3 Tools' - pick up @joeloff's dotnet#4083 signing validation fixes - update signing validation exclusions to get them working - remove custom embedded package icon bits and use Arcade approach - also switch VS.Redist.* packages to use license expressions
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -590,5 +590,4 @@ stages:
     parameters:
       # See https://github.com/dotnet/arcade/issues/2871
       enableSymbolValidation: false
-      enableSigningValidation: false
       publishInstallersAndChecksums: true
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -46,8 +46,6 @@
     <!-- Contact email address for NuGet packages and Linux installers. -->
     <MaintainerEmail>nugetaspnet@microsoft.com</MaintainerEmail>
 
-    <PackageIcon>packageIcon.png</PackageIcon>
-    <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
     <PackageProjectUrl>https://asp.net</PackageProjectUrl>
     <NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
 
@@ -56,10 +54,6 @@
     <DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
-  </ItemGroup>
-
   <!-- Warnings and errors -->
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt
@@ -1,4 +1,5 @@
-apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
-.js;; We do not sign JavaScript files.
-.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be.
-WixUIWixca|WixDepCA;; We do not sign WiX content in our installers.
+*apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
+*.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be.
+*.js;; We do not sign JavaScript files.
+*netfxca|*wixca|*wixdepca|*wixuiwixca;*.msi; We do not sign WiX content in our installers.
+*wixstdba.dll;*.exe;
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -417,17 +417,17 @@
       <Uri>https://github.com/aspnet/Extensions</Uri>
       <Sha>7dbc3ebd20c79ecf311c768be865c02ff4676836</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19474.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19530.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
+      <Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19474.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19530.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
+      <Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19474.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19530.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
+      <Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.1-servicing.19531.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -66,7 +66,7 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19474.3</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19530.2</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
diff --git a/global.json b/global.json
@@ -25,7 +25,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19474.3"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19530.2",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19530.2"
   }
 }
diff --git a/packageIcon.png b/packageIcon.png
diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj
@@ -25,7 +25,6 @@
   <ItemGroup>
     <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
     <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
@@ -2,12 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
-    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
+    $CommonFileElements$
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -23,7 +23,6 @@
     <NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
     <NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
     <NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
@@ -5,14 +5,13 @@
     <dependencies>
       <dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
     </dependencies>
-    <icon>packageIcon.png</icon>
   </metadata>
   <files>
+    $CommonFileElements$
     <file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
     <file src="build\**" target="build" />
     <file src="targets\**" target="targets" />
     <file src="$publishdir$**\*" target="tools/" />
     <file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
@@ -33,7 +33,6 @@
     <NuspecProperty Include="publishDir=$(PublishDir)" />
     <NuspecProperty Include="componentsrootdir=..\..\..\" />
     <NuspecProperty Include="blazorversion=$(PackageVersion)" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
@@ -2,12 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
-    <icon>packageIcon.png</icon>
   </metadata>
   <files>
+    $CommonFileElements$
     <file src="build\**" target="build" />
     <file src="$publishDir$**\*" target="tools" />
     <file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
@@ -15,10 +15,6 @@
     <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
   </PropertyGroup>
 
-  <ItemGroup>
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-  </ItemGroup>
-
   <ItemGroup>
     <UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
   </ItemGroup>
diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
@@ -5,13 +5,12 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
-    <icon>packageIcon.png</icon>
   </metadata>
   <files>
+    $CommonFileElements$
     <file
       src="content/**"
       exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
       target="Content" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -55,7 +55,6 @@
     <NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
     <NuspecProperty Include="AssemblyName=$(AssemblyName)" />
     <NuspecProperty Include="OutputPath=$(OutputPath)" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
@@ -15,13 +15,12 @@
         <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
-    <icon>packageIcon.png</icon>
   </metadata>
   <files>
+    $CommonFileElements$
     <file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
     <file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
     <file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
-    <file src="$PackageIcon$" target="" />
     <file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
   </files>
 </package>
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec
@@ -9,13 +9,12 @@
         <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
-    <icon>packageIcon.png</icon>
   </metadata>
   <files>
+    $CommonFileElements$
     <file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
     <file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
     <file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
-    <file src="$PackageIcon$" target="" />
     <file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
   </files>
 </package>
diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
@@ -12,7 +12,9 @@ param(
     [Parameter(Mandatory=$true)][string]$RepoRoot,
     [Parameter(Mandatory=$true)][string]$MajorVersion,
     [Parameter(Mandatory=$true)][string]$MinorVersion,
-    [Parameter(Mandatory=$true)][string]$PackageIconPath
+    [Parameter(Mandatory=$true)][string]$PackageIcon,
+    [Parameter(Mandatory=$true)][string]$PackageIconFullPath,
+    [Parameter(Mandatory=$true)][string]$PackageLicenseExpression
 )
 
 $NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture"
@@ -23,10 +25,15 @@ if (-not (Test-Path $NuGetDir)) {
 }
 
 if (-not (Test-Path $NuGetExe)) {
-    # Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016
+    # Using 5.3.0 to workaround https://github.com/NuGet/Home/issues/5016
     Write-Output "Downloading nuget.exe to $NuGetExe"
     wget https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe -OutFile $NuGetExe
 }
 
-& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PACKAGE_ICON_PATH=$PackageIconPath`;
-Exit $LastExitCode
+& $NuGetExe pack $NuspecFile `
+    -Version $PackageVersion `
+    -OutputDirectory $OutputDirectory `
+    -NoDefaultExcludes `
+    -NoPackageAnalysis `
+    -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PackageIcon=$PackageIcon`;PackageIconFullPath=$PackageIconFullPath`;PackageLicenseExpression=$PackageLicenseExpression`;
+Exit $LastExitCode
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -24,10 +24,6 @@
     <ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-  </ItemGroup>
-
   <ItemGroup>
     <WixExtension Include="WixDependencyExtension">
       <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
@@ -107,6 +103,8 @@
                       '$(RepoRoot)' ^
                       '$(AspNetCoreMajorVersion)' ^
                       '$(AspNetCoreMinorVersion)' ^
-                      '$(PackageIconFullPath)'" />
+                      '$(PackageIcon)' ^
+                      '$(PackageIconFullPath)' ^
+                      '$(PackageLicenseExpression)' " />
   </Target>
 </Project>
diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
@@ -6,16 +6,16 @@
         <title>VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
-        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
+        <license type="expression">$PackageLicenseExpression$</license>
         <projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
-        <icon>packageIcon.png</icon>
+        <icon>$PackageIcon$</icon>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
         <file src="$ASPNETCORE_CAB_FILE$" />
-        <file src="$PACKAGE_ICON_PATH$" target="" />
+        <file src="$PackageIconFullPath$" target="$PackageIcon$" />
     </files>
 </package>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
@@ -23,10 +23,6 @@
     <ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-  </ItemGroup>
-
   <ItemGroup>
     <WixExtension Include="WixDependencyExtension">
       <HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
@@ -104,6 +100,8 @@
                       '$(RepoRoot)' ^
                       '$(AspNetCoreMajorVersion)' ^
                       '$(AspNetCoreMinorVersion)' ^
-                      '$(PackageIconFullPath)'" />
+                      '$(PackageIcon)' ^
+                      '$(PackageIconFullPath)' ^
+                      '$(PackageLicenseExpression)' " />
   </Target>
 </Project>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
@@ -6,15 +6,15 @@
         <title>VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$</title>
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
-        <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
+        <license type="expression">$PackageLicenseExpression$</license>
         <projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
-        <icon>packageIcon.png</icon>
+        <icon>$PackageIcon$</icon>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     </metadata>
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
-        <file src="$PACKAGE_ICON_PATH$" target="" />
+        <file src="$PackageIconFullPath$" target="$PackageIcon$" />
     </files>
 </package>
diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
@@ -19,7 +19,6 @@
   <ItemGroup>
     <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
     <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
@@ -2,12 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
-    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
+    $CommonFileElements$
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
@@ -24,7 +24,6 @@
   <ItemGroup>
     <NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
     <NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
@@ -2,12 +2,11 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
-    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
+    $CommonFileElements$
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/ProjectTemplates/TemplateProjects.props b/src/ProjectTemplates/TemplateProjects.props
@@ -21,8 +21,4 @@
     <None Include="content/**" />
   </ItemGroup>
 
-  <ItemGroup>
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/ProjectTemplates/templates.nuspec b/src/ProjectTemplates/templates.nuspec
@@ -5,13 +5,12 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
-    <icon>packageIcon.png</icon>
   </metadata>
   <files>
+    $CommonFileElements$
     <file
       src="content/**"
       exclude="**/node_modules/**;**/bin/**;**/obj/**;**/.vs/**;**/.vscode/**;**/ClientApp/dist/**;**/wwwroot/dist/**;content/Directory.Build.*"
       target="" />
-    <file src="$PackageIcon$" target="" />
   </files>
 </package>
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj
@@ -21,6 +21,5 @@
   <ItemGroup>
     <NuspecProperty Include="baseOutputPath=$(BaseOutputPath)" />
     <NuspecProperty Include="configuration=$(Configuration)" />
-    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 </Project>
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`},`
`26`	`26`	`"msbuild-sdks": {`
`27`	`27`	`"Yarn.MSBuild": "1.15.2",`
`28`		`- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3",`
`29`		`- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19474.3"`
	`28`	`+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19530.2",`
	`29`	`+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19530.2"`
`30`	`30`	`}`
`31`	`31`	`}`