Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.0-preview9] Fix bundle installer signing #7822

Merged
merged 2 commits into from
Aug 23, 2019
Merged

[release/3.0-preview9] Fix bundle installer signing #7822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec789d9
Fix bundle installer signing
dagood Aug 23, 2019
ecdb0c4
Remove SignMsiFiles.proj MSBuild cycle
dagood Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion signing/SignBurnBundleFiles.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Target Name="ReattachAllEnginesToBundles"
BeforeTargets="RunArcadeSigning">
<MSBuild
Projects="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'Bundle'))"
Projects="@(ProjectToBuild -> WithMetadataValue('SignPhase', 'BundleInstallerFiles'))"
Targets="ReattachEngineToBundle" />
</Target>

Expand Down
2 changes: 1 addition & 1 deletion signing/SignMsiFiles.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
DependsOnTargets="GetSharedFrameworkProjects"
BeforeTargets="EnsureProjectsBuilt">
<ItemGroup>
<StageProject Include="@(SharedFrameworkProjects)" />
<StageProject Include="@(SharedFrameworkProject)" />
</ItemGroup>
</Target>

Expand Down
1 change: 1 addition & 0 deletions src/pkg/packaging-tools/packaging-tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<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>

Expand Down
12 changes: 8 additions & 4 deletions src/pkg/packaging-tools/windows/wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,18 +346,22 @@
</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>

Expand Down
2 changes: 0 additions & 2 deletions src/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
<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>

<!--
Expand Down
2 changes: 0 additions & 2 deletions src/pkg/projects/windowsdesktop/sfx/Microsoft.WindowsDesktop.App.SharedFx.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

<ItemGroup>
<PkgProjectReference Include="..\pkg\Microsoft.WindowsDesktop.App.pkgproj" />

<OrderProjectReference Include="$(RepoRoot)signing\SignMsiFiles.proj" />
</ItemGroup>

</Project>