Merge pull request #14394 from aspnet/Embedded30

[release/3.0] Switch to embedded package icon

.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

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>

eng/tools/RepoTasks/RepoTasks.csproj

@@ -12,14 +12,14 @@
   </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>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">

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)"

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>

src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec

@@ -2,10 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>

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>

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" />
@@ -12,5 +13,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>

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>

src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec

@@ -2,10 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <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>

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>

src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec

@@ -5,11 +5,13 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <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>

src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

@@ -56,6 +56,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>

src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec

@@ -15,11 +15,13 @@
         <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <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>

src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec

@@ -9,11 +9,13 @@
         <dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
       </group>
     </dependencies>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <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>

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`;

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>

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>
@@ -15,5 +16,6 @@
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
         <file src="$ASPNETCORE_CAB_FILE$" />
+        <file src="$PackageIcon$" target="" />
     </files>
 </package>

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>

src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec

@@ -8,11 +8,13 @@
         <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>
     </metadata>
     <files>
         <file src="$ASPNETCORE_RUNTIME_MSI$" />
+        <file src="$PackageIcon$" target="" />
     </files>
 </package>

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>

src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec

@@ -2,10 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>

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>

src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec

@@ -2,10 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
     <file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
     <file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>

src/ProjectTemplates/TemplateProjects.props

@@ -21,4 +21,8 @@
     <None Include="content/**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
+  </ItemGroup>
+
 </Project>

src/ProjectTemplates/templates.nuspec

@@ -5,11 +5,13 @@
     <packageTypes>
       <packageType name="Template" />
     </packageTypes>
+    <icon>packageIcon.png</icon>
   </metadata>
   <files>
     <file
       src="content/**"
       exclude="**/node_modules/**;**/bin/**;**/obj/**;**/.vs/**;**/.vscode/**;**/ClientApp/dist/**;**/wwwroot/dist/**;content/Directory.Build.*"
       target="" />
+    <file src="$PackageIcon$" target="" />
   </files>
 </package>

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>

src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec

@@ -2,11 +2,13 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.8">
     $CommonMetadataElements$
+    <icon>packageIcon.png</icon>
   </metadata>
 
   <files>
     <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>

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" />

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>
@@ -11,5 +12,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>