diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props index d2d21b39..b900dd33 100644 --- a/platforms/Windows/Directory.Build.props +++ b/platforms/Windows/Directory.Build.props @@ -2,12 +2,17 @@ amd64 - $(ProductArchitecture) - 0.0.0 - $(ProductVersion) + + $([System.Text.RegularExpressions.Regex]::Replace($(ProductVersion), `[-+].*`, ``)) + $([System.Text.RegularExpressions.Regex]::Match($(NonSemVerProductVersion), `\d+\.\d+`)) + $(NonSemVerProductVersion) + + + + x64 @@ -24,34 +29,76 @@ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\)) $(RootBuildFolder) + $(BaseOutputPath)\ $(BaseOutputPath)obj\$(MSBuildProjectName)\ - $(BaseOutputPath)$(Configuration)\$(ProductArchitecture)\ + $(BaseIntermediateOutputPath)$(ProductArchitecture)\$(Configuration)\ + $(BaseOutputPath)$(Configuration)\$(ProductArchitecture)\ - high + online - perMachine + + ICE38;ICE61;ICE64;ICE91 + perUser + + + + + high + false + true + high + + + + high + false + + false + high + + $(PLATFORM_ROOT_X86) + $(SDK_ROOT_X86) + + + + $(PLATFORM_ROOT_AMD64) + $(SDK_ROOT_AMD64) + + + + $(PLATFORM_ROOT_ARM64) + $(SDK_ROOT_ARM64) + + + $(PackageCompressionLevel) + $(DefineConstants); ProductArchitecture=$(ProductArchitecture); ProductVersion=$(ProductVersion); + MajorMinorProductVersion=$(MajorMinorProductVersion); PackageScope=$(PackageScope); IsBundleCompressed=$(IsBundleCompressed); + ArePackageCabsEmbedded=$(ArePackageCabsEmbedded); + BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl); + SDK_ROOT=$(SDK_ROOT); + PLATFORM_ROOT=$(PLATFORM_ROOT); - - perMachine - true - - true true diff --git a/platforms/Windows/Directory.Build.targets b/platforms/Windows/Directory.Build.targets index c9777857..57a0a178 100644 --- a/platforms/Windows/Directory.Build.targets +++ b/platforms/Windows/Directory.Build.targets @@ -1,8 +1,12 @@ - + + + + + diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props new file mode 100644 index 00000000..d027e378 --- /dev/null +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -0,0 +1,50 @@ + + + + + + {7E95DC06-7F84-4E8E-A038-8304AF0468FB} + {87019842-3F3E-4227-B5C5-23A8EF72AD89} + {91D382AF-1E92-44DC-A4AD-AEE91C1B5160} + {8DD91C86-D13D-490B-B06B-9522A9CF504C} + {BEA8C6DC-F73E-445B-9486-2333D1CF2886} + {443F4D7F-38F3-47C8-9BEE-37FEB01D13C8} + {762D10FE-EBE5-4554-BB78-FB13A4A487E3} + {9749D9E6-E860-4FF6-9E8A-525270F471A3} + + + + {963BE094-A046-47B3-83B2-BEBE92859D39} + + + + {710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} + + + + + $(DefineConstants); + BundleUpgradeCode=$(BundleUpgradeCode); + BldUpgradeCode=$(BldUpgradeCode); + CliUpgradeCode=$(CliUpgradeCode); + DbgUpgradeCode=$(DbgUpgradeCode); + IdeUpgradeCode=$(IdeUpgradeCode); + RtlUpgradeCode=$(RtlUpgradeCode); + SdkUpgradeCode=$(SdkUpgradeCode); + + + diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs index 5676c194..f45fed65 100644 --- a/platforms/Windows/bld/bld.wxs +++ b/platforms/Windows/bld/bld.wxs @@ -1,14 +1,16 @@  - - + + + + @@ -324,11 +326,8 @@ - - - - - + + @@ -347,6 +346,7 @@ + diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index 59a909bf..0e8d95cb 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -1,10 +1,32 @@  Bundle - $(DefineConstants);MSI_LOCATION=$(MSI_LOCATION); + $(BundleCompressionLevel) + + $(DefineConstants); + INCLUDE_X86_SDK=$(INCLUDE_X86_SDK); + INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK); + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 38230b3a..5fbdb089 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -1,31 +1,118 @@  + UpgradeCode="$(BundleUpgradeCode)"> - - - + + + Theme="hyperlinkSidebarLicense" + LocalizationFile="..\shared\swift.en-us.wxl" + ThemeFile="theme.xml" /> + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/bundle/swift.png b/platforms/Windows/bundle/swift.png deleted file mode 100644 index cb5e79a1..00000000 Binary files a/platforms/Windows/bundle/swift.png and /dev/null differ diff --git a/platforms/Windows/bundle/swift_side.png b/platforms/Windows/bundle/swift_side.png new file mode 100644 index 00000000..3b28117a Binary files /dev/null and b/platforms/Windows/bundle/swift_side.png differ diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml new file mode 100644 index 00000000..502b8f4b --- /dev/null +++ b/platforms/Windows/bundle/theme.xml @@ -0,0 +1,149 @@ + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + #(loc.Bld_ProductName) + #(loc.Cli_ProductName) + #(loc.Dbg_ProductName) + #(loc.Ide_ProductName) + #(loc.Rtl_ProductName) + + #(loc.Sdk_ProductName_amd64) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs index 05e6a7f7..0c776ad6 100644 --- a/platforms/Windows/cli/cli.wxs +++ b/platforms/Windows/cli/cli.wxs @@ -1,14 +1,16 @@  - - + + + + @@ -229,9 +231,9 @@ - + - + @@ -251,6 +253,8 @@ + + diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxs index 1c72beba..58b0a975 100644 --- a/platforms/Windows/dbg/dbg.wxs +++ b/platforms/Windows/dbg/dbg.wxs @@ -1,14 +1,16 @@  - - + + + + @@ -99,9 +101,9 @@ - + - + @@ -115,6 +117,8 @@ + + diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxs index a4f53e2d..dfe53026 100644 --- a/platforms/Windows/ide/ide.wxs +++ b/platforms/Windows/ide/ide.wxs @@ -1,14 +1,16 @@  - - + + + + @@ -51,6 +53,8 @@ + + diff --git a/platforms/Windows/runtimelib/runtimelib.wixproj b/platforms/Windows/rtl/lib/rtllib.wixproj similarity index 60% rename from platforms/Windows/runtimelib/runtimelib.wixproj rename to platforms/Windows/rtl/lib/rtllib.wixproj index 38562480..b45dd94a 100644 --- a/platforms/Windows/runtimelib/runtimelib.wixproj +++ b/platforms/Windows/rtl/lib/rtllib.wixproj @@ -1,11 +1,7 @@ + rtl Library true - - - $(DefineConstants); - SDK_ROOT=$(SDK_ROOT) - diff --git a/platforms/Windows/runtimelib/runtimelib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs similarity index 60% rename from platforms/Windows/runtimelib/runtimelib.wxs rename to platforms/Windows/rtl/lib/rtllib.wxs index c4813601..a8621629 100644 --- a/platforms/Windows/runtimelib/runtimelib.wxs +++ b/platforms/Windows/rtl/lib/rtllib.wxs @@ -1,8 +1,16 @@  - + + + + + + + - + + + @@ -44,13 +52,13 @@ - + - + @@ -59,7 +67,7 @@ - + @@ -71,18 +79,18 @@ - + - - - - - - + + + + + + diff --git a/platforms/Windows/rtl/msi/rtlmsi.wixproj b/platforms/Windows/rtl/msi/rtlmsi.wixproj new file mode 100644 index 00000000..c1cac036 --- /dev/null +++ b/platforms/Windows/rtl/msi/rtlmsi.wixproj @@ -0,0 +1,17 @@ + + + rtl + + + + + + + + + + + + + + diff --git a/platforms/Windows/rtl/msi/rtlmsi.wxs b/platforms/Windows/rtl/msi/rtlmsi.wxs new file mode 100644 index 00000000..9b2253c5 --- /dev/null +++ b/platforms/Windows/rtl/msi/rtlmsi.wxs @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/rtl/msm/rtlmsm.wixproj b/platforms/Windows/rtl/msm/rtlmsm.wixproj new file mode 100644 index 00000000..af76119f --- /dev/null +++ b/platforms/Windows/rtl/msm/rtlmsm.wixproj @@ -0,0 +1,18 @@ + + + Module + rtl.$(ProductArchitecture) + + + + + + + + + + + + + + diff --git a/platforms/Windows/runtimemsm/runtimemsm.wxs b/platforms/Windows/rtl/msm/rtlmsm.wxs similarity index 88% rename from platforms/Windows/runtimemsm/runtimemsm.wxs rename to platforms/Windows/rtl/msm/rtlmsm.wxs index 4f1c13fa..c0dfa79c 100644 --- a/platforms/Windows/runtimemsm/runtimemsm.wxs +++ b/platforms/Windows/rtl/msm/rtlmsm.wxs @@ -14,6 +14,6 @@ Language="0" Version="$(ProductVersion)"> - + diff --git a/platforms/Windows/runtimemsi/runtimemsi.wixproj b/platforms/Windows/runtimemsi/runtimemsi.wixproj deleted file mode 100644 index 543c02cf..00000000 --- a/platforms/Windows/runtimemsi/runtimemsi.wixproj +++ /dev/null @@ -1,9 +0,0 @@ - - - runtime - - - - - - diff --git a/platforms/Windows/runtimemsi/runtimemsi.wxs b/platforms/Windows/runtimemsi/runtimemsi.wxs deleted file mode 100644 index e24038a1..00000000 --- a/platforms/Windows/runtimemsi/runtimemsi.wxs +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/Windows/runtimemsm/runtimemsm.wixproj b/platforms/Windows/runtimemsm/runtimemsm.wixproj deleted file mode 100644 index a0e34686..00000000 --- a/platforms/Windows/runtimemsm/runtimemsm.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - Module - runtime.$(ProductArchitecture) - - - - - - diff --git a/platforms/Windows/samples/HelloMergeModule/hellomm.wixproj b/platforms/Windows/samples/HelloMergeModule/hellomm.wixproj index 57b4ddca..52adc4ce 100644 --- a/platforms/Windows/samples/HelloMergeModule/hellomm.wixproj +++ b/platforms/Windows/samples/HelloMergeModule/hellomm.wixproj @@ -2,10 +2,7 @@ $(DefineConstants); + RedistributablesDirectory=$(RedistributablesDirectory); - - - - diff --git a/platforms/Windows/samples/HelloMergeModule/hellomm.wxs b/platforms/Windows/samples/HelloMergeModule/hellomm.wxs index e9d8ffb2..06d2d8ee 100644 --- a/platforms/Windows/samples/HelloMergeModule/hellomm.wxs +++ b/platforms/Windows/samples/HelloMergeModule/hellomm.wxs @@ -1,4 +1,11 @@  + + + + + + + + - + diff --git a/platforms/Windows/samples/tests/MiniSxS/BuildTests.cmd b/platforms/Windows/samples/tests/MiniSxS/BuildTests.cmd new file mode 100644 index 00000000..e2f391e4 --- /dev/null +++ b/platforms/Windows/samples/tests/MiniSxS/BuildTests.cmd @@ -0,0 +1,8 @@ +rd /s/q X:\sandbox\Swift\builds + +msbuild -Restore -m -p:ProductVersion=5.9.0 -p:BundleUpgradeCode={710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.9.0\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.9.1 -p:BundleUpgradeCode={710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.9.1\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.9.2 -p:BundleUpgradeCode={710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.9.2\ bundle\installer.wixproj + +*copy %~dp0\Run*.cmd X:\sandbox\Swift\ +start %~dp0\MiniSxSTesting.wsb diff --git a/platforms/Windows/samples/tests/MiniSxS/MiniSxSTesting.wsb b/platforms/Windows/samples/tests/MiniSxS/MiniSxSTesting.wsb new file mode 100644 index 00000000..27e0ff15 --- /dev/null +++ b/platforms/Windows/samples/tests/MiniSxS/MiniSxSTesting.wsb @@ -0,0 +1,14 @@ + + + + + X:\sandbox\Swift + C:\sandbox + false + + + 8192 + + C:\sandbox\RunMiniSxSTests.cmd + + \ No newline at end of file diff --git a/platforms/Windows/samples/tests/MiniSxS/RunMiniSxSTests.cmd b/platforms/Windows/samples/tests/MiniSxS/RunMiniSxSTests.cmd new file mode 100644 index 00000000..2e987ed4 --- /dev/null +++ b/platforms/Windows/samples/tests/MiniSxS/RunMiniSxSTests.cmd @@ -0,0 +1,20 @@ +start /min %TMP% +start /min %LOCALAPPDATA% + +pushd %~dp0% + +md dumps + +set SWIFTROOT=%LOCALAPPDATA%\Programs\Swift +set SWIFTROOT=C:\Swift + +start /wait builds\5.9.0\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.0.txt +start /wait builds\5.9.1\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.1.txt +start /wait builds\5.9.2\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.2.txt + +:LExit + +robocopy %TMP% logs Swift*.log /MIR /NP /NDL /XJ /DCOPY:T /FFT \ No newline at end of file diff --git a/platforms/Windows/samples/tests/SxS/BuildTests.cmd b/platforms/Windows/samples/tests/SxS/BuildTests.cmd new file mode 100644 index 00000000..13028a1d --- /dev/null +++ b/platforms/Windows/samples/tests/SxS/BuildTests.cmd @@ -0,0 +1,16 @@ +rd /s/q X:\sandbox\Swift\builds + +msbuild -Restore -m -p:ProductVersion=5.9.0 -p:BundleUpgradeCode={710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.9.0\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.9.1 -p:BundleUpgradeCode={710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.9.1\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.9.2 -p:BundleUpgradeCode={710F1827-DA4A-4BF4-BDCE-D5F2D7C0DEF2} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.9.2\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.10.0 -p:BundleUpgradeCode={F3764C05-9568-4DE9-98FE-AF64C0B30706} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.10.0\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.10.1 -p:BundleUpgradeCode={F3764C05-9568-4DE9-98FE-AF64C0B30706} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.10.1\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.10.5 -p:BundleUpgradeCode={F3764C05-9568-4DE9-98FE-AF64C0B30706} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.10.5\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=5.11.2 -p:BundleUpgradeCode={239DD2D6-3F1B-42AE-8412-4640BD48284D} -p:BaseOutputPath=X:\sandbox\Swift\builds\5.11.2\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=6.0.0 -p:BundleUpgradeCode={71CCD6EF-F3CF-492D-A1DA-D76E50A26EBF} -p:BaseOutputPath=X:\sandbox\Swift\builds\6.0.0\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=6.0.1 -p:BundleUpgradeCode={71CCD6EF-F3CF-492D-A1DA-D76E50A26EBF} -p:BaseOutputPath=X:\sandbox\Swift\builds\6.0.1\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=6.5.1 -p:BundleUpgradeCode={44D57C54-D8F2-4374-8C52-8856EE663D32} -p:BaseOutputPath=X:\sandbox\Swift\builds\6.5.1\ bundle\installer.wixproj +msbuild -Restore -m -p:ProductVersion=6.5.7 -p:BundleUpgradeCode={44D57C54-D8F2-4374-8C52-8856EE663D32} -p:BaseOutputPath=X:\sandbox\Swift\builds\6.5.7\ bundle\installer.wixproj + +copy %~dp0\RunSxSTests.cmd X:\sandbox\Swift\ +start %~dp0\SxSTesting.wsb diff --git a/platforms/Windows/samples/tests/SxS/RunSxSTests.cmd b/platforms/Windows/samples/tests/SxS/RunSxSTests.cmd new file mode 100644 index 00000000..d2630ff8 --- /dev/null +++ b/platforms/Windows/samples/tests/SxS/RunSxSTests.cmd @@ -0,0 +1,49 @@ +start /min %TMP% +start /min %LOCALAPPDATA% + +pushd %~dp0% + +md dumps + +set SWIFTROOT=%LOCALAPPDATA%\Programs +set SWIFTROOT=C:\Swift + +start /wait builds\5.9.0\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.0.txt +start /wait builds\5.9.1\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.1.txt +start /wait builds\5.9.2\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.2.txt +start /wait builds\5.9.0\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.9.0.XXX.txt +start /wait builds\5.10.0\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.10.0.txt +start /wait builds\5.10.1\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.10.1.txt +start /wait builds\5.10.5\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.10.5.txt +start /wait builds\5.11.2\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.5.11.2.txt +start /wait builds\6.0.0\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.6.0.0.txt +start /wait builds\6.0.1\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.6.0.1.txt +start /wait builds\6.5.1\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.6.5.1.txt +start /wait builds\6.5.7\amd64\installer.exe /passive InstallRoot=%SWIFTROOT% +dir /s %SWIFTROOT% > dumps\post.install.6.5.7.txt + +goto LExit + +start /wait builds\5.9.2\amd64\installer.exe /passive /uninstall +start /wait builds\5.10.5\amd64\installer.exe /passive /uninstall +start /wait builds\5.11.2\amd64\installer.exe /passive /uninstall +start /wait builds\6.0.1\amd64\installer.exe /passive /uninstall +start /wait builds\6.5.7\amd64\installer.exe /passive /uninstall +dir /s %SWIFTROOT% > dumps\post.uninstall.all.txt + +:LExit + +robocopy %TMP% logs Swift*.log /MIR /NP /NDL /XJ /DCOPY:T /FFT + +start mission_accomplished.wav diff --git a/platforms/Windows/samples/tests/SxS/SxSTesting.wsb b/platforms/Windows/samples/tests/SxS/SxSTesting.wsb new file mode 100644 index 00000000..24def136 --- /dev/null +++ b/platforms/Windows/samples/tests/SxS/SxSTesting.wsb @@ -0,0 +1,14 @@ + + + + + X:\sandbox\Swift + C:\sandbox + false + + + 8192 + + C:\sandbox\RunSxSTests.cmd + + \ No newline at end of file diff --git a/platforms/Windows/sdk/sdk.wixproj b/platforms/Windows/sdk/sdk.wixproj index 4cc5cfa1..2c503759 100644 --- a/platforms/Windows/sdk/sdk.wixproj +++ b/platforms/Windows/sdk/sdk.wixproj @@ -1,10 +1,13 @@ + sdk.$(ProductArchitecture) + x86 + + $(SDK_ROOT)\usr\lib\swift\shims + $(DefineConstants); - PLATFORM_ROOT=$(PLATFORM_ROOT); - SDK_ROOT=$(SDK_ROOT); - SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims; + SwiftShimsPath=$(SwiftShimsPath); @@ -12,14 +15,29 @@ - - - - + + + + + + + + + + + + + + - + SwiftShims WindowsSDK_usr_lib_swift_shims var.SwiftShimsPath diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs index 63f7f2b6..dd104a8c 100644 --- a/platforms/Windows/sdk/sdk.wxs +++ b/platforms/Windows/sdk/sdk.wxs @@ -1,19 +1,15 @@  - + - + - - - - - + @@ -21,29 +17,30 @@ - - + + + + - + @@ -436,7 +433,7 @@ - + @@ -475,31 +472,18 @@ - - - - - - - - - - - + + + - - - - - - - + + - + @@ -523,8 +507,11 @@ - + + + + diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs index 02ae9fd5..669c6cf4 100644 --- a/platforms/Windows/shared/shared.wxs +++ b/platforms/Windows/shared/shared.wxs @@ -1,14 +1,44 @@ - + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -23,20 +53,98 @@ - - + + + + - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 588f2686..79313889 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -1,14 +1,85 @@ + + - - - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +