* Fix bundle installer signing
* Remove SignMsiFiles.proj MSBuild cycle
This OrderProjectReference is unnecessary: ensuring the MSI files are signed before bundling them is already handled by the infrastructure in the GetBundledMsiFiles target.
Commit migrated from https://github.com/dotnet/core-setup/commit/
9528017ba529995cc42697abc1e3c59258303192
<InstallerFileNameWithoutExtension>$(InstallerName)-$(InstallerBuildPart)</InstallerFileNameWithoutExtension>
<InstallerFile Condition="'$(InstallerFile)' == ''">$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(InstallerExtension)</InstallerFile>
<ExeBundleInstallerFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension).exe</ExeBundleInstallerFile>
+ <ExeBundleInstallerEngineFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)-engine.exe</ExeBundleInstallerEngineFile>
<CompressedArchiveFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension)</CompressedArchiveFile>
</PropertyGroup>
</Target>
<Target Name="ExtractEngineBundle"
- DependsOnTargets="GetInstallerGenerationFlags">
+ DependsOnTargets="
+ GetInstallerGenerationFlags;
+ GetWixBuildConfiguration">
<Exec
Condition="'$(GenerateExeBundle)' == 'true'"
- Command="insignia.exe -ib $(CombinedInstallerFile) -o $(CombinedInstallerEngine)"
+ Command="insignia.exe -ib $(OutInstallerFile) -o $(ExeBundleInstallerEngineFile)"
WorkingDirectory="$(WixToolsDir)" />
</Target>
<Target Name="ReattachEngineToBundle"
- DependsOnTargets="GetInstallerGenerationFlags">
+ DependsOnTargets="
+ GetInstallerGenerationFlags;
+ GetWixBuildConfiguration">
<Exec
Condition="'$(GenerateExeBundle)' == 'true'"
- Command="insignia.exe -ab $(CombinedInstallerEngine) $(CombinedInstallerFile) -o $(CombinedInstallerFile)"
+ Command="insignia.exe -ab $(ExeBundleInstallerEngineFile) $(OutInstallerFile) -o $(OutInstallerFile)"
WorkingDirectory="$(WixToolsDir)" />
</Target>
<PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHost.pkgproj" />
<PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj" />
<PkgProjectReference Include="..\..\Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.pkgproj" />
-
- <OrderProjectReference Include="$(RepoRoot)signing\SignMsiFiles.proj" />
</ItemGroup>
<!--
<ItemGroup>
<PkgProjectReference Include="..\pkg\Microsoft.WindowsDesktop.App.pkgproj" />
-
- <OrderProjectReference Include="$(RepoRoot)signing\SignMsiFiles.proj" />
</ItemGroup>
</Project>
<Target Name="ReattachAllEnginesToBundles"
BeforeTargets="RunArcadeSigning">
<MSBuild
- Projects="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'Bundle'))"
+ Projects="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))"
Targets="ReattachEngineToBundle" />
</Target>
DependsOnTargets="GetSharedFrameworkProjects"
BeforeTargets="EnsureProjectsBuilt">
<ItemGroup>
- <StageProject Include="@(SharedFrameworkProjects)" />
+ <StageProject Include="@(SharedFrameworkProject)" />
</ItemGroup>
</Target>