mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Apple Silicon Distribution-Template (#10223)

Browse source 
Add hostArchitectures attribute to stop installer from requiring Rosetta

Update the minimum required version to 11.0 for Apple Silicon
This commit is contained in:
Steve MacLean 2021-04-15 16:42:30 -04:00 committed by GitHub
parent 4f02edc80b
commit c1eb61ac81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/redist/targets/GeneratePKG.targets
View file

@ -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>

4
src/redist/targets/packaging/osx/clisdk/Distribution-Template
View file

@ -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>