diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props
index 9a29437eb2e5..730df3c1c8dd 100644
--- a/eng/targets/Wix.Common.props
+++ b/eng/targets/Wix.Common.props
@@ -4,7 +4,7 @@
2.0
3.14
- 3.14.0-dotnet
+ 1.0.0-v3.14.0.5722
@@ -20,7 +20,7 @@
-
+
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 68d4cd23fbf2..92127b5ee340 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs
new file mode 100644
index 000000000000..5742d2a1e0a1
--- /dev/null
+++ b/src/Installers/Windows/Common/dotnethome_x64.wxs
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VersionNT64 OR
+
+ WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)"
+
+
+
+
+
+
+
+ NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME
+
+
+
+
\ No newline at end of file
diff --git a/src/Installers/Windows/SharedFramework/Product.wxs b/src/Installers/Windows/SharedFramework/Product.wxs
index 3375094918c0..98b5756c69de 100644
--- a/src/Installers/Windows/SharedFramework/Product.wxs
+++ b/src/Installers/Windows/SharedFramework/Product.wxs
@@ -35,6 +35,10 @@
+
+
+
+
@@ -52,6 +56,10 @@
+
+
+
+
@@ -66,16 +74,41 @@
+
+
+ NOT NON_NATIVE_ARCHITECTURE
+
+
+
+ NOT NON_NATIVE_ARCHITECTURE
+
+
+
+
+
+ NON_NATIVE_ARCHITECTURE
+
+
+
+
+
+
+ NON_NATIVE_ARCHITECTURE
+
+
+
+
+
diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index 79659760fbd2..276338cbd7a8 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -46,6 +46,7 @@
+
diff --git a/src/Installers/Windows/TargetingPack/Product.wxs b/src/Installers/Windows/TargetingPack/Product.wxs
index a43f6ab4e172..8eb5a60b90d3 100644
--- a/src/Installers/Windows/TargetingPack/Product.wxs
+++ b/src/Installers/Windows/TargetingPack/Product.wxs
@@ -33,6 +33,10 @@
+
+
+
+
@@ -49,6 +53,10 @@
+
+
+
+
@@ -59,16 +67,41 @@
+
+
+ NOT NON_NATIVE_ARCHITECTURE
+
+
+
+ NOT NON_NATIVE_ARCHITECTURE
+
+
+
+
+
+
+ NON_NATIVE_ARCHITECTURE
+
+
+
+
+
+ NON_NATIVE_ARCHITECTURE
+
+
+
+
+
diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
index 759f7f80fd61..25afea8f69c2 100644
--- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
+++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj
@@ -48,6 +48,7 @@
+