Skip to content

Commit f05087b

Browse files
wtgodbewtgodbe
authored
Merge pull request #14394 from aspnet/Embedded30
[release/3.0] Switch to embedded package icon
2 parents c36b12b + fa21e53 commit f05087b

31 files changed

+64
-9
lines changed

‎.azure/pipelines/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ stages:
535535
# For the purpose of building Linux distros, we can't depend on features of the SDK
536536
# which may not exist in pre-built versions of the SDK
537537
# Pinning to preview 8 since preview 9 has breaking changes
538-
version: 3.0.100-preview8-013656
538+
version: 3.0.100
539539
installationPath: $(DotNetCoreSdkDir)
540540
includePreviewVersions: true
541541
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false

‎Directory.Build.props

+6-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<!-- Contact email address for NuGet packages and Linux installers. -->
4747
<MaintainerEmail>[email protected]</MaintainerEmail>
4848

49-
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
49+
<PackageIcon>packageIcon.png</PackageIcon>
50+
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
5051
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
5152
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
5253

@@ -55,6 +56,10 @@
5556
<DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
5657
</PropertyGroup>
5758

59+
<ItemGroup>
60+
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
61+
</ItemGroup>
62+
5863
<!-- Warnings and errors -->
5964
<PropertyGroup>
6065
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎eng/tools/RepoTasks/RepoTasks.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="NuGet.Build.Tasks" Version="5.1.0-rtm.5921" />
15+
<PackageReference Include="NuGet.Build.Tasks" Version="5.3.0" />
1616
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
20-
<PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
21-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
22-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
20+
<PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
21+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
22+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview8-013656"
3+
"version": "3.0.100"
44
},
55
"tools": {
6-
"dotnet": "3.0.100-preview8-013656",
6+
"dotnet": "3.0.100",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppRuntimeVersion)"

‎packageIcon.png

6.84 KB
Loading

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<ItemGroup>
2626
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2727
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
28+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2829
</ItemGroup>
2930

3031
</Project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67

78
<files>
89
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
910
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11+
<file src="$PackageIcon$" target="" />
1012
</files>
1113
</package>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
2424
<NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
2525
<NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
26+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec

+2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
<dependencies>
66
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
77
</dependencies>
8+
<icon>packageIcon.png</icon>
89
</metadata>
910
<files>
1011
<file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
1112
<file src="build\**" target="build" />
1213
<file src="targets\**" target="targets" />
1314
<file src="$publishdir$**\*" target="tools/" />
1415
<file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
16+
<file src="$PackageIcon$" target="" />
1517
</files>
1618
</package>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<NuspecProperty Include="publishDir=$(PublishDir)" />
3434
<NuspecProperty Include="componentsrootdir=..\..\..\" />
3535
<NuspecProperty Include="blazorversion=$(PackageVersion)" />
36+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
3637
</ItemGroup>
3738

3839
</Project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67
<files>
78
<file src="build\**" target="build" />
89
<file src="$publishDir$**\*" target="tools" />
910
<file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
11+
<file src="$PackageIcon$" target="" />
1012
</files>
1113
</package>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1616
</PropertyGroup>
1717

18+
<ItemGroup>
19+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
20+
</ItemGroup>
21+
1822
<ItemGroup>
1923
<UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
2024
</ItemGroup>

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

+2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8+
<icon>packageIcon.png</icon>
89
</metadata>
910
<files>
1011
<file
1112
src="content/**"
1213
exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
1314
target="Content" />
15+
<file src="$PackageIcon$" target="" />
1416
</files>
1517
</package>

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

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<NuspecProperty Include="OutputBinary=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).dll" />
5757
<NuspecProperty Include="OutputSymbol=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).pdb" />
5858
<NuspecProperty Include="OutputDocumentation=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).xml" />
59+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
5960
</ItemGroup>
6061

6162
</Project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
18+
<icon>packageIcon.png</icon>
1819
</metadata>
1920
<files>
2021
<file src="$OutputBinary$" target="lib\" />
2122
<file src="$OutputDocumentation$" target="lib\" />
2223
<file src="$OutputSymbol$" target="lib\" />
24+
<file src="$PackageIcon$" target="" />
2325
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2426
</files>
2527
</package>

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

+2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1010
</group>
1111
</dependencies>
12+
<icon>packageIcon.png</icon>
1213
</metadata>
1314
<files>
1415
<file src="$OutputBinary$" target="lib\" />
1516
<file src="$OutputDocumentation$" target="lib\" />
1617
<file src="$OutputSymbol$" target="lib\" />
18+
<file src="$PackageIcon$" target="" />
1719
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
1820
</files>
1921
</package>

‎src/Installers/Windows/GenerateNugetPackageWithMsi.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (-not (Test-Path $NuGetDir)) {
2424
if (-not (Test-Path $NuGetExe)) {
2525
# Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016
2626
Write-Output "Downloading nuget.exe to $NuGetExe"
27-
wget https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe -OutFile $NuGetExe
27+
wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $NuGetExe
2828
}
2929

3030
& $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

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
2525
</PropertyGroup>
2626

27+
<ItemGroup>
28+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
29+
</ItemGroup>
30+
2731
<ItemGroup>
2832
<WixExtension Include="WixDependencyExtension">
2933
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>

‎src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
<owners>Microsoft</owners>
99
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11+
<icon>packageIcon.png</icon>
1112
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1213
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1314
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1415
</metadata>
1516
<files>
1617
<file src="$ASPNETCORE_RUNTIME_MSI$" />
1718
<file src="$ASPNETCORE_CAB_FILE$" />
19+
<file src="$PackageIcon$" target="" />
1820
</files>
1921
</package>

‎src/Installers/Windows/TargetingPack/TargetingPack.wixproj

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
2323
</PropertyGroup>
2424

25+
<ItemGroup>
26+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
27+
</ItemGroup>
28+
2529
<ItemGroup>
2630
<WixExtension Include="WixDependencyExtension">
2731
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>

‎src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec

+2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
<owners>Microsoft</owners>
99
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11+
<icon>packageIcon.png</icon>
1112
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1213
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1314
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1415
</metadata>
1516
<files>
1617
<file src="$ASPNETCORE_RUNTIME_MSI$" />
18+
<file src="$PackageIcon$" target="" />
1719
</files>
1820
</package>

‎src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ItemGroup>
2020
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2121
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
22+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2223
</ItemGroup>
2324

2425
</Project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67

78
<files>
89
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
910
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11+
<file src="$PackageIcon$" target="" />
1012
</files>
1113
</package>

‎src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<ItemGroup>
2525
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2626
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
27+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2728
</ItemGroup>
2829

2930
</Project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67

78
<files>
89
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
910
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11+
<file src="$PackageIcon$" target="" />
1012
</files>
1113
</package>

‎src/ProjectTemplates/TemplateProjects.props

+4
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@
2121
<None Include="content/**" />
2222
</ItemGroup>
2323

24+
<ItemGroup>
25+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
26+
</ItemGroup>
27+
2428
</Project>

‎src/ProjectTemplates/templates.nuspec

+2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8+
<icon>packageIcon.png</icon>
89
</metadata>
910
<files>
1011
<file
1112
src="content/**"
1213
exclude="**/node_modules/**;**/bin/**;**/obj/**;**/.vs/**;**/.vscode/**;**/ClientApp/dist/**;**/wwwroot/dist/**;content/Directory.Build.*"
1314
target="" />
15+
<file src="$PackageIcon$" target="" />
1416
</files>
1517
</package>

‎src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
<ItemGroup>
2222
<NuspecProperty Include="baseOutputPath=$(BaseOutputPath)" />
2323
<NuspecProperty Include="configuration=$(Configuration)" />
24+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2425
</ItemGroup>
2526
</Project>

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

+2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.8">
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67

78
<files>
89
<file src="build\*" target="build" />
910
<file src="buildMultiTargeting\*" target="buildMultiTargeting" />
1011
<file src="$baseOutputPath$\$configuration$\netstandard2.0\Microsoft.Extensions.ApiDescription.Client.*" target="tasks\netstandard2.0" />
12+
<file src="$PackageIcon$" target="" />
1113
</files>
1214
</package>

‎src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<ItemGroup>
3131
<NuspecProperty Include="artifactsBinDir=$(ArtifactsBinDir)" />
3232
<NuspecProperty Include="configuration=$(Configuration)" />
33+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
3334
</ItemGroup>
3435

3536
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

‎src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.8">
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67

78
<files>
@@ -11,5 +12,6 @@
1112
<file src="$artifactsBinDir$\GetDocumentInsider\$configuration$\net461\*.*" target="tools\net461" />
1213
<file src="$artifactsBinDir$\GetDocumentInsider\x86\$configuration$\net461\*.*" target="tools\net461-x86" />
1314
<file src="$artifactsBinDir$\GetDocumentInsider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
15+
<file src="$PackageIcon$" target="" />
1416
</files>
1517
</package>

0 commit comments

Comments
 (0)