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 7
7
<PackageLicenseExpression >MIT</PackageLicenseExpression >
8
8
</PropertyGroup >
9
9
10
+ <PropertyGroup >
11
+ <BuildArchitecture >$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture >
12
+ <Architecture Condition =" '$(BuildArchitecture)' == 'arm64'" >$(BuildArchitecture)</Architecture >
13
+ <Architecture Condition =" '$(Architecture)' == ''" >x64</Architecture >
14
+ </PropertyGroup >
15
+
10
16
<PropertyGroup >
11
17
<TreatWarningsAsErrors >True</TreatWarningsAsErrors >
12
18
<DebugType >embedded</DebugType >
Original file line number Diff line number Diff line change 87
87
<VersionToolsVersion >$(BuildTasksFeedToolVersion)</VersionToolsVersion >
88
88
<DotnetDebToolVersion >2.0.0</DotnetDebToolVersion >
89
89
<MicrosoftNETTestSdkVersion >15.8.0</MicrosoftNETTestSdkVersion >
90
- <MicrosoftSourceLinkVersion >1.0.0-beta2-18618-05 </MicrosoftSourceLinkVersion >
90
+ <MicrosoftSourceLinkVersion >1.0.0-beta2-19367-01 </MicrosoftSourceLinkVersion >
91
91
</PropertyGroup >
92
92
<PropertyGroup >
93
93
<!-- 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 5
5
6
6
<PropertyGroup >
7
7
<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 >
9
9
<_crossDir Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'win'" >/x86_arm</_crossDir >
10
10
<_crossDir Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'linux'" >/x64_arm</_crossDir >
11
11
<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 >
14
13
<LibCLRJitRid Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'win'" >x86_arm</LibCLRJitRid >
15
14
<LibCLRJitRid Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'linux'" >x64_arm</LibCLRJitRid >
15
+ <LibCLRJitRid Condition =" '$(LibCLRJitRid)' == ''" >$(SharedFrameworkRid)</LibCLRJitRid >
16
16
<LibCLRJitPath >$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath >
17
17
<SharedFrameworkNameVersionPath >$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkNameVersionPath >
18
18
<DIASymReaderCrossgenFilter >*</DIASymReaderCrossgenFilter >
Original file line number Diff line number Diff line change 25
25
26
26
<!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
27
27
<SharedFrameworkInstallerFileRid >$(CoreSetupRid)</SharedFrameworkInstallerFileRid >
28
- <SharedFrameworkInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' " >x64 </SharedFrameworkInstallerFileRid >
28
+ <SharedFrameworkInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' " >$(Architecture) </SharedFrameworkInstallerFileRid >
29
29
30
30
<!-- Use the "x64" Rid when downloading Linux runtime dependencies Debian package. -->
31
31
<RuntimeDepsInstallerFileRid >$(CoreSetupRid)</RuntimeDepsInstallerFileRid >
32
- <RuntimeDepsInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' " >x64 </RuntimeDepsInstallerFileRid >
32
+ <RuntimeDepsInstallerFileRid Condition =" '$(IsDebianBaseDistro)' == 'true' " >$(Architecture) </RuntimeDepsInstallerFileRid >
33
33
34
34
<DownloadedSharedHostInstallerFileName Condition =" '$(InstallerExtension)' != '' " >dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName >
35
35
<DownloadedHostFxrInstallerFileName Condition =" '$(InstallerExtension)' != '' " >dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName >
Original file line number Diff line number Diff line change 13
13
<OSName Condition =" '$(OSName)' == '' AND '$(IsLinux)' == 'True' " >linux</OSName >
14
14
<OSPlatform Condition =" '$(OSPlatform)' == '' AND '$(IsLinux)' == 'True' " >linux</OSPlatform >
15
15
16
- <Architecture Condition =" '$(Architecture)' == '' " >x64</Architecture >
17
16
<Rid Condition =" '$(Rid)' == '' " >$(OSName)-$(Architecture)</Rid >
18
17
</PropertyGroup >
19
18
You can’t perform that action at this time.
0 commit comments