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'" Architecture >
13+     <Architecture  Condition =" '$(Architecture)' == ''" Architecture >
14+   </PropertyGroup >
15+ 
1016  <PropertyGroup >
1117    <TreatWarningsAsErrors >True</TreatWarningsAsErrors >
1218    <DebugType >embedded</DebugType >
Original file line number Diff line number Diff line change 122122    <VersionToolsVersion >$(BuildTasksFeedToolVersion)</VersionToolsVersion >
123123    <DotnetDebToolVersion >2.0.0</DotnetDebToolVersion >
124124    <MicrosoftNETTestSdkVersion >15.8.0</MicrosoftNETTestSdkVersion >
125-     <MicrosoftSourceLinkVersion >1.0.0-beta2-18618-05 </MicrosoftSourceLinkVersion >
125+     <MicrosoftSourceLinkVersion >1.0.0-beta2-19367-01 </MicrosoftSourceLinkVersion >
126126  </PropertyGroup >
127127  <PropertyGroup >
128128    <!--  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 >microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName >
8-       <_crossDir  Condition =" '$(Architecture)' == 'arm64'" _crossDir >
8+       <_crossDir  Condition =" '$(Architecture)' == 'arm64' and '$(BuildArchitecture)' != 'arm64' " _crossDir >
99      <_crossDir  Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'win'" _crossDir >
1010      <_crossDir  Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'linux'" _crossDir >
1111      <CrossgenPath >$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)</CrossgenPath >
12-       <LibCLRJitRid  Condition =" !$(Architecture.StartsWith('arm'))" LibCLRJitRid >
13-       <LibCLRJitRid  Condition =" '$(Architecture)' == 'arm64'" LibCLRJitRid >
12+       <LibCLRJitRid  Condition =" '$(Architecture)' == 'arm64' and '$(BuildArchitecture)' == 'x64'" LibCLRJitRid >
1413      <LibCLRJitRid  Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'win'" LibCLRJitRid >
1514      <LibCLRJitRid  Condition =" '$(Architecture)' == 'arm' And '$(OSName)' == 'linux'" LibCLRJitRid >
15+       <LibCLRJitRid  Condition =" '$(LibCLRJitRid)' == ''" LibCLRJitRid >
1616      <LibCLRJitPath >$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath >
1717      <SharedFrameworkNameVersionPath >$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkNameVersionPath >
1818      <DIASymReaderCrossgenFilter >*</DIASymReaderCrossgenFilter >
Original file line number Diff line number Diff line change 4848
4949      <!--  Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. --> 
5050      <SharedFrameworkInstallerFileRid >$(CoreSetupRid)</SharedFrameworkInstallerFileRid >
51-       <SharedFrameworkInstallerFileRid  Condition ="  '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' " x64 </SharedFrameworkInstallerFileRid >
51+       <SharedFrameworkInstallerFileRid  Condition ="  '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' " $(Architecture) </SharedFrameworkInstallerFileRid >
5252
5353      <!--  Use the "x64" Rid when downloading Linux runtime dependencies Debian package. --> 
5454      <RuntimeDepsInstallerFileRid >$(CoreSetupRid)</RuntimeDepsInstallerFileRid >
55-       <RuntimeDepsInstallerFileRid  Condition ="  '$(IsDebianBaseDistro)' == 'true' " x64 </RuntimeDepsInstallerFileRid >
55+       <RuntimeDepsInstallerFileRid  Condition ="  '$(IsDebianBaseDistro)' == 'true' " $(Architecture) </RuntimeDepsInstallerFileRid >
5656
5757      <AlternateArchitecture  Condition =" '$(Architecture)' == 'x86'" AlternateArchitecture >
5858      <AlternateArchitecture  Condition =" '$(Architecture)' == 'x64'" AlternateArchitecture >
Original file line number Diff line number Diff line change 1313      <OSName  Condition ="  '$(OSName)' == '' AND '$(IsLinux)' == 'True' " OSName >
1414      <OSPlatform  Condition ="  '$(OSPlatform)' == '' AND '$(IsLinux)' == 'True' " OSPlatform >
1515
16-       <Architecture  Condition ="  '$(Architecture)' == '' " Architecture >
1716      <Rid  Condition ="  '$(Rid)' == '' " Rid >
1817    </PropertyGroup >
1918
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments