From ff61a43031735f743da37b8619781079b222ce1d Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Mon, 23 Sep 2019 16:06:43 -0700
Subject: [PATCH 1/9] Merge branches

---
 Directory.Build.props                            |   7 ++++++-
 packageIcon.png                                  | Bin 0 -> 7006 bytes
 .../src/Microsoft.AspNetCore.Analyzers.csproj    |   1 +
 .../src/Microsoft.AspNetCore.Analyzers.nuspec    |   1 +
 .../src/Microsoft.AspNetCore.Blazor.Build.csproj |   1 +
 .../src/Microsoft.AspNetCore.Blazor.Build.nuspec |   1 +
 .../Microsoft.AspNetCore.Blazor.DevServer.csproj |   1 +
 .../Microsoft.AspNetCore.Blazor.DevServer.nuspec |   1 +
 .../Microsoft.AspNetCore.Blazor.Templates.csproj |   4 ++++
 .../Microsoft.AspNetCore.Blazor.Templates.nuspec |   1 +
 .../src/Microsoft.AspNetCore.Components.csproj   |   1 +
 ...soft.AspNetCore.Components.multitarget.nuspec |   1 +
 ...ft.AspNetCore.Components.netcoreapp3.0.nuspec |   1 +
 .../SharedFramework/SharedFramework.wixproj      |   4 ++++
 .../SharedFrameworkPackage.nuspec                |   1 +
 .../Windows/TargetingPack/TargetingPack.wixproj  |   4 ++++
 .../TargetingPack/TargetingPackPackage.nuspec    |   1 +
 .../Microsoft.AspNetCore.Mvc.Analyzers.csproj    |   1 +
 .../Microsoft.AspNetCore.Mvc.Analyzers.nuspec    |   1 +
 ...Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj |   1 +
 ...Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec |   1 +
 src/ProjectTemplates/TemplateProjects.props      |   4 ++++
 src/ProjectTemplates/templates.nuspec            |   1 +
 ...osoft.Extensions.ApiDescription.Client.csproj |   1 +
 ...osoft.Extensions.ApiDescription.Client.nuspec |   1 +
 ...osoft.Extensions.ApiDescription.Server.csproj |   1 +
 ...osoft.Extensions.ApiDescription.Server.nuspec |   1 +
 27 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 packageIcon.png

diff --git a/Directory.Build.props b/Directory.Build.props
index 66e5b316b19a..e1bf86d4e1a6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -46,7 +46,8 @@
     <!-- Contact email address for NuGet packages and Linux installers. -->
     <MaintainerEmail>nugetaspnet@microsoft.com</MaintainerEmail>
 
-    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
+    <PackageIcon>packageIcon.png</PackageIcon>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
     <PackageProjectUrl>https://asp.net</PackageProjectUrl>
     <NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
 
@@ -55,6 +56,10 @@
     <DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
   <!-- Warnings and errors -->
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/packageIcon.png b/packageIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f1fdbf4d5eae0e561018cccee74f6a454cdb9c
GIT binary patch
literal 7006
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

literal 0
HcmV?d00001

diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj
index feec3324be12..cc4201ca795e 100644
--- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj
+++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj
@@ -25,6 +25,7 @@
   <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
index f906ece2170b..0780ae588d35 100644
--- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
+++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
@@ -7,5 +7,6 @@
   <files>
     <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
index adfa71ef6b33..aa5a484bf540 100644
--- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
+++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
@@ -23,6 +23,7 @@
     <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
index ab73599f0b4c..56fee600d30e 100644
--- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
+++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
@@ -12,5 +12,6 @@
     <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
index b12f55ef829e..3862555a0e6b 100644
--- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
+++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj
@@ -33,6 +33,7 @@
     <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
index 5142ba2080b8..48e4e8b238ea 100644
--- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
+++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
@@ -7,5 +7,6 @@
     <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
index c91a32128d65..640d8f21d07c 100644
--- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
+++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj
@@ -15,6 +15,10 @@
     <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
index 70b93d725348..babb09b520b1 100644
--- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
+++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
@@ -11,5 +11,6 @@
       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
index a7ad3493c95f..8d5bf5328e12 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -48,6 +48,7 @@
     <NuspecProperty Include="OutputBinary=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).dll" />
     <NuspecProperty Include="OutputSymbol=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).pdb" />
     <NuspecProperty Include="OutputDocumentation=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).xml" />
+    <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
index 6324ea3136f5..14934a1d7695 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
@@ -20,6 +20,7 @@
     <file src="$OutputBinary$" target="lib\" />
     <file src="$OutputDocumentation$" target="lib\" />
     <file src="$OutputSymbol$" 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
index 8dec24f27084..615d24fbdca9 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec
@@ -14,6 +14,7 @@
     <file src="$OutputBinary$" target="lib\" />
     <file src="$OutputDocumentation$" target="lib\" />
     <file src="$OutputSymbol$" 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/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index 4752953ec283..afb754e2dd19 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -24,6 +24,10 @@
     <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>
diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
index b5b8c43d9e97..ecbdf5d60c81 100644
--- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
+++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
@@ -15,5 +15,6 @@
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
         <file src="$ASPNETCORE_CAB_FILE$" />
+        <file src="$PackageIcon$" target="" />
     </files>
 </package>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
index d8b2b051af3a..80065cb692b9 100644
--- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
+++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
@@ -22,6 +22,10 @@
     <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>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
index d5ef9a2069ad..10301e289f49 100644
--- a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
+++ b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
@@ -14,5 +14,6 @@
     </metadata>
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
+        <file src="$PackageIcon$" target="" />
     </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
index 2ece75d8d884..b098c7cad2f0 100644
--- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
+++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
@@ -19,6 +19,7 @@
   <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
index f906ece2170b..0780ae588d35 100644
--- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
+++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
@@ -7,5 +7,6 @@
   <files>
     <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
index d3a6e138f18e..0ae605cb69fb 100644
--- 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,6 +24,7 @@
   <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
index f906ece2170b..0780ae588d35 100644
--- 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
@@ -7,5 +7,6 @@
   <files>
     <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
index 8cfab01c93f1..fd6dc06fe49f 100644
--- a/src/ProjectTemplates/TemplateProjects.props
+++ b/src/ProjectTemplates/TemplateProjects.props
@@ -21,4 +21,8 @@
     <None Include="content/**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ProjectTemplates/templates.nuspec b/src/ProjectTemplates/templates.nuspec
index 8e85ee528c04..f603e4757c08 100644
--- a/src/ProjectTemplates/templates.nuspec
+++ b/src/ProjectTemplates/templates.nuspec
@@ -11,5 +11,6 @@
       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
index c50a0115fa5c..cef31805dba1 100644
--- 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,5 +21,6 @@
   <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
index 23d654d1684a..20e8384e0c0f 100644
--- a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
@@ -8,5 +8,6 @@
     <file src="build\*" target="build" />
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
     <file src="$baseOutputPath$\$configuration$\netstandard2.0\Microsoft.Extensions.ApiDescription.Client.*" target="tasks\netstandard2.0" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>
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
index e0d39cff01fc..c4c5f3aa7ff8 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
@@ -30,6 +30,7 @@
   <ItemGroup>
     <NuspecProperty Include="artifactsBinDir=$(ArtifactsBinDir)" />
     <NuspecProperty Include="configuration=$(Configuration)" />
+    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
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
index 2ffc3b4f87dc..7fe0e38e9355 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
@@ -11,5 +11,6 @@
     <file src="$artifactsBinDir$\GetDocumentInsider\$configuration$\net461\*.*" target="tools\net461" />
     <file src="$artifactsBinDir$\GetDocumentInsider\x86\$configuration$\net461\*.*" target="tools\net461-x86" />
     <file src="$artifactsBinDir$\GetDocumentInsider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>

From 8c49f8937dfa60a10bad4b327b9a3de57a0527ef Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Tue, 24 Sep 2019 13:31:51 -0700
Subject: [PATCH 2/9] Add icon metadata to manually generated .nuspecs

---
 .../Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec          | 1 +
 .../Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec    | 1 +
 .../DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec   | 1 +
 .../Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec   | 1 +
 .../src/Microsoft.AspNetCore.Components.multitarget.nuspec       | 1 +
 .../src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec     | 1 +
 .../Windows/SharedFramework/SharedFrameworkPackage.nuspec        | 1 +
 src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec | 1 +
 .../Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec  | 1 +
 .../src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec            | 1 +
 src/ProjectTemplates/templates.nuspec                            | 1 +
 .../src/Microsoft.Extensions.ApiDescription.Client.nuspec        | 1 +
 .../src/Microsoft.Extensions.ApiDescription.Server.nuspec        | 1 +
 13 files changed, 13 insertions(+)

diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
index 0780ae588d35..106615a7daa3 100644
--- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
+++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
index 56fee600d30e..feffe95c5069 100644
--- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
+++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
@@ -5,6 +5,7 @@
     <dependencies>
       <dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
index 48e4e8b238ea..b59725fc14f3 100644
--- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
+++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="build\**" target="build" />
diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
index babb09b520b1..cde7bc4c1fdb 100644
--- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
+++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec
@@ -5,6 +5,7 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
index 14934a1d7695..941b82323b1b 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec
@@ -15,6 +15,7 @@
         <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="$OutputBinary$" target="lib\" />
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec
index 615d24fbdca9..d218582bba03 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec
@@ -9,6 +9,7 @@
         <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file src="$OutputBinary$" target="lib\" />
diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
index ecbdf5d60c81..e0deb1cb9fa9 100644
--- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
+++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec
@@ -8,6 +8,7 @@
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
+        <icon>packageIcon.png</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>
diff --git a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
index 10301e289f49..c1b74d268967 100644
--- a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
+++ b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec
@@ -8,6 +8,7 @@
         <owners>Microsoft</owners>
         <licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
         <projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
+        <icon>packageIcon.png</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>
diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
index 0780ae588d35..106615a7daa3 100644
--- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
+++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
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
index 0780ae588d35..106615a7daa3 100644
--- 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,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
diff --git a/src/ProjectTemplates/templates.nuspec b/src/ProjectTemplates/templates.nuspec
index f603e4757c08..49a1d320ecce 100644
--- a/src/ProjectTemplates/templates.nuspec
+++ b/src/ProjectTemplates/templates.nuspec
@@ -5,6 +5,7 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file
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
index 20e8384e0c0f..ce25cc5f9302 100644
--- a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.8">
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
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
index 7fe0e38e9355..2839a1d0b2c0 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
@@ -2,6 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.8">
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>

From 4e72e6692ad6cecf6e2e5e2218b250bd663c4bd1 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Tue, 24 Sep 2019 15:59:26 -0700
Subject: [PATCH 3/9] Update to GA SDK

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index dcba24801fe8..80ff5760c48d 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "3.0.100-preview8-013656"
+    "version": "3.0.100"
   },
   "tools": {
-    "dotnet": "3.0.100-preview8-013656",
+    "dotnet": "3.0.100",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppRuntimeVersion)"

From f20a4143de1877d0a98c0d831480e6d9ca6b1d4a Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 25 Sep 2019 15:55:47 -0700
Subject: [PATCH 4/9] Update to stable SDK in source build

---
 .azure/pipelines/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index ca0ef63a15a6..01b33000069d 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -535,7 +535,7 @@ stages:
         # For the purpose of building Linux distros, we can't depend on features of the SDK
         # which may not exist in pre-built versions of the SDK
         # Pinning to preview 8 since preview 9 has breaking changes
-        version: 3.0.100-preview8-013656
+        version: 3.0.100
         installationPath: $(DotNetCoreSdkDir)
         includePreviewVersions: true
     - script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false

From 86e9b45aa00da85094de2bf35f6af8a5d786496d Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 26 Sep 2019 12:53:59 -0700
Subject: [PATCH 5/9] Use up-to-date nuget versions

---
 eng/tools/RepoTasks/RepoTasks.csproj                   | 2 +-
 src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 0bf6be98ae93..6e0baa292f05 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Build.Tasks" Version="5.1.0-rtm.5921" />
+    <PackageReference Include="NuGet.Build.Tasks" Version="5.3.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
   </ItemGroup>
 
diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
index f4171751f67a..4c1c4970dc82 100644
--- a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
+++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1
@@ -24,7 +24,7 @@ if (-not (Test-Path $NuGetDir)) {
 if (-not (Test-Path $NuGetExe)) {
     # Using 3.5.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/v3.5.0/nuget.exe -OutFile $NuGetExe
+    wget https://dist.nuget.org/win-x86-commandline/latest/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`;

From ac691731677064e31bf4011c692fc492e4a123c0 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 26 Sep 2019 13:36:19 -0700
Subject: [PATCH 6/9] Update MSBuild deps

---
 eng/tools/RepoTasks/RepoTasks.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 6e0baa292f05..48c529fdd8de 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">

From 14eb9e3325894d6413102220b15ef565a0757097 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Fri, 27 Sep 2019 11:10:52 -0700
Subject: [PATCH 7/9] Temporarily try usi a preview9 sdk

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 80ff5760c48d..b8e9d668a964 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "3.0.100"
+    "version": "3.0.100-preview9-013918"
   },
   "tools": {
-    "dotnet": "3.0.100",
+    "dotnet": "3.0.100-preview9-013918",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppRuntimeVersion)"

From cad19885729d8efd29b2cde4b6db2be4336fdd16 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Fri, 27 Sep 2019 12:49:10 -0700
Subject: [PATCH 8/9] Newer SDK

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index b8e9d668a964..321b11a5cad4 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "3.0.100-preview9-013918"
+    "version": "3.0.100-preview9-014000"
   },
   "tools": {
-    "dotnet": "3.0.100-preview9-013918",
+    "dotnet": "3.0.100-preview9-014000",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppRuntimeVersion)"

From fa21e53dd9fa7f2dba385a0490fe7f17ef662572 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Tue, 1 Oct 2019 11:01:22 -0700
Subject: [PATCH 9/9] Revert to GA SDK

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global.json b/global.json
index 321b11a5cad4..80ff5760c48d 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "3.0.100-preview9-014000"
+    "version": "3.0.100"
   },
   "tools": {
-    "dotnet": "3.0.100-preview9-014000",
+    "dotnet": "3.0.100",
     "runtimes": {
       "dotnet/x64": [
         "$(MicrosoftNETCoreAppRuntimeVersion)"