|
64 | 64 | <TargetGroup Condition="'$(TargetGroup)' == ''">netcoreapp</TargetGroup> |
65 | 65 | <OSGroup Condition="'$(OSGroup)' == ''">$(DefaultOSGroup)</OSGroup> |
66 | 66 | <ConfigurationGroup Condition="'$(ConfigurationGroup)' == ''">Debug</ConfigurationGroup> |
67 | | - <HostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)</HostArch> |
68 | | - <ArchGroup Condition="'$(ArchGroup)' == '' AND '$(HostArch)' == 'Arm'">arm</ArchGroup> |
69 | | - <ArchGroup Condition="'$(ArchGroup)' == '' AND '$(HostArch)' == 'Arm64'">arm64</ArchGroup> |
70 | | - <ArchGroup Condition="'$(ArchGroup)' == ''">x64</ArchGroup> |
| 67 | + <HostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</HostArch> |
| 68 | + <ArchGroup Condition="'$(ArchGroup)' == ''">$(HostArch)</ArchGroup> |
71 | 69 |
|
72 | 70 | <!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set --> |
73 | 71 | <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">$(TargetGroup)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration> |
|
135 | 133 | <_runtimeOS Condition="'$(_runtimeOS)' == 'tizen.4.0.0'">linux</_runtimeOS> |
136 | 134 | <_runtimeOS Condition="'$(_runtimeOS)' == 'tizen.5.0.0'">linux</_runtimeOS> |
137 | 135 | <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS> |
138 | | - <ToolRuntimeRID>$(_runtimeOS)-x64</ToolRuntimeRID> |
| 136 | + <ToolRuntimeRID>$(_runtimeOS)-$(HostArch)</ToolRuntimeRID> |
139 | 137 | <!-- We build linux-musl-arm on a ubuntu container, so we can't use the toolset build for alpine runtime. We need to use portable linux RID for our toolset in order to be able to use it. --> |
140 | | - <ToolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' AND $(ArchGroup.StartsWith('arm')) AND !$(HostArch.StartsWith('Arm'))">linux-x64</ToolRuntimeRID> |
| 138 | + <ToolRuntimeRID Condition="'$(_runtimeOS)' == 'linux-musl' AND $(ArchGroup.StartsWith('arm')) AND !$(HostArch.StartsWith('arm'))">linux-x64</ToolRuntimeRID> |
141 | 139 |
|
142 | 140 | <!-- There are no WebAssembly tools, so treat them as Windows --> |
143 | 141 | <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'WebAssembly'">win-x64</ToolRuntimeRID> |
|
0 commit comments