File tree Expand file tree Collapse file tree 5 files changed +12
-7
lines changed Expand file tree Collapse file tree 5 files changed +12
-7
lines changed Original file line number Diff line number Diff line change 77 <PackageLicenseExpression >MIT</PackageLicenseExpression >
88 </PropertyGroup >
99
10+ <PropertyGroup >
11+ <BuildArchitecture >$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture >
12+ <Architecture Condition =" '$(Architecture)' == '' AND '$(BuildArchitecture)' == 'arm64'" >$(BuildArchitecture)</Architecture >
13+ <Architecture Condition =" '$(Architecture)' == ''" >x64</Architecture >
14+ </PropertyGroup >
15+
1016 <PropertyGroup >
1117 <TreatWarningsAsErrors >True</TreatWarningsAsErrors >
1218 <DebugType >embedded</DebugType >
Original file line number Diff line number Diff line change 8787 <VersionToolsVersion >$(BuildTasksFeedToolVersion)</VersionToolsVersion >
8888 <DotnetDebToolVersion >2.0.0</DotnetDebToolVersion >
8989 <MicrosoftNETTestSdkVersion >15.8.0</MicrosoftNETTestSdkVersion >
90- <MicrosoftSourceLinkVersion >1.0.0-beta2-18618-05 </MicrosoftSourceLinkVersion >
90+ <MicrosoftSourceLinkVersion >1.0.0-beta2-19367-01 </MicrosoftSourceLinkVersion >
9191 </PropertyGroup >
9292 <PropertyGroup >
9393 <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
Original file line number Diff line number Diff line change 55
66 <PropertyGroup >
77 <RuntimeNETCoreAppPackageName >runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName >
8- <_crossDir Condition =" '$(Architecture)' == 'arm64'" >/x64_arm64</_crossDir >
8+ <_crossDir Condition =" '$(Architecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64' " >/x64_arm64</_crossDir >
99 <_crossDir Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'win'" >/x86_arm</_crossDir >
1010 <_crossDir Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'linux'" >/x64_arm</_crossDir >
1111 <CrossgenPath >$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)</CrossgenPath >
12- <LibCLRJitRid Condition =" !$(Architecture.StartsWith('arm'))" >$(SharedFrameworkRid)</LibCLRJitRid >
13- <LibCLRJitRid Condition =" '$(Architecture)' == 'arm64'" >x64_arm64</LibCLRJitRid >
12+ <LibCLRJitRid Condition =" '$(Architecture)' == 'arm64' and '$(BuildArchitecture)' == 'x64'" >x64_arm64</LibCLRJitRid >
1413 <LibCLRJitRid Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'win'" >x86_arm</LibCLRJitRid >
1514 <LibCLRJitRid Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'linux'" >x64_arm</LibCLRJitRid >
15+ <LibCLRJitRid Condition =" '$(LibCLRJitRid)' == ''" >$(SharedFrameworkRid)</LibCLRJitRid >
1616 <LibCLRJitPath >$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath >
1717 <SharedFrameworkNameVersionPath >$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkNameVersionPath >
1818 <DIASymReaderCrossgenFilter >*</DIASymReaderCrossgenFilter >
Original file line number Diff line number Diff line change 2525
2626 <!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
2727 <SharedFrameworkInstallerFileRid >$(CoreSetupRid)</SharedFrameworkInstallerFileRid >
28- <SharedFrameworkInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' " >x64 </SharedFrameworkInstallerFileRid >
28+ <SharedFrameworkInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' " >$(Architecture) </SharedFrameworkInstallerFileRid >
2929
3030 <!-- Use the "x64" Rid when downloading Linux runtime dependencies Debian package. -->
3131 <RuntimeDepsInstallerFileRid >$(CoreSetupRid)</RuntimeDepsInstallerFileRid >
32- <RuntimeDepsInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' " >x64 </RuntimeDepsInstallerFileRid >
32+ <RuntimeDepsInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' " >$(Architecture) </RuntimeDepsInstallerFileRid >
3333
3434 <DownloadedSharedHostInstallerFileName Condition =" '$(InstallerExtension)' != '' " >dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName >
3535 <DownloadedHostFxrInstallerFileName Condition =" '$(InstallerExtension)' != '' " >dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName >
Original file line number Diff line number Diff line change 1313 <OSName Condition =" '$(OSName)' == '' AND '$(IsLinux)' == 'True' " >linux</OSName >
1414 <OSPlatform Condition =" '$(OSPlatform)' == '' AND '$(IsLinux)' == 'True' " >linux</OSPlatform >
1515
16- <Architecture Condition =" '$(Architecture)' == '' " >x64</Architecture >
1716 <Rid Condition =" '$(Rid)' == '' " >$(OSName)-$(Architecture)</Rid >
1817 </PropertyGroup >
1918
You can’t perform that action at this time.
0 commit comments