diff --git a/src/Installers/Windows/Common/dotnethome_x64.wxs b/src/Installers/Windows/Common/dotnethome_x64.wxs new file mode 100644 index 000000000000..53e0bc4819e4 --- /dev/null +++ b/src/Installers/Windows/Common/dotnethome_x64.wxs @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + ? + + + + + + NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)" + + + + + + + + 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 9b9e4c6f0a7e..becd904b5ea6 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 33b6173a7a5b..6317450b2670 100644 --- a/src/Installers/Windows/TargetingPack/Product.wxs +++ b/src/Installers/Windows/TargetingPack/Product.wxs @@ -39,6 +39,10 @@ + + + + @@ -55,6 +59,10 @@ + + + + @@ -65,16 +73,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 61f24ee3b14a..610d68da3d43 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -48,6 +48,7 @@ +