diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3a802f1f3b0..040b4e4aa60a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr - a9acf95fd9954ecec99f12566ff261e16ff4130a + 0dee78f90fc80c0fa4390ac1ba519c679bd503a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr - a9acf95fd9954ecec99f12566ff261e16ff4130a + 0dee78f90fc80c0fa4390ac1ba519c679bd503a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-coreclr - a9acf95fd9954ecec99f12566ff261e16ff4130a + 0dee78f90fc80c0fa4390ac1ba519c679bd503a4 diff --git a/eng/Versions.props b/eng/Versions.props index 830ec3858208..0206c1758fae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ 3.1.17 3.1.17 - 3.1.23-servicing.22052.2 - 3.1.23-servicing.22052.2 - 3.1.23-servicing.22052.2 + 3.1.23-servicing.22116.1 + 3.1.23-servicing.22116.1 + 3.1.23-servicing.22116.1 3.0.0-preview9.19409.15 4.6.0-preview9.19409.15 diff --git a/eng/pipelines/corefx-base.yml b/eng/pipelines/corefx-base.yml index 35e0e0b18268..062e7bc138c3 100644 --- a/eng/pipelines/corefx-base.yml +++ b/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) diff --git a/eng/pipelines/macos.yml b/eng/pipelines/macos.yml index cf3984d83c6a..891aab0f9372 100644 --- a/eng/pipelines/macos.yml +++ b/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 diff --git a/global.json b/global.json index 1295e13636c2..39677f7b656d 100644 --- a/global.json +++ b/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" } } diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt index c5772c7e02c9..c54905cdf3a0 100644 --- a/src/Native/Unix/CMakeLists.txt +++ b/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 ()