From c1eb61ac8152d6777b0d685e37b32885fd37775d Mon Sep 17 00:00:00 2001
From: Steve MacLean <Steve.MacLean@microsoft.com>
Date: Thu, 15 Apr 2021 16:42:30 -0400
Subject: [PATCH] Apple Silicon Distribution-Template (#10223)

Add hostArchitectures attribute to stop installer from requiring Rosetta

Update the minimum required version to 11.0 for Apple Silicon
---
 src/redist/targets/GeneratePKG.targets                    | 8 ++++++++
 .../targets/packaging/osx/clisdk/Distribution-Template    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index 7f33c208d..1d14596fa 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -88,6 +88,14 @@
         <DistributionTemplateReplacement Include="{arch}">
           <ReplacementString>$(Architecture)</ReplacementString>
         </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{hostArchitectures}">
+          <ReplacementString>$(Architecture)</ReplacementString>
+          <ReplacementString Condition="'$(Architecture)' == 'x64'" >x86_64</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{minOsVersion}">
+          <ReplacementString>10.13</ReplacementString>
+          <ReplacementString Condition="'$(Architecture)' == 'arm64'" >11.0</ReplacementString>
+        </DistributionTemplateReplacement>
 
         <PostInstallScriptReplacement Include="%SDK_VERSION%">
           <ReplacementString>$(Version)</ReplacementString>
diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
index 3535ac201..87a917149 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
@@ -2,12 +2,12 @@
 <installer-gui-script minSpecVersion="1">
     <title>{CLISdkBrandName} ({arch})</title>
     <background file="dotnetbackground.png" mime-type="image/png"/>
-    <options customize="never" require-scripts="false" />
+    <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="10.13" />
+            <os-version min="{minOsVersion}" />
         </allowed-os-versions>
     </volume-check>
     <choices-outline>