Publish cross-bitness cross-architecture tools on Linux/arm32 (dotnet/core-setup...

* Use Hostx64/arm CrossGen for producing native images when build targets Linux/arm

* Keep using Hostx86/arm CrossGen when build targets Windows/arm

* Publish both Hostx64/arm and Hostx86/arm cross-architecture components (CrossGen and ClrJit) when build targets Linux/arm

Commit migrated from https://github.com/dotnet/core-setup/commit/0b93a11e284a23080f27ac40ce3de518a9c2ca18

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
index 7c8b478..3b13451 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
@@ -67,7 +67,9 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <_crossDir Condition="'$(TargetArchitecture)' == 'arm'">/x86_arm</_crossDir>
+      <_crossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' == 'Windows_NT'">/x86_arm</_crossDir>
+      <_crossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">/x64_arm</_crossDir>
+      <_obsoleteCrossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">/x86_arm</_obsoleteCrossDir>
       <_crossDir Condition="'$(TargetArchitecture)' == 'arm64'">/x64_arm64</_crossDir>
     </PropertyGroup>
 
@@ -164,6 +166,10 @@
         <TargetPath>runtimes$(_crossDir)/native</TargetPath>
         <IsNative>true</IsNative>
       </FilesToPackage>
+      <FilesToPackage Condition="'$(_obsoleteCrossDir)' != ''" Include="$(_jitPackagePath)/runtimes$(_obsoleteCrossDir)/native/*.*">
+        <TargetPath>runtimes$(_obsoleteCrossDir)/native</TargetPath>
+        <IsNative>true</IsNative>
+      </FilesToPackage>
     </ItemGroup>
 
     <ItemGroup Condition="'$(NuGetRuntimeIdentifier)' == ''">