Skip to content

Commit 2c6d7a0

Browse files
wtgodbewtgodbe
authored
Merge pull request #14602 from dotnet-maestro-bot/merge/release/3.0-to-release/3.1
[automated] Merge branch 'release/3.0' => 'release/3.1'
2 parents efc2f02 + 700f430 commit 2c6d7a0

File tree

72 files changed

+909
-1330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+909
-1330
lines changed

‎Directory.Build.props

Lines changed: 7 additions & 2 deletions
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>netcoreapp3.1</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>
@@ -86,7 +91,7 @@
8691
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
8792

8893
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
89-
<IsTargetingPackBuilding Condition="'$(IsServicingBuild)' == 'true' AND '$(DotNetBuildFromSource)' != 'true'">false</IsTargetingPackBuilding>
94+
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>
9095

9196
<!--
9297
Archives and installers using this prefix are intended for internal-use only.

‎Directory.Build.targets

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858

5959
<Import Project="eng\Baseline.Designer.props" />
6060

61-
<PropertyGroup Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' ">
61+
<PropertyGroup
62+
Condition=" '$(IsPackable)' != 'false' AND '$(AspNetCorePatchVersion)' != '0' AND '$(DisableServicingFeatures)' != 'true' ">
6263
<IsPackageInThisPatch Condition="'$(IsPackageInThisPatch)' == ''">$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
6364
</PropertyGroup>
6465

@@ -104,6 +105,12 @@
104105
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
105106
</ItemGroup>
106107

108+
<PropertyGroup Condition="'$(Language)' == 'C#'">
109+
<!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
110+
<!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
111+
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
112+
</PropertyGroup>
113+
107114
<ItemGroup>
108115
<KnownFrameworkReference Update="Microsoft.NETCore.App">
109116
<!-- Always update the 'latest version', whether the repo is servicing or not. -->

‎eng/Baseline.Designer.props

Lines changed: 473 additions & 1112 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 86 additions & 133 deletions
Large diffs are not rendered by default.

‎eng/PatchConfig.props

Lines changed: 9 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea
44
55
CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
66
When adding a new package, make sure the new line ends with a semicolon and starts with a space.
7-
Later on, this will be checked using this condition:
87
8+
Directory.Build.props checks this property using the following condition:
99
<IsPackageInThisPatch>$(PackagesInPatch.Contains(' $(PackageId);'))</IsPackageInThisPatch>
1010
-->
1111
<Project>
@@ -15,59 +15,14 @@ Later on, this will be checked using this condition:
1515

1616
<PropertyGroup Condition=" '$(VersionPrefix)' == '3.0.1' ">
1717
<PackagesInPatch>
18-
</PackagesInPatch>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.2' ">
21-
<PackagesInPatch>
22-
@aspnet/signalr;
23-
Microsoft.AspNetCore.AspNetCoreModuleV2;
24-
Microsoft.AspNetCore.Authentication.Google;
25-
Microsoft.AspNetCore.Http;
26-
Microsoft.AspNetCore.Mvc.Core;
27-
Microsoft.AspNetCore.Routing;
28-
Microsoft.AspNetCore.Server.IIS;
29-
java:signalr;
30-
</PackagesInPatch>
31-
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.4' ">
33-
<PackagesInPatch>
34-
@aspnet/signalr;
35-
Microsoft.AspNetCore.AspNetCoreModuleV2;
36-
</PackagesInPatch>
37-
</PropertyGroup>
38-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
39-
<PackagesInPatch>
40-
Microsoft.AspNetCore.AspNetCoreModule;
41-
Microsoft.AspNetCore.AspNetCoreModuleV2;
42-
Microsoft.AspNetCore.Identity.UI;
43-
java:signalr;
44-
Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
45-
Microsoft.AspNetCore.SignalR.Redis;
46-
Microsoft.AspNetCore.SignalR.StackExchangeRedis;
47-
Microsoft.AspNetCore.DataProtection.StackExchangeRedis;
48-
Microsoft.AspNetCore.Mvc.Core;
49-
Microsoft.AspNetCore.Mvc.RazorPages;
50-
Microsoft.AspNetCore.AzureAppServicesIntegration;
51-
Microsoft.AspNetCore.AzureAppServices.HostingStartup;
52-
Microsoft.AspNetCore.AzureAppServices.SiteExtension;
53-
</PackagesInPatch>
54-
</PropertyGroup>
55-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.6' ">
56-
<PackagesInPatch>
57-
Microsoft.AspNetCore.Mvc.Api.Analyzers;
58-
Microsoft.AspNetCore.Server.HttpSys;
59-
Microsoft.AspNetCore.Server.IIS;
60-
</PackagesInPatch>
61-
</PropertyGroup>
62-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
63-
<PackagesInPatch>
64-
Microsoft.AspNetCore.DataProtection.AzureStorage;
65-
Microsoft.AspNetCore.Hosting;
66-
Microsoft.AspNetCore.SpaServices;
67-
</PackagesInPatch>
68-
</PropertyGroup>
69-
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
70-
<PackagesInPatch>
18+
Microsoft.Net.Http.Headers;
19+
Microsoft.AspNetCore.CookiePolicy;
20+
Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
21+
@microsoft/signalr;
22+
Microsoft.Net.Http.Headers;
23+
Microsoft.AspNetCore.Http.Abstractions;
24+
Microsoft.AspNetCore.Http.Features;
25+
Microsoft.AspNetCore.CookiePolicy;
7126
</PackagesInPatch>
7227
</PropertyGroup>
7328
</Project>

‎eng/Versions.props

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@
2222
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
2323
<!-- Additional assembly attributes are already configured to include the source revision ID. -->
2424
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
25+
<!--
26+
Until package baselines are updated (see aspnet/AspNetCore#12702), ignore them and PatchConfig.props. This also
27+
gives us time to build the entire repo and settle the infrastructure. Do _not_ do this when stabilizing versions.
28+
-->
29+
<DisableServicingFeatures
30+
Condition=" '$(DisableServicingFeatures)' == '' AND '$(StabilizePackageVersion)' != 'true' ">true</DisableServicingFeatures>
2531
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
26-
<IsServicingBuild Condition=" '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
32+
<IsServicingBuild
33+
Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
2734
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
2835
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
2936
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>

‎eng/targets/ReferenceAssembly.targets

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
5454
<_RefSourceFileName>$(AssemblyName).$(_RefSourceFileTFM).cs</_RefSourceFileName>
55+
<_ManualRefSourceFileName>$(AssemblyName).Manual.cs</_ManualRefSourceFileName>
5556
<_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName)</_RefSourceFileOutputPath>
5657
</PropertyGroup>
5758

@@ -87,10 +88,16 @@
8788
</ItemGroup>
8889

8990
<PropertyGroup>
91+
<_ManualReferenceAssemblyContent />
92+
<_ManualReferenceAssemblyContent Condition="Exists('$(_RefSourceOutputPath)$(_ManualRefSourceFileName)')">
93+
<![CDATA[
94+
<Compile Include="$(_ManualRefSourceFileName)" />]]>
95+
</_ManualReferenceAssemblyContent>
96+
9097
<ReferencesContent>
9198
<![CDATA[
9299
<ItemGroup Condition="'%24(TargetFramework)' == '$(_RefProjectFileTFM)'">
93-
<Compile Include="$(_RefSourceFileName)" />
100+
<Compile Include="$(_RefSourceFileName)" />]]>$(_ManualReferenceAssemblyContent)<![CDATA[
94101
@(FilteredOriginalReferences->'<Reference Include="%(Identity)" />', '%0A ')
95102
</ItemGroup>
96103
]]>

‎eng/targets/ResolveReferences.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
-->
3737
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseLatestPackageReferences>
3838
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseLatestPackageReferences>
39-
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND ( '$(IsServicingBuild)' != 'true' OR '$(IsPackable)' == 'true' ) ">true</UseLatestPackageReferences>
39+
<UseLatestPackageReferences
40+
Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true</UseLatestPackageReferences>
4041
<UseLatestPackageReferences Condition=" '$(UseLatestPackageReferences)' == '' ">false</UseLatestPackageReferences>
4142

4243
<!--
@@ -45,7 +46,7 @@
4546
* when a project is a test or sample project
4647
We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible.
4748
-->
48-
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
49+
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true</UseProjectReferences>
4950
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' AND '$(IsImplementationProject)' != 'true' ">true</UseProjectReferences>
5051
<UseProjectReferences Condition=" '$(UseProjectReferences)' == '' ">false</UseProjectReferences>
5152

@@ -122,7 +123,7 @@
122123
Text="Cannot reference &quot;%(_InvalidReferenceToNonSharedFxAssembly.Identity)&quot;. This dependency is not in the shared framework. See docs/SharedFramework.md for instructions on how to modify what is in the shared framework." />
123124
</Target>
124125

125-
<Target Name="_WarnAboutRedundantRef" AfterTargets="ResolveFrameworkReferences">
126+
<Target Name="_WarnAboutRedundantRef" AfterTargets="ResolveFrameworkReferences;ProcessFrameworkReferences">
126127
<Warning Condition="@(FrameworkReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore.App')->Count()) &gt; 1"
127128
Text="Redundant &lt;FrameworkReference&gt;. If you have an explicit item in the project file, you might be able to remove it. Some SDKs, like Microsoft.NET.Sdk.Web, add this implicitly." />
128129
</Target>

‎eng/tools/BaselineGenerator/BaselineGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6-
<StartArguments>-s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</StartArguments>
6+
<StartArguments>-s https://api.nuget.org/v3/index.json</StartArguments>
77
<StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
88
</PropertyGroup>
99

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 4 additions & 4 deletions
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)' == '$(DefaultNetCoreTargetFramework)'">
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'">

‎packageIcon.png

6.84 KB
Loading

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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
<Reference Include="System.Buffers" />
2424
</ItemGroup>
2525

26+
<!-- These references were removed in 3.0 -->
27+
<ItemGroup>
28+
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.Analyzers" />
29+
<SuppressBaselineReference Include="Microsoft.AspNetCore.Authorization" />
30+
<SuppressBaselineReference Include="Microsoft.JSInterop" />
31+
<SuppressBaselineReference Include="System.ComponentModel.Annotations" />
32+
</ItemGroup>
33+
2634
<Target Name="_GetNuspecDependencyPackageVersions">
2735
<MSBuild Targets="_GetPackageVersionInfo"
2836
BuildInParallel="$(BuildInParallel)"
@@ -47,6 +55,7 @@
4755
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
4856
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
4957
<NuspecProperty Include="OutputPath=$(OutputPath)" />
58+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
5059
</ItemGroup>
5160

5261
</Project>

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

Lines changed: 2 additions & 0 deletions
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="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
2122
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
2223
<file src="$OutputPath$**\$AssemblyName$.xml" 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.netcoreapp.nuspec

Lines changed: 2 additions & 0 deletions
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="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
1516
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
1617
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
18+
<file src="$PackageIcon$" target="" />
1719
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
1820
</files>
1921
</package>

0 commit comments

Comments
 (0)