diff --git a/eng/jobs/windows-build.yml b/eng/jobs/windows-build.yml
index 7fc1e25e952521562de47be29d719f2edd38a6a1..c99e188ec420562522d79d67282590dda4b8b426 100644
--- a/eng/jobs/windows-build.yml
+++ b/eng/jobs/windows-build.yml
@@ -73,10 +73,6 @@ jobs:
publishFeedCredentials: 'DevDiv - VS package feed'
condition: and(
succeeded(),
- or(
- eq(variables['TargetArchitecture'], 'x64'),
- eq(variables['TargetArchitecture'], 'x86')
- ),
eq(variables['_BuildConfig'], 'Release'),
ne(variables['DisableVSPublish'], 'true'))
diff --git a/src/installer/pkg/packaging-tools/installer.targets b/src/installer/pkg/packaging-tools/installer.targets
index ba1ae2182c4624dfb0eb1f056c045f3c8ef0e42d..1361dc23ac4d86dde027f5e5177fbc3dbfc45b28 100644
--- a/src/installer/pkg/packaging-tools/installer.targets
+++ b/src/installer/pkg/packaging-tools/installer.targets
@@ -17,6 +17,7 @@
GenerateDeb;
GenerateRpm;
GenerateMsi;
+ GenerateCrossArchMsi;
GenerateExeBundle;
GeneratePkg;
GenerateCompressedArchive" />
@@ -24,6 +25,7 @@
+
@@ -163,6 +165,22 @@
+
+
+
+
+
- <_supportsWixBasedInstallers>true
- <_supportsWixBasedInstallers Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'">false
- <_supportsWixBasedInstallers Condition="'$(OSGroup)' != 'Windows_NT'">false
+ <_osSupportsWixBasedInstallers>true
+ <_osSupportsWixBasedInstallers Condition="'$(OSGroup)' != 'Windows_NT'">false
- false
- false
+ <_osArchSupportsWixBasedInstallers>$(_osSupportsWixBasedInstallers)
+ <_osArchSupportsWixBasedInstallers Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'">false
+
+
+ $(GenerateMSI)
+
+ false
+ false
false
@@ -60,6 +70,11 @@
$(ProductionVersion)
+
+
+ _$(CrossArchContentsArch)
+
+
$(ProductionVersion)~$(VersionSuffix)
@@ -77,7 +92,7 @@
>$(ProductVersion)-$(TargetArchitecture)
- $(InstallerName)-$(InstallerBuildPart)
+ $(InstallerName)-$(InstallerBuildPart)$(CrossArchContentsBuildPart)
$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(InstallerExtension)
$(AssetOutputPath)$(InstallerFileNameWithoutExtension).exe
$(AssetOutputPath)$(InstallerFileNameWithoutExtension)-engine.exe
@@ -94,6 +109,10 @@
$(SharedFrameworkLayoutDir)
+
+
+
+
diff --git a/src/installer/pkg/packaging-tools/windows/bundle/bundle.wxs b/src/installer/pkg/packaging-tools/windows/bundle/bundle.wxs
index ae9d8126bc60ab1d17584cc5b5d27f0e6971071c..42a1a4db80fbb499506192ef48eb9484cb584c83 100644
--- a/src/installer/pkg/packaging-tools/windows/bundle/bundle.wxs
+++ b/src/installer/pkg/packaging-tools/windows/bundle/bundle.wxs
@@ -48,7 +48,7 @@
-
+
diff --git a/src/installer/pkg/packaging-tools/windows/variables.wxi b/src/installer/pkg/packaging-tools/windows/variables.wxi
index 7674ae3bd82f6d6682fd63e733f41d25440bb1b9..a57061a1377aa45f0ea9304ada433676ca11dc1a 100644
--- a/src/installer/pkg/packaging-tools/windows/variables.wxi
+++ b/src/installer/pkg/packaging-tools/windows/variables.wxi
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
-
+
diff --git a/src/installer/pkg/packaging-tools/windows/wix.targets b/src/installer/pkg/packaging-tools/windows/wix.targets
index c23cc4d9cecd928fe71b26e5553f882f18e3ee82..efff3c74a9158f337f466f758980aed944bb88ec 100644
--- a/src/installer/pkg/packaging-tools/windows/wix.targets
+++ b/src/installer/pkg/packaging-tools/windows/wix.targets
@@ -237,8 +237,11 @@
-
+
+
+
+
@@ -290,12 +293,17 @@
+ GenerateCurrentArchVSInsertionNupkg;
+ GenerateCrossArchVSInsertionNupkg" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file