Skip to content

Commit fe6d1ce

Browse files
authored
Update the sign check to remove the exclusions but only check on sign… (#48275)
2 parents 4bbdf76 + 48364da commit fe6d1ce

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Installer/redist-installer/targets/BundledManifests.targets

+5-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@
5050
</ItemGroup>
5151

5252
<Target Name="ValidateBundledManifestSigning"
53-
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
53+
Condition=" '$(OS)' == 'Windows_NT' and
54+
'$(Architecture)' != 'arm' and
55+
$(BUILD_SOURCEBRANCH) != '' and
56+
$(BUILD_SOURCEBRANCH.Contains('release')) ">
5457
<PropertyGroup>
5558
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
5659
<SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
@@ -60,7 +63,7 @@
6063
<ItemGroup>
6164
<!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
6265
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
63-
Exclude="Microsoft.NET.Workload.Mono.ToolChain.Current;Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Mono.ToolChain.net8;Microsoft.NET.Workload.Emscripten.Current;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7;Microsoft.NET.Workload.Emscripten.net8;Microsoft.NET.Sdk.Aspire">
66+
Exclude="Microsoft.NET.Sdk.Aspire">
6467
<RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi'))))</RestoredMsiPathInNupkg>
6568
</BundledManifestsToValidateSigning>
6669

0 commit comments

Comments
 (0)