Skip to content

Commit 4ba64f5

Browse files
dougbudougbu
authored
Re-enable signing validation (#13899)
- #13864 - use latest Arcade from '.NET 3 Tools' - pick up @joeloff's #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
1 parent 7891c83 commit 4ba64f5

File tree

33 files changed

+48
-78
lines changed

33 files changed

+48
-78
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,5 +590,4 @@ stages:
590590
parameters:
591591
# See https://github.com/dotnet/arcade/issues/2871
592592
enableSymbolValidation: false
593-
enableSigningValidation: false
594593
publishInstallersAndChecksums: true

‎Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646
<!-- Contact email address for NuGet packages and Linux installers. -->
4747
<MaintainerEmail>[email protected]</MaintainerEmail>
4848

49-
<PackageIcon>packageIcon.png</PackageIcon>
50-
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
5149
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
5250
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
5351

@@ -56,10 +54,6 @@
5654
<DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
5755
</PropertyGroup>
5856

59-
<ItemGroup>
60-
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
61-
</ItemGroup>
62-
6357
<!-- Warnings and errors -->
6458
<PropertyGroup>
6559
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎eng/SignCheckExclusionsFile.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
2-
.js;; We do not sign JavaScript files.
3-
.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be.
4-
WixUIWixca|WixDepCA;; We do not sign WiX content in our installers.
1+
*apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
2+
*.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be.
3+
*.js;; We do not sign JavaScript files.
4+
*netfxca|*wixca|*wixdepca|*wixuiwixca;*.msi; We do not sign WiX content in our installers.
5+
*wixstdba.dll;*.exe;

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,17 +417,17 @@
417417
<Uri>https://github.com/aspnet/Extensions</Uri>
418418
<Sha>7dbc3ebd20c79ecf311c768be865c02ff4676836</Sha>
419419
</Dependency>
420-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19474.3">
420+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19530.2">
421421
<Uri>https://github.com/dotnet/arcade</Uri>
422-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
422+
<Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
423423
</Dependency>
424-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19474.3">
424+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19530.2">
425425
<Uri>https://github.com/dotnet/arcade</Uri>
426-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
426+
<Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
427427
</Dependency>
428-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19474.3">
428+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19530.2">
429429
<Uri>https://github.com/dotnet/arcade</Uri>
430-
<Sha>0e9ffd6464aff37aef2dc41dc2162d258f266e32</Sha>
430+
<Sha>5a666a2e3e7eadfd61ca34a0003630103a0486b0</Sha>
431431
</Dependency>
432432
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.1-servicing.19531.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
433433
<Uri>https://github.com/aspnet/Extensions</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
-->
6767
<PropertyGroup Label="Automated">
6868
<!-- Packages from dotnet/arcade -->
69-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19474.3</MicrosoftDotNetGenAPIPackageVersion>
69+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19530.2</MicrosoftDotNetGenAPIPackageVersion>
7070
<!-- Packages from dotnet/roslyn -->
7171
<MicrosoftNetCompilersToolsetPackageVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersToolsetPackageVersion>
7272
<!-- Packages from dotnet/core-setup -->

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"msbuild-sdks": {
2727
"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"
3030
}
3131
}

‎packageIcon.png

-6.84 KB
Binary file not shown.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<ItemGroup>
2626
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2727
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
28-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2928
</ItemGroup>
3029

3130
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
2424
<NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
2525
<NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
26-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
<dependencies>
66
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
77
</dependencies>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
1212
<file src="build\**" target="build" />
1313
<file src="targets\**" target="targets" />
1414
<file src="$publishdir$**\*" target="tools/" />
1515
<file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
16-
<file src="$PackageIcon$" target="" />
1716
</files>
1817
</package>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<NuspecProperty Include="publishDir=$(PublishDir)" />
3434
<NuspecProperty Include="componentsrootdir=..\..\..\" />
3535
<NuspecProperty Include="blazorversion=$(PackageVersion)" />
36-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
3736
</ItemGroup>
3837

3938
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76
<files>
7+
$CommonFileElements$
88
<file src="build\**" target="build" />
99
<file src="$publishDir$**\*" target="tools" />
1010
<file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
20-
</ItemGroup>
21-
2218
<ItemGroup>
2319
<UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
2420
</ItemGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file
1212
src="content/**"
1313
exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
1414
target="Content" />
15-
<file src="$PackageIcon$" target="" />
1615
</files>
1716
</package>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
5656
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
5757
<NuspecProperty Include="OutputPath=$(OutputPath)" />
58-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
5958
</ItemGroup>
6059

6160
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
18-
<icon>packageIcon.png</icon>
1918
</metadata>
2019
<files>
20+
$CommonFileElements$
2121
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
2222
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
2323
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
24-
<file src="$PackageIcon$" target="" />
2524
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2625
</files>
2726
</package>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1010
</group>
1111
</dependencies>
12-
<icon>packageIcon.png</icon>
1312
</metadata>
1413
<files>
14+
$CommonFileElements$
1515
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
1616
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
1717
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
18-
<file src="$PackageIcon$" target="" />
1918
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2019
</files>
2120
</package>

‎src/Installers/Windows/GenerateNugetPackageWithMsi.ps1

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ param(
1212
[Parameter(Mandatory=$true)][string]$RepoRoot,
1313
[Parameter(Mandatory=$true)][string]$MajorVersion,
1414
[Parameter(Mandatory=$true)][string]$MinorVersion,
15-
[Parameter(Mandatory=$true)][string]$PackageIconPath
15+
[Parameter(Mandatory=$true)][string]$PackageIcon,
16+
[Parameter(Mandatory=$true)][string]$PackageIconFullPath,
17+
[Parameter(Mandatory=$true)][string]$PackageLicenseExpression
1618
)
1719

1820
$NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture"
@@ -23,10 +25,15 @@ if (-not (Test-Path $NuGetDir)) {
2325
}
2426

2527
if (-not (Test-Path $NuGetExe)) {
26-
# Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016
28+
# Using 5.3.0 to workaround https://github.com/NuGet/Home/issues/5016
2729
Write-Output "Downloading nuget.exe to $NuGetExe"
2830
wget https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe -OutFile $NuGetExe
2931
}
3032

31-
& $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`;
32-
Exit $LastExitCode
33+
& $NuGetExe pack $NuspecFile `
34+
-Version $PackageVersion `
35+
-OutputDirectory $OutputDirectory `
36+
-NoDefaultExcludes `
37+
-NoPackageAnalysis `
38+
-Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PackageIcon=$PackageIcon`;PackageIconFullPath=$PackageIconFullPath`;PackageLicenseExpression=$PackageLicenseExpression`;
39+
Exit $LastExitCode

‎src/Installers/Windows/SharedFramework/SharedFramework.wixproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec</ToolsetInstallerNuspecFile>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
29-
</ItemGroup>
30-
3127
<ItemGroup>
3228
<WixExtension Include="WixDependencyExtension">
3329
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
@@ -107,6 +103,8 @@
107103
'$(RepoRoot)' ^
108104
'$(AspNetCoreMajorVersion)' ^
109105
'$(AspNetCoreMinorVersion)' ^
110-
'$(PackageIconFullPath)'" />
106+
'$(PackageIcon)' ^
107+
'$(PackageIconFullPath)' ^
108+
'$(PackageLicenseExpression)' " />
111109
</Target>
112110
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
<title>VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
9-
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
9+
<license type="expression">$PackageLicenseExpression$</license>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11-
<icon>packageIcon.png</icon>
11+
<icon>$PackageIcon$</icon>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1313
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1414
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1515
</metadata>
1616
<files>
1717
<file src="$ASPNETCORE_RUNTIME_MSI$" />
1818
<file src="$ASPNETCORE_CAB_FILE$" />
19-
<file src="$PACKAGE_ICON_PATH$" target="" />
19+
<file src="$PackageIconFullPath$" target="$PackageIcon$" />
2020
</files>
2121
</package>

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
<ToolsetInstallerNuspecFile>$(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec</ToolsetInstallerNuspecFile>
2424
</PropertyGroup>
2525

26-
<ItemGroup>
27-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
28-
</ItemGroup>
29-
3026
<ItemGroup>
3127
<WixExtension Include="WixDependencyExtension">
3228
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
@@ -104,6 +100,8 @@
104100
'$(RepoRoot)' ^
105101
'$(AspNetCoreMajorVersion)' ^
106102
'$(AspNetCoreMinorVersion)' ^
107-
'$(PackageIconFullPath)'" />
103+
'$(PackageIcon)' ^
104+
'$(PackageIconFullPath)' ^
105+
'$(PackageLicenseExpression)' " />
108106
</Target>
109107
</Project>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<title>VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$</title>
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
9-
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
9+
<license type="expression">$PackageLicenseExpression$</license>
1010
<projectUrl>https://github.com/aspnet/aspnetcore</projectUrl>
11-
<icon>packageIcon.png</icon>
11+
<icon>$PackageIcon$</icon>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1313
<description>$MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption</description>
1414
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1515
</metadata>
1616
<files>
1717
<file src="$ASPNETCORE_RUNTIME_MSI$" />
18-
<file src="$PACKAGE_ICON_PATH$" target="" />
18+
<file src="$PackageIconFullPath$" target="$PackageIcon$" />
1919
</files>
2020
</package>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<ItemGroup>
2020
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2121
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
22-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2322
</ItemGroup>
2423

2524
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<ItemGroup>
2525
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2626
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
27-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2827
</ItemGroup>
2928

3029
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5-
<icon>packageIcon.png</icon>
65
</metadata>
76

87
<files>
8+
$CommonFileElements$
99
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
1010
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11-
<file src="$PackageIcon$" target="" />
1211
</files>
1312
</package>

‎src/ProjectTemplates/TemplateProjects.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,4 @@
2121
<None Include="content/**" />
2222
</ItemGroup>
2323

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

‎src/ProjectTemplates/templates.nuspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8-
<icon>packageIcon.png</icon>
98
</metadata>
109
<files>
10+
$CommonFileElements$
1111
<file
1212
src="content/**"
1313
exclude="**/node_modules/**;**/bin/**;**/obj/**;**/.vs/**;**/.vscode/**;**/ClientApp/dist/**;**/wwwroot/dist/**;content/Directory.Build.*"
1414
target="" />
15-
<file src="$PackageIcon$" target="" />
1615
</files>
1716
</package>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
<ItemGroup>
2222
<NuspecProperty Include="baseOutputPath=$(BaseOutputPath)" />
2323
<NuspecProperty Include="configuration=$(Configuration)" />
24-
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2524
</ItemGroup>
2625
</Project>

0 commit comments

Comments
 (0)