Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 641ee87

Browse files
dotnet-botvseanreesermsft
authored andcommittedFeb 23, 2022
Merged PR 21251: [internal/release/3.1] Update dependencies from dnceng/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)
2 parents f099d64 + c281659 commit 641ee87

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed
 

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.23-servicing.22052.2">
3+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.23-servicing.22116.1">
44
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
5-
<Sha>a9acf95fd9954ecec99f12566ff261e16ff4130a</Sha>
5+
<Sha>0dee78f90fc80c0fa4390ac1ba519c679bd503a4</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.23-servicing.22052.2">
7+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.1.23-servicing.22116.1">
88
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
9-
<Sha>a9acf95fd9954ecec99f12566ff261e16ff4130a</Sha>
9+
<Sha>0dee78f90fc80c0fa4390ac1ba519c679bd503a4</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.23-servicing.22052.2">
11+
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.1.23-servicing.22116.1">
1212
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr</Uri>
13-
<Sha>a9acf95fd9954ecec99f12566ff261e16ff4130a</Sha>
13+
<Sha>0dee78f90fc80c0fa4390ac1ba519c679bd503a4</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<MicrosoftNETCoreDotNetHostPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPackageVersion>
5454
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.1.17</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
5555
<!-- Coreclr dependencies -->
56-
<MicrosoftNETSdkILPackageVersion>3.1.23-servicing.22052.2</MicrosoftNETSdkILPackageVersion>
57-
<MicrosoftNETCoreILAsmPackageVersion>3.1.23-servicing.22052.2</MicrosoftNETCoreILAsmPackageVersion>
58-
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.23-servicing.22052.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
56+
<MicrosoftNETSdkILPackageVersion>3.1.23-servicing.22116.1</MicrosoftNETSdkILPackageVersion>
57+
<MicrosoftNETCoreILAsmPackageVersion>3.1.23-servicing.22116.1</MicrosoftNETCoreILAsmPackageVersion>
58+
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.1.23-servicing.22116.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
5959
<!-- Corefx dependencies -->
6060
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
6161
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>

‎eng/pipelines/corefx-base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
- template: /eng/pipelines/helix.yml
210210
parameters:
211211
# send tests to helix only on public builds, official scheduled builds or manual official builds.
212-
condition: eq(${{ parameters.isOfficialBuild }}, False)
212+
condition: and(ne(variables['System.TeamProject'], 'internal'), eq(${{ parameters.isOfficialBuild }}, False))
213213
targetOS: ${{ parameters.targetOS }}
214214
archGroup: $(_architecture)
215215
configuration: $(_BuildConfig)

‎eng/pipelines/macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stages:
4444
_publishTests: true
4545

4646
pool:
47-
name: Hosted macOS
47+
vmImage: macos-10.15
4848

4949
preBuildSteps:
5050
- script: |
@@ -57,4 +57,4 @@ stages:
5757
submitToHelix: true
5858

5959
variables:
60-
- macOSQueues: OSX.1013.Amd64.Open+OSX.1014.Amd64.Open
60+
- macOSQueues: OSX.1015.Amd64.Open

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.21552.6",
1313
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.21552.6",
1414
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
15-
"Microsoft.NET.Sdk.IL": "3.1.23-servicing.22052.2"
15+
"Microsoft.NET.Sdk.IL": "3.1.23-servicing.22116.1"
1616
}
1717
}

‎src/Native/Unix/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ if (APPLE)
107107

108108
# We cannot enable "stack-protector-strong" on OS X due to a bug in clang compiler (current version 7.0.2)
109109
add_compile_options(-fstack-protector)
110+
# Source-build fails on macOS due to unsafe cross-compilation error without this flag
111+
add_compile_options(-Wno-poison-system-directories)
110112
else ()
111113
add_compile_options(-fstack-protector-strong)
112114
endif ()

0 commit comments

Comments
 (0)
This repository has been archived.