From 2ebbcc51868fe9e16f81c22e9d78481cdb5a208d Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Wed, 1 Sep 2021 12:46:29 -0700
Subject: [PATCH 1/6] Add x64 emulation support to pkg installers

---
 src/redist/targets/GeneratePKG.targets        |  7 +-
 .../osx/clisdk/Distribution-Template-x64      | 90 +++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64

diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index 700ee7ab7..39a79152d 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -14,6 +14,7 @@
       <SdkProductArchiveId>com.microsoft.dotnet.dev.$(Version).osx.$(Architecture)</SdkProductArchiveId>
 
       <PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
+      <x64EmulationPkgInstallDirectory>/usr/local/share/dotnet/x64</x64EmulationPkgInstallDirectory>
 
       <SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
       <SdkPkgScriptsDirectory>$(SdkPkgSourcesRootDirectory)/scripts</SdkPkgScriptsDirectory>
@@ -22,7 +23,8 @@
       <SdkPkgScriptFile>$(SdkPkgDestinationScriptsDirectory)/postinstall</SdkPkgScriptFile>
       <SdkProductArchiveResourcesDirectory>$(PkgIntermediateDirectory)/resources</SdkProductArchiveResourcesDirectory>
 
-      <SdkProductArchiveDistributionTemplateFile>$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
+      <SdkProductArchiveDistributionTemplateFile Condition="'$(Architecture)' != 'x64'">$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
+      <SdkProductArchiveDistributionTemplateFile Condition="'$(Architecture)' == 'x64'">$(SdkPkgSourcesRootDirectory)/Distribution-Template-x64</SdkProductArchiveDistributionTemplateFile>
       <SdkProductArchiveDistributionFile>$(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml</SdkProductArchiveDistributionFile>
 
       <SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
@@ -96,6 +98,9 @@
           <ReplacementString>10.13</ReplacementString>
           <ReplacementString Condition="'$(Architecture)' == 'arm64'" >11.0</ReplacementString>
         </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{x64EmulationPkgInstallDirectory}">
+          <ReplacementString>$(x64EmulationPkgInstallDirectory)</ReplacementString>
+        </DistributionTemplateReplacement>
 
         <PostInstallScriptReplacement Include="%SDK_VERSION%">
           <ReplacementString>$(Version)</ReplacementString>
diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
new file mode 100644
index 000000000..9b8c79e48
--- /dev/null
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+    <title>{CLISdkBrandName} ({arch})</title>
+    <background file="dotnetbackground.png" mime-type="image/png"/>
+    <options customize="never" require-scripts="false" hostArchitectures="{hostArchitectures}" />
+    <welcome file="welcome.html" mime-type="text/html" />
+    <conclusion file="conclusion.html" mime-type="text/html" />
+    <volume-check>
+        <allowed-os-versions>
+            <os-version min="{minOsVersion}" />
+        </allowed-os-versions>
+    </volume-check>
+    <choices-outline>
+        <line choice="{NetCoreAppTargetingPackComponentId}.pkg.x64" />
+        <line choice="{NetStandardTargetingPackComponentId}.pkg.x64" />
+        <line choice="{NetCoreAppHostPackComponentId}.pkg.x64" />
+        <line choice="{SharedFxComponentId}.pkg.x64" />
+        <line choice="{HostFxrComponentId}.pkg.x64" />
+        <line choice="{SharedHostComponentId}.pkg.x64" />
+        <line choice="{CLISdkComponentId}.pkg.x64"/>
+        <line choice="{NetCoreAppTargetingPackComponentId}.pkg.arm64" />
+        <line choice="{NetStandardTargetingPackComponentId}.pkg.arm64" />
+        <line choice="{NetCoreAppHostPackComponentId}.pkg.arm64" />
+        <line choice="{SharedFxComponentId}.pkg.arm64" />
+        <line choice="{HostFxrComponentId}.pkg.arm64" />
+        <line choice="{SharedHostComponentId}.pkg.arm64" />
+        <line choice="{CLISdkComponentId}.pkg.arm64"/>
+    </choices-outline>
+    <choice id="{NetCoreAppTargetingPackComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{NetCoreAppTargetingPackBrandName} ({arch})" description="The .NET Targeting Pack">
+        <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
+    </choice>
+    <choice id="{NetStandardTargetingPackComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{NetStandardTargetingPackBrandName} ({arch})" description="The .NET Standard 2.1 Targeting Pack">
+        <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
+    </choice>
+    <choice id="{NetCoreAppHostPackComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{NetCoreAppHostPackBrandName} ({arch})" description="The .NET App Host Pack">
+        <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
+    </choice>
+    <choice id="{SharedFxComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{SharedFxBrandName} ({arch})" description="The .NET Shared Framework">
+        <pkg-ref id="{SharedFxComponentId}.pkg" />
+    </choice>
+    <choice id="{HostFxrComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{HostFxrBrandName} ({arch})" description="The .NET Host FX Resolver">
+        <pkg-ref id="{HostFxrComponentId}.pkg" />
+    </choice>
+    <choice id="{SharedHostComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{SharedHostBrandName} ({arch})" description="The .NET Shared Host.">
+        <pkg-ref id="{SharedHostComponentId}.pkg" />
+    </choice>
+    <choice id="{CLISdkComponentId}.pkg.x64" visible="true" selected="IsX64Machine()" title="{CLISdkBrandName} ({arch})" description="The .NET SDK">
+        <pkg-ref id="{CLISdkComponentId}.pkg"/>
+    </choice>
+    <choice id="{NetCoreAppTargetingPackComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{NetCoreAppTargetingPackBrandName} ({arch})" description="The .NET Targeting Pack">
+        <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
+    </choice>
+    <choice id="{NetStandardTargetingPackComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{NetStandardTargetingPackBrandName} ({arch})" description="The .NET Standard 2.1 Targeting Pack">
+        <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
+    </choice>
+    <choice id="{NetCoreAppHostPackComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{NetCoreAppHostPackBrandName} ({arch})" description="The .NET App Host Pack">
+        <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
+    </choice>
+    <choice id="{SharedFxComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{SharedFxBrandName} ({arch})" description="The .NET Shared Framework">
+        <pkg-ref id="{SharedFxComponentId}.pkg" />
+    </choice>
+    <choice id="{HostFxrComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{HostFxrBrandName} ({arch})" description="The .NET Host FX Resolver">
+        <pkg-ref id="{HostFxrComponentId}.pkg" />
+    </choice>
+    <choice id="{SharedHostComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{SharedHostBrandName} ({arch})" description="The .NET Shared Host.">
+        <pkg-ref id="{SharedHostComponentId}.pkg" />
+    </choice>
+    <choice id="{CLISdkComponentId}.pkg.arm64" visible="true" selected="!IsX64Machine()" customLocation="{x64EmulationPkgInstallDirectory}" title="{CLISdkBrandName} ({arch})" description="The .NET SDK">
+        <pkg-ref id="{CLISdkComponentId}.pkg"/>
+    </choice>
+    <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg">{NetStandardTargetingPackComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg">{NetCoreAppHostPackComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{CLISdkComponentId}.pkg">{CLISdkComponentId}.pkg</pkg-ref>
+    <script>
+<![CDATA[
+function IsX64Machine() {
+    var machine = system.sysctl("hw.machine");
+    system.log("Machine type: " + machine);
+    
+    var result = machine == "x64" || machine.endsWith("_x64");
+    system.log("IsX64Machine: " + result);
+    return result;
+}
+]]>
+    </script>
+</installer-gui-script>

From e8ec98a819b694794b60ee87a71f340a732d5e05 Mon Sep 17 00:00:00 2001
From: sfoslund <sfoslund@microsoft.com>
Date: Fri, 17 Sep 2021 13:53:42 -0700
Subject: [PATCH 2/6] Update x64 machine detection script

---
 .../packaging/osx/clisdk/Distribution-Template-x64        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
index 9b8c79e48..3e3b3ebda 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
@@ -78,10 +78,14 @@
     <script>
 <![CDATA[
 function IsX64Machine() {
-    var machine = system.sysctl("hw.machine");
+    var machine = system.sysctl("hw.foo");
+    var cputype = system.sysctl("hw.cputype");
+    var cpu64 = system.sysctl("hw.cpu64bit_capable");
     system.log("Machine type: " + machine);
+    system.log("Cpu type: " + cputype);
+    system.log("64-bit: " + cpu64);
     
-    var result = machine == "x64" || machine.endsWith("_x64");
+    var result = machine == "amd64" || machine == "x86_64" || cputype == "16777223" || (cputype == "7" && cpu64 == "1");
     system.log("IsX64Machine: " + result);
     return result;
 }

From 2016fa8577760e966c020fabc09613f03e39c962 Mon Sep 17 00:00:00 2001
From: sfoslund <sfoslund@microsoft.com>
Date: Fri, 17 Sep 2021 14:34:48 -0700
Subject: [PATCH 3/6] Add comments to x64 machine detection script

---
 .../targets/packaging/osx/clisdk/Distribution-Template-x64     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
index 3e3b3ebda..9a604beb1 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
@@ -85,6 +85,9 @@ function IsX64Machine() {
     system.log("Cpu type: " + cputype);
     system.log("64-bit: " + cpu64);
     
+    // From machine.h
+    // CPU_TYPE_X86_64 = CPU_TYPE_X86 | CPU_ARCH_ABI64 = 0x010000007 = 16777223
+    // CPU_TYPE_X86 = 7
     var result = machine == "amd64" || machine == "x86_64" || cputype == "16777223" || (cputype == "7" && cpu64 == "1");
     system.log("IsX64Machine: " + result);
     return result;

From 41187bde643eac099d5786f175060f6d6a88cf26 Mon Sep 17 00:00:00 2001
From: sfoslund <sfoslund@microsoft.com>
Date: Mon, 20 Sep 2021 08:50:15 -0700
Subject: [PATCH 4/6] Fix typo in mac installer generation script

---
 .../targets/packaging/osx/clisdk/Distribution-Template-x64      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
index 9a604beb1..57a036caa 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
@@ -78,7 +78,7 @@
     <script>
 <![CDATA[
 function IsX64Machine() {
-    var machine = system.sysctl("hw.foo");
+    var machine = system.sysctl("hw.machine");
     var cputype = system.sysctl("hw.cputype");
     var cpu64 = system.sysctl("hw.cpu64bit_capable");
     system.log("Machine type: " + machine);

From f2da3b6c6b0e2a499a307430325e074df22daed5 Mon Sep 17 00:00:00 2001
From: sfoslund <sfoslund@microsoft.com>
Date: Mon, 20 Sep 2021 14:24:00 -0700
Subject: [PATCH 5/6] Account for translated pkg execution

---
 .../targets/packaging/osx/clisdk/Distribution-Template-x64     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
index 57a036caa..ecb7fbe0b 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
@@ -81,14 +81,17 @@ function IsX64Machine() {
     var machine = system.sysctl("hw.machine");
     var cputype = system.sysctl("hw.cputype");
     var cpu64 = system.sysctl("hw.cpu64bit_capable");
+    var translated = system.sysctl("sysctl.proc_translated");
     system.log("Machine type: " + machine);
     system.log("Cpu type: " + cputype);
     system.log("64-bit: " + cpu64);
+    system.log("Translated: " + translated);
     
     // From machine.h
     // CPU_TYPE_X86_64 = CPU_TYPE_X86 | CPU_ARCH_ABI64 = 0x010000007 = 16777223
     // CPU_TYPE_X86 = 7
     var result = machine == "amd64" || machine == "x86_64" || cputype == "16777223" || (cputype == "7" && cpu64 == "1");
+    result = result && (translated != "1");
     system.log("IsX64Machine: " + result);
     return result;
 }

From 94eb8849b79d4717013bc4d09bc86eced6386a36 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Mon, 20 Sep 2021 14:39:37 -0700
Subject: [PATCH 6/6] Add comment for translation check

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
---
 .../targets/packaging/osx/clisdk/Distribution-Template-x64       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
index ecb7fbe0b..cbd637311 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64
@@ -91,6 +91,7 @@ function IsX64Machine() {
     // CPU_TYPE_X86_64 = CPU_TYPE_X86 | CPU_ARCH_ABI64 = 0x010000007 = 16777223
     // CPU_TYPE_X86 = 7
     var result = machine == "amd64" || machine == "x86_64" || cputype == "16777223" || (cputype == "7" && cpu64 == "1");
+    // We may be running under translation (Rosetta) that makes it seem like system is x64, if so assume machine is not actually x64
     result = result && (translated != "1");
     system.log("IsX64Machine: " + result);
     return result;