diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
new file mode 100644
index 00000000..d2d21b39
--- /dev/null
+++ b/platforms/Windows/Directory.Build.props
@@ -0,0 +1,59 @@
+
+
+
+ amd64
+ $(ProductArchitecture)
+
+ 0.0.0
+ $(ProductVersion)
+
+
+
+ x64
+
+
+ arm64
+
+
+ arm
+
+
+ x86
+
+
+
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))
+ $(RootBuildFolder)
+ $(BaseOutputPath)obj\$(MSBuildProjectName)\
+ $(BaseOutputPath)$(Configuration)\$(ProductArchitecture)\
+
+ high
+
+
+
+ perMachine
+ true
+
+
+
+
+
+
+ $(DefineConstants);
+ ProductArchitecture=$(ProductArchitecture);
+ ProductVersion=$(ProductVersion);
+ PackageScope=$(PackageScope);
+ IsBundleCompressed=$(IsBundleCompressed);
+
+
+
+
+ perMachine
+ true
+
+
+
+ true
+ true
+
+
diff --git a/platforms/Windows/Directory.Build.targets b/platforms/Windows/Directory.Build.targets
new file mode 100644
index 00000000..eb8c333c
--- /dev/null
+++ b/platforms/Windows/Directory.Build.targets
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/Resources/swift_banner.png b/platforms/Windows/Resources/swift_banner.png
deleted file mode 100644
index cacc0759..00000000
Binary files a/platforms/Windows/Resources/swift_banner.png and /dev/null differ
diff --git a/platforms/Windows/Resources/swift_dialog.png b/platforms/Windows/Resources/swift_dialog.png
deleted file mode 100644
index 0c206cac..00000000
Binary files a/platforms/Windows/Resources/swift_dialog.png and /dev/null differ
diff --git a/platforms/Windows/bld.wixproj b/platforms/Windows/bld.wixproj
deleted file mode 100644
index cd362c02..00000000
--- a/platforms/Windows/bld.wixproj
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang
-
-
-
- true
- true
-
-
-
- x64
-
-
- arm64
- 500
-
-
- arm
- 500
-
-
- x86
-
-
-
-
-
-
-
-
-
- ClangResources
- _usr_lib_clang
- var.TOOLCHAIN_ROOT_USR_LIB_CLANG
- true
- true
- true
-
-
-
-
-
diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
deleted file mode 100644
index 7163991e..00000000
--- a/platforms/Windows/bld.wxs
+++ /dev/null
@@ -1,385 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/bld.wixproj
new file mode 100644
index 00000000..7847d2e5
--- /dev/null
+++ b/platforms/Windows/bld/bld.wixproj
@@ -0,0 +1,25 @@
+
+
+
+ $(DefineConstants);
+ DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
+ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
+ TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
+
+
+
+
+
+
+
+
+
+ ClangResources
+ _usr_lib_clang
+ var.TOOLCHAIN_ROOT_USR_LIB_CLANG
+ true
+ true
+ true
+
+
+
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
new file mode 100644
index 00000000..c607b5fd
--- /dev/null
+++ b/platforms/Windows/bld/bld.wxs
@@ -0,0 +1,352 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
new file mode 100644
index 00000000..59a909bf
--- /dev/null
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -0,0 +1,10 @@
+
+
+ Bundle
+ $(DefineConstants);MSI_LOCATION=$(MSI_LOCATION);
+
+
+
+
+
+
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
new file mode 100644
index 00000000..11348d3b
--- /dev/null
+++ b/platforms/Windows/bundle/installer.wxs
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/Resources/swift.png b/platforms/Windows/bundle/swift.png
similarity index 100%
rename from platforms/Windows/Resources/swift.png
rename to platforms/Windows/bundle/swift.png
diff --git a/platforms/Windows/cli.wixproj b/platforms/Windows/cli.wixproj
deleted file mode 100644
index 7ff8cf3f..00000000
--- a/platforms/Windows/cli.wixproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
-
-
-
- x64
-
-
- arm64
- 500
-
-
- arm
- 500
-
-
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs
deleted file mode 100644
index de6e96f6..00000000
--- a/platforms/Windows/cli.wxs
+++ /dev/null
@@ -1,268 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj
new file mode 100644
index 00000000..80f91146
--- /dev/null
+++ b/platforms/Windows/cli/cli.wixproj
@@ -0,0 +1,11 @@
+
+
+
+ $(DefineConstants);
+ DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
+ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
+ SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
+ INCLUDE_SWIFT_FORMAT=$(INCLUDE_SWIFT_FORMAT);
+
+
+
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
new file mode 100644
index 00000000..7cd8929c
--- /dev/null
+++ b/platforms/Windows/cli/cli.wxs
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/config.wxi b/platforms/Windows/config.wxi
deleted file mode 100644
index cda1f856..00000000
--- a/platforms/Windows/config.wxi
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/dbg.wixproj b/platforms/Windows/dbg.wixproj
deleted file mode 100644
index a012a5e1..00000000
--- a/platforms/Windows/dbg.wixproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
-
-
-
- x64
-
-
- arm64
- 500
-
-
- arm
- 500
-
-
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs
deleted file mode 100644
index 0b39ffd6..00000000
--- a/platforms/Windows/dbg.wxs
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/dbg/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj
new file mode 100644
index 00000000..67470896
--- /dev/null
+++ b/platforms/Windows/dbg/dbg.wixproj
@@ -0,0 +1,11 @@
+
+
+
+ $(DefineConstants);
+ DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
+ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
+ SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD);
+ INCLUDE_SWIFT_INSPECT=$(INCLUDE_SWIFT_INSPECT);
+
+
+
diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxs
new file mode 100644
index 00000000..633b3098
--- /dev/null
+++ b/platforms/Windows/dbg/dbg.wxs
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/ide.wixproj b/platforms/Windows/ide.wixproj
deleted file mode 100644
index f90bbb40..00000000
--- a/platforms/Windows/ide.wixproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
-
-
-
- x64
-
-
- arm64
- 500
-
-
- arm
- 500
-
-
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide.wxs
deleted file mode 100644
index 69a9d042..00000000
--- a/platforms/Windows/ide.wxs
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/ide/ide.wixproj b/platforms/Windows/ide/ide.wixproj
new file mode 100644
index 00000000..31cb55df
--- /dev/null
+++ b/platforms/Windows/ide/ide.wixproj
@@ -0,0 +1,9 @@
+
+
+
+ $(DefineConstants);
+ DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
+ TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
+
+
+
diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxs
new file mode 100644
index 00000000..6240eaf5
--- /dev/null
+++ b/platforms/Windows/ide/ide.wxs
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/installer-amd64.wxs b/platforms/Windows/installer-amd64.wxs
deleted file mode 100644
index a8593515..00000000
--- a/platforms/Windows/installer-amd64.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/installer-arm64.wxs b/platforms/Windows/installer-arm64.wxs
deleted file mode 100644
index afd57847..00000000
--- a/platforms/Windows/installer-arm64.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/installer.wixproj b/platforms/Windows/installer.wixproj
deleted file mode 100644
index 3681304d..00000000
--- a/platforms/Windows/installer.wixproj
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
- false
- Bundle
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
- runtime.msi%3Bbld.msi%3Bcli.msi%3Bdbg.msi%3Bide.msi%3Bsdk.msi
- $(RequiredChain)
-
- $(OptionalChain)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductVersion=$(ProductVersion);RequiredChain=$(RequiredChain);OptionalChain=$(OptionalChain);MSI_LOCATION=$(MSI_LOCATION);
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/runtime.wixproj b/platforms/Windows/runtime.wixproj
deleted file mode 100644
index 3ce2494e..00000000
--- a/platforms/Windows/runtime.wixproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);SDK_ROOT=$(SDK_ROOT)
-
-
-
- x64
-
-
- arm64
- 500
-
-
- arm
- 500
-
-
- x86
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
deleted file mode 100644
index e0eabaf3..00000000
--- a/platforms/Windows/runtime.wxs
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/runtime/runtime.wixproj b/platforms/Windows/runtime/runtime.wixproj
new file mode 100644
index 00000000..89b2c05d
--- /dev/null
+++ b/platforms/Windows/runtime/runtime.wixproj
@@ -0,0 +1,8 @@
+
+
+
+ $(DefineConstants);
+ SDK_ROOT=$(SDK_ROOT)
+
+
+
diff --git a/platforms/Windows/runtime/runtime.wxs b/platforms/Windows/runtime/runtime.wxs
new file mode 100644
index 00000000..40f3480d
--- /dev/null
+++ b/platforms/Windows/runtime/runtime.wxs
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/sdk.wixproj b/platforms/Windows/sdk.wixproj
deleted file mode 100644
index 3ff2f0a9..00000000
--- a/platforms/Windows/sdk.wixproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;
-
-
-
- true
- true
-
-
-
-
-
-
-
-
-
- SwiftShims
- WindowsSDK_usr_lib_swift_shims
- var.SwiftShimsPath
- true
- true
- true
-
-
-
-
-
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
deleted file mode 100644
index 06de05ca..00000000
--- a/platforms/Windows/sdk.wxs
+++ /dev/null
@@ -1,515 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/sdk/sdk.wixproj b/platforms/Windows/sdk/sdk.wixproj
new file mode 100644
index 00000000..3b664580
--- /dev/null
+++ b/platforms/Windows/sdk/sdk.wixproj
@@ -0,0 +1,25 @@
+
+
+
+ $(DefineConstants);
+ PLATFORM_ROOT=$(PLATFORM_ROOT);
+ SDK_ROOT=$(SDK_ROOT);
+ SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;
+
+
+
+
+
+
+
+
+
+ SwiftShims
+ WindowsSDK_usr_lib_swift_shims
+ var.SwiftShimsPath
+ true
+ true
+ true
+
+
+
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs
new file mode 100644
index 00000000..8924a839
--- /dev/null
+++ b/platforms/Windows/sdk/sdk.wxs
@@ -0,0 +1,494 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/shared/config.wxi b/platforms/Windows/shared/config.wxi
new file mode 100644
index 00000000..edfea53a
--- /dev/null
+++ b/platforms/Windows/shared/config.wxi
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/shared/shared.wixproj b/platforms/Windows/shared/shared.wixproj
new file mode 100644
index 00000000..729adf59
--- /dev/null
+++ b/platforms/Windows/shared/shared.wixproj
@@ -0,0 +1,5 @@
+
+
+ Library
+
+
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
new file mode 100644
index 00000000..10f082ac
--- /dev/null
+++ b/platforms/Windows/shared/shared.wxs
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
new file mode 100644
index 00000000..e3b55e3a
--- /dev/null
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/platforms/Windows/swift-format.wixproj b/platforms/Windows/swift-format.wixproj
deleted file mode 100644
index 89a4bb58..00000000
--- a/platforms/Windows/swift-format.wixproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductVersion=$(ProductVersion);SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD)
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/swift-format.wxs b/platforms/Windows/swift-format.wxs
deleted file mode 100644
index cc42a485..00000000
--- a/platforms/Windows/swift-format.wxs
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/swift-inspect.wixproj b/platforms/Windows/swift-inspect.wixproj
deleted file mode 100644
index 79a99f86..00000000
--- a/platforms/Windows/swift-inspect.wixproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- false
-
-
-
- amd64
- $(ProductArchitecture)
-
- 0.0.0
- $(ProductVersion)
-
-
-
- build\
- build\obj\
-
-
-
-
-
- ProductVersion=$(ProductVersion);ProductArchitecture=$(ProductArchitecture);SWIFT_INSPECT_BUILD=$(SWIFT_INSPECT_BUILD)
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/Windows/swift-inspect.wxs b/platforms/Windows/swift-inspect.wxs
deleted file mode 100644
index 453391d6..00000000
--- a/platforms/Windows/swift-inspect.wxs
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-