Merged PR 21251: [internal/release/3.1] Update dependencies from dnce…

…ng/internal/dotnet-coreclr

This pull request updates the following dependencies

[marker]: <> (Begin:e602b4c3-5c4b-44ff-d44b-08d76e1d3434)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr
- **Subscription**: e602b4c3-5c4b-44ff-d44b-08d76e1d3434
- **Build**: 20220216.1
- **Date Produced**: February 17, 2022 12:48:34 AM UTC
- **Commit**: 0dee78f90fc80c0fa4390ac1ba519c679bd503a4
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk.IL**: [from 3.1.23-servicing.22052.2 to 3.1.23-servicing.22116.1][1]
  - **Microsoft.NETCore.ILAsm**: [from 3.1.23-servicing.22052.2 to 3.1.23-servicing.22116.1][1]
  - **Microsoft.NETCore.Runtime.CoreCLR**: [from 3.1.23-servicing.22052.2 to 3.1.23-servicing.22116.1][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr/branches?baseVersion=GCa9acf95&targetVersion=GC0dee78f&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:e602b4c3-5c4b-44ff-d44b-08d76e1d3434)

eng/Version.Details.xml

@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.23-servicing.22052.2">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.23-servicing.22116.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
-      <Sha>a9acf95fd9954ecec99f12566ff261e16ff4130a</Sha>
+      <Sha>0dee78f90fc80c0fa4390ac1ba519c679bd503a4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.23-servicing.22052.2">
+    <Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.23-servicing.22116.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
-      <Sha>a9acf95fd9954ecec99f12566ff261e16ff4130a</Sha>
+      <Sha>0dee78f90fc80c0fa4390ac1ba519c679bd503a4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.23-servicing.22052.2">
+    <Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.23-servicing.22116.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
-      <Sha>a9acf95fd9954ecec99f12566ff261e16ff4130a</Sha>
+      <Sha>0dee78f90fc80c0fa4390ac1ba519c679bd503a4</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -53,9 +53,9 @@
     <MicrosoftNETCoreDotNetHostPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPackageVersion>
     <MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
     <!-- Coreclr dependencies -->
-    <MicrosoftNETSdkILPackageVersion>3.1.23-servicing.22052.2</MicrosoftNETSdkILPackageVersion>
-    <MicrosoftNETCoreILAsmPackageVersion>3.1.23-servicing.22052.2</MicrosoftNETCoreILAsmPackageVersion>
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.23-servicing.22052.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+    <MicrosoftNETSdkILPackageVersion>3.1.23-servicing.22116.1</MicrosoftNETSdkILPackageVersion>
+    <MicrosoftNETCoreILAsmPackageVersion>3.1.23-servicing.22116.1</MicrosoftNETCoreILAsmPackageVersion>
+    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.23-servicing.22116.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
     <!-- Corefx dependencies -->
     <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
     <runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>

eng/pipelines/corefx-base.yml

@@ -209,7 +209,7 @@ jobs:
             - template: /eng/pipelines/helix.yml
               parameters:
                 # send tests to helix only on public builds, official scheduled builds or manual official builds.
-                condition: eq(${{ parameters.isOfficialBuild }}, False)
+                condition: and(ne(variables['System.TeamProject'], 'internal'), eq(${{ parameters.isOfficialBuild }}, False))
                 targetOS: ${{ parameters.targetOS }}
                 archGroup: $(_architecture)
                 configuration: $(_BuildConfig)

eng/pipelines/macos.yml

@@ -44,7 +44,7 @@ stages:
                 _publishTests: true
 
         pool:
-          name: Hosted macOS
+          vmImage: macos-10.15
 
         preBuildSteps:
           - script: |
@@ -57,4 +57,4 @@ stages:
         submitToHelix: true
 
         variables:
-            - macOSQueues: OSX.1013.Amd64.Open+OSX.1014.Amd64.Open
+            - macOSQueues: OSX.1015.Amd64.Open

global.json

@@ -12,6 +12,6 @@
     "Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.21552.6",
     "Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.21552.6",
     "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
-    "Microsoft.NET.Sdk.IL": "3.1.23-servicing.22052.2"
+    "Microsoft.NET.Sdk.IL": "3.1.23-servicing.22116.1"
   }
 }

src/Native/Unix/CMakeLists.txt

@@ -107,6 +107,8 @@ if (APPLE)
 
    # We cannot enable "stack-protector-strong" on OS X due to a bug in clang compiler (current version 7.0.2)
    add_compile_options(-fstack-protector)
+   # Source-build fails on macOS due to unsafe cross-compilation error without this flag
+   add_compile_options(-Wno-poison-system-directories)
 else ()
    add_compile_options(-fstack-protector-strong)
 endif ()