Use osx-x64 NetStandardTargetingPack for osx-arm64

Author: sdmaclea

src/redist/targets/GenerateLayout.targets

@@ -59,6 +59,11 @@
       <DownloadedArm64NetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(MicrosoftNETCoreAppHostPackageVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension)</DownloadedArm64NetCoreAppHostPackInstallerFileName>
       <DownloadedWindowsDesktopTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
       <DownloadedNetStandardTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
+      <!-- osx-arm64 netstandard targeting pack pkg is unavailable. Use osx-x64.
+          This should be OK, because the package is just a compressed file containing reference assemblies and
+          runtime independent manifest text files.
+      -->
+      <DownloadedNetStandardTargetingPackInstallerFileName Condition="'$(SharedFrameworkInstallerFileRid)' == 'osx-arm64'">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-osx-x64$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
       <NetStandardTargetingPackTargetFramework>netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackTargetFramework>
 
       <!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
@@ -189,7 +194,7 @@
 
       <!-- TODO: Should we somehow obtain a .NET Standard ARM64 package? -->
       <BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
-                           Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+                           Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And (!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'osx-arm64')">
         <BaseUrl>$(CoreSetupRootUrl)$(NETCoreAppTargetingPackBlobVersion)</BaseUrl>
         <BaseUrl>$(CoreSetupRootUrl)3.0.0</BaseUrl>
         <DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName>

src/redist/targets/GeneratePKG.targets

@@ -103,22 +103,6 @@
           <ReplacementString>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</ReplacementString>
         </ResourcesReplacement>
       </ItemGroup>
-      <ItemGroup Condition="'$(Architecture)' != 'arm64'" >
-        <DistributionTemplateReplacement Include="{NetStandardTargetingPackDisableBegin}">
-          <ReplacementString></ReplacementString>
-        </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{NetStandardTargetingPackDisableEnd}">
-          <ReplacementString></ReplacementString>
-        </DistributionTemplateReplacement>
-      </ItemGroup>
-      <ItemGroup Condition="'$(Architecture)' == 'arm64'" >
-        <DistributionTemplateReplacement Include="{NetStandardTargetingPackDisableBegin}">
-          <ReplacementString><![CDATA[<!--]]></ReplacementString>
-        </DistributionTemplateReplacement>
-        <DistributionTemplateReplacement Include="{NetStandardTargetingPackDisableEnd}">
-          <ReplacementString><![CDATA[-->]]></ReplacementString>
-        </DistributionTemplateReplacement>
-      </ItemGroup>
 
       <!-- Consumed By Publish -->
       <ItemGroup>
@@ -197,16 +181,16 @@
                                 $(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName);
+                                $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" />
-        <PkgComponentsSourceFiles Condition="'$(Architecture)' != 'arm64'" Include="$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)" />
         <PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
                                                 $(SharedFrameworkPkgIntermediatePath);
                                                 $(NetCoreAppTargetingPackPkgIntermediatePath);
                                                 $(NetCoreAppHostPackPkgIntermediatePath);
+                                                $(NetStandardTargetingPackPkgIntermediatePath);
                                                 $(HostFxrPkgIntermediatePath);
                                                 $(SharedHostPkgIntermediatePath)" />
-        <PkgComponentsDestinationFiles Condition="'$(Architecture)' != 'arm64'" Include="$(NetStandardTargetingPackPkgIntermediatePath)" />
       </ItemGroup>
 
       <!-- Move ProductArchive pkg components into place with component ids in the filenames -->

src/redist/targets/packaging/osx/clisdk/Distribution-Template

@@ -12,9 +12,7 @@
     </volume-check>
     <choices-outline>
         <line choice="{NetCoreAppTargetingPackComponentId}.pkg" />
-        {NetStandardTargetingPackDisableBegin}
         <line choice="{NetStandardTargetingPackComponentId}.pkg" />
-        {NetStandardTargetingPackDisableEnd}
         <line choice="{NetCoreAppHostPackComponentId}.pkg" />
         <line choice="{SharedFxComponentId}.pkg" />
         <line choice="{HostFxrComponentId}.pkg" />
@@ -24,11 +22,9 @@
     <choice id="{NetCoreAppTargetingPackComponentId}.pkg" visible="true" title="{NetCoreAppTargetingPackBrandName} ({arch})" description="The .NET Targeting Pack">
         <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
     </choice>
-    {NetStandardTargetingPackDisableBegin}
     <choice id="{NetStandardTargetingPackComponentId}.pkg" visible="true" title="{NetStandardTargetingPackBrandName} ({arch})" description="The .NET Standard 2.1 Targeting Pack">
         <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
     </choice>
-    {NetStandardTargetingPackDisableEnd}
     <choice id="{NetCoreAppHostPackComponentId}.pkg" visible="true" title="{NetCoreAppHostPackBrandName} ({arch})" description="The .NET App Host Pack">
         <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
     </choice>
@@ -45,9 +41,7 @@
         <pkg-ref id="{CLISdkComponentId}.pkg"/>
     </choice>
     <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
-    {NetStandardTargetingPackDisableBegin}
     <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg">{NetStandardTargetingPackComponentId}.pkg</pkg-ref>
-    {NetStandardTargetingPackDisableEnd}
     <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>