Skip to content

Commit 6d2c437

Browse files
committed
WiX: isolate experimental shims from legacy shims
Adjust the package authoring to use separate paths as we prepare to eject the legacy SDK.
1 parent 446fcf1 commit 6d2c437

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

platforms/Windows/platforms/windows/windows.wixproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
<OutputName>windows</OutputName>
44

55
<SwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\shims</SwiftShimsPath>
6+
<ExperimentalSwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift\shims</ExperimentalSwiftShimsPath>
67

78
<DefineConstants>
89
$(DefineConstants);
910
SwiftShimsPath=$(SwiftShimsPath);
11+
ExperimentalSwiftShimsPath=$(ExperimentalSwiftShimsPath);
1012
IncludeARM64=$(WindowsArchitectures.Contains("aarch64"));
1113
IncludeX64=$(WindowsArchitectures.Contains("x86_64"));
1214
IncludeX86=$(WindowsArchitectures.Contains("i686"));
@@ -47,10 +49,10 @@
4749
</ItemGroup>
4850

4951
<ItemGroup>
50-
<HarvestDirectory Include="$(SwiftShimsPath)">
52+
<HarvestDirectory Include="$(ExperimentalSwiftShimsPath)">
5153
<ComponentGroupName>ExperimentalSwiftShims</ComponentGroupName>
5254
<DirectoryRefId>WindowsExperimentalSDK_usr_lib_swift_shims</DirectoryRefId>
53-
<PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
55+
<PreprocessorVariable>var.ExperimentalSwiftShimsPath</PreprocessorVariable>
5456
<SuppressCom>true</SuppressCom>
5557
<SuppressRegistry>true</SuppressRegistry>
5658
<SuppressRootDirectory>true</SuppressRootDirectory>

0 commit comments

Comments
 (0)