Migrate the Windows installer to WiX v4 #184
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
compnerd
reviewed
Mar 23, 2023
| @@ -222,15 +223,15 @@ | |||
| </ComponentGroup> | |||
| <?endif?> | |||
|
|
|||
| <Feature Id="DeveloperTools" Absent="disallow" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows x86_64" Level="1" Title="Swift Developer Tools (Windows x86_64)"> | |||
| <Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows x86_64" Level="1" Title="Swift Developer Tools (Windows x86_64)"> | |||
| <ComponentGroupRef Id="SwiftCollections" /> | |||
| <ComponentGroupRef Id="SwiftSystem" /> | |||
| <ComponentGroupRef Id="SwiftPackageManager" /> | |||
| <ComponentGroupRef Id="SourceKitLSP" /> | |||
|
|
|||
| <?ifdef INCLUDE_DEBUG_INFO ?> | |||
There was a problem hiding this comment.
Sidebar: I wonder if we should re-consider this. The debug information would bloat the installer download to ~4G (from ~400M), and the install from ~4G to ~25G. @shahmishal I figure that you might have some thoughts on this as well. The general recommendations for this seem to be "don't do it" and to prefer to use a Symbol Server instead.
This was referenced Mar 23, 2023
compnerd
approved these changes
Mar 28, 2023
compnerd
reviewed
Mar 28, 2023
|
|
||
| <!-- Features --> | ||
| <Feature Id="WinX64SDK" Absent="disallow" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows x86_64" Level="1" Title="Swift SDK for Windows x86_64"> | ||
| <Feature Id="WinX64SDK" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows x86_64" Level="1" Title="Swift SDK for Windows x86_64" AllowAbsent="no"> |
There was a problem hiding this comment.
Nit: would be nice to leave this in lexicographical ordering.
There was a problem hiding this comment.
The converter added it to the end and I fixed it in most places but missed this one :/
|
Tested at swiftlang/swift#64691 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Migrates the Windows installer to WiX v4, SDK-style project and consuming WiX from Nuget, meaning that it doesn't need to be installed on the machine anymore. This also unblocks the arm64 installer.
I ran the WiX v4 converter extension in VS, then tweaked the output to minimize the diff. Many elements are slightly different in v4:
<Project>. They requiremsbuild -restore.<PackageReference>Compressed="yes"is now default.TARGETDIRshould not be defined anymoreAbsent="disallow"becameallowAbsent="no"How tested:
Pending related changes to consuming repos. (adding
-restoreto the msbuild invocation)