-
Notifications
You must be signed in to change notification settings - Fork 45
Refactor WiX installer projects #215
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d33c012
Refactoring #1
barnson 1ee3754
- Moved projects into subdirectories to...
barnson ab20ff9
Address review feedback:
barnson 325562a
Absorb swift-format and swift-inspect.dbg...
barnson ab25401
Fix TOOLCHAIN_ROOT_USR_LIB_CLANG path build break.
barnson 60f1416
Embed cabinets (revisit on bundle redesign).
barnson 7732f2e
Revert to `Media` instead of `MediaTemplate`.
barnson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <ProductArchitecture Condition=" '$(ProductArchitecture)' == '' ">amd64</ProductArchitecture> | ||
| <ProductArchitecture>$(ProductArchitecture)</ProductArchitecture> | ||
|
|
||
| <ProductVersion Condition=" '$(ProductVersion)' == '' ">0.0.0</ProductVersion> | ||
| <ProductVersion>$(ProductVersion)</ProductVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' "> | ||
| <Platform>x64</Platform> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' "> | ||
| <Platform>arm64</Platform> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' "> | ||
| <Platform>arm</Platform> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' "> | ||
| <Platform>x86</Platform> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder> | ||
| <BaseOutputPath>$(RootBuildFolder)</BaseOutputPath> | ||
| <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | ||
| <OutputPath>$(BaseOutputPath)$(Configuration)\$(ProductArchitecture)\</OutputPath> | ||
|
|
||
| <DefaultCompressionLevel Condition="'$(DefaultCompressionLevel)' == ''">high</DefaultCompressionLevel> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackageScope>perMachine</PackageScope> | ||
| <IsBundleCompressed>true</IsBundleCompressed> | ||
| <MSI_LOCATION Condition="'$(MSI_LOCATION)' == ''">$(OutputPath)</MSI_LOCATION> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="$(USERNAME).props" Condition="Exists('$(USERNAME).props')" /> | ||
|
|
||
| <PropertyGroup> | ||
| <DefineConstants> | ||
| $(DefineConstants); | ||
| ProductArchitecture=$(ProductArchitecture); | ||
| ProductVersion=$(ProductVersion); | ||
| PackageScope=$(PackageScope); | ||
| IsBundleCompressed=$(IsBundleCompressed); | ||
| MSI_LOCATION=$(MSI_LOCATION); | ||
| </DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup > | ||
| <PackageScope>perMachine</PackageScope> | ||
| <IsBundleCompressed>true</IsBundleCompressed> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <HarvestNoLogo>true</HarvestNoLogo> | ||
| <HarvestGenerateGuidsNow>true</HarvestGenerateGuidsNow> | ||
barnson marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
| </Project> | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project> | ||
| <ItemGroup Condition="'$(MSBuildProjectName)' != 'shared'"> | ||
| <ProjectReference Include="..\shared\shared.wixproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="WiXCodeSigning.targets" /> | ||
| </Project> |
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.