Verify that workload manifest MSIs are signed
This commit is contained in:
parent
590cbca7ea
commit
2f331cfbc4
2 changed files with 35 additions and 2 deletions
|
@ -22,7 +22,7 @@
|
|||
<MsiNupkgId>%(Identity).Manifest-%(FeatureBand).Msi.$(MsiArchitectureForWorkloadManifests)</MsiNupkgId>
|
||||
<RestoredNupkgContentPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower())</RestoredNupkgContentPath>
|
||||
<RestoredMsiNupkgContentPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(MsiNupkgId)', '').ToLower())/$([MSBuild]::ValueOrDefault('%(Version)', '').ToLower())</RestoredMsiNupkgContentPath>
|
||||
<RestoredMsiPathInNupkg>%(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi</RestoredMsiPathInNupkg>
|
||||
<RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath('%(RestoredMsiNupkgContentPath)/data/%(NupkgId).%(Version)-$(MsiArchitectureForWorkloadManifests).msi'))</RestoredMsiPathInNupkg>
|
||||
</BundledManifests>
|
||||
</ItemGroup>
|
||||
|
||||
|
@ -37,8 +37,40 @@
|
|||
<PackageDownload Include="@(BundledManifests->'%(MsiNupkgId)')" >
|
||||
<Version>[%(Version)]</Version>
|
||||
</PackageDownload>
|
||||
|
||||
<PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="ValidateBundledManifestSigning"
|
||||
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
|
||||
|
||||
<PropertyGroup>
|
||||
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
|
||||
<SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
|
||||
<SignCheckErrorLog Condition="'$(SignCheckErrorLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.errors.log</SignCheckErrorLog>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifests->'%(RestoredMsiPathInNupkg)')" />
|
||||
</ItemGroup>
|
||||
|
||||
<Exec Command="$(SignCheckExe) ^
|
||||
--recursive ^
|
||||
-f UnsignedFiles ^
|
||||
-i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^
|
||||
-l $(SignCheckLog) ^
|
||||
-e $(SignCheckErrorLog)" />
|
||||
|
||||
<Error
|
||||
Text="Signing validation failed for workload manifest MSI. Check $(SignCheckErrorLog) for more information."
|
||||
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
|
||||
|
||||
<Message
|
||||
Text="##vso[artifact.upload containerfolder=LogFiles;artifactname=LogFiles]{SignCheckErrorLog}"
|
||||
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
|
||||
|
||||
</Target>
|
||||
|
||||
<Target Name="LayoutManifests"
|
||||
DependsOnTargets="SetupBundledComponents">
|
||||
|
||||
|
|
|
@ -280,7 +280,8 @@
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="GenerateWorkloadManifestsWxs">
|
||||
<Target Name="GenerateWorkloadManifestsWxs"
|
||||
DependsOnTargets="ValidateBundledManifestSigning">
|
||||
<PropertyGroup>
|
||||
<WorkloadManifestsWxsPath>$(IntermediateOutputPath)WorkloadManifests.wxs</WorkloadManifestsWxsPath>
|
||||
<WorkloadManifestsWxsContent>
|
||||
|
|
Loading…
Add table
Reference in a new issue