diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d4e6f358addc4..d1e372f095ee04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,9 +24,9 @@ https://github.com/dotnet/core-setup 8743c312a9d1ce4035140046d44bb959c44f194f - + https://github.com/dotnet/corefx - 5cee7c97d602f294e27c582d4dab81ec388f1d7b + cf64918877d98577363bb40d5eafac52beb80a79 https://github.com/dotnet/coreclr @@ -52,71 +52,71 @@ https://github.com/dotnet/standard 90b5f3b33752884a93e0f01b1a5d901aace2bc18 - + https://github.com/mono/linker - d5e90f5814c48cbae141e93f13194934e73c1265 + 6e2ce49b6304b9080cdd0c2e4712e2f6999e9e8f - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 - + https://github.com/dotnet/arcade - c1cd0349f7d29cf21d93d61cdea382aecc422e36 + 2c6db6ee8d8adeb2e8ccc1485e6780635890e419 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0f806ee847c24d..4f54029178a4cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,16 +32,16 @@ - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 - 2.5.1-beta.19564.6 - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 - 5.0.0-beta.19564.6 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 + 2.5.1-beta.19566.1 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 + 5.0.0-beta.19566.1 5.0.0-alpha.1.19562.8 5.0.0-alpha.1.19563.6 @@ -58,7 +58,7 @@ 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 - 5.0.0-alpha.1.19563.6 + 5.0.0-alpha.1.19563.3 2.2.0-prerelease.19563.1 @@ -98,7 +98,7 @@ 3.0.0-preview9-190909-1 - 0.1.6-prerelease.19564.1 + 0.1.6-prerelease.19566.1 diff --git a/eng/pipelines/coreclr/templates/platform-matrix.yml b/eng/pipelines/coreclr/templates/platform-matrix.yml index 888730b44a9f17..f022a0f9dcc1f2 100644 --- a/eng/pipelines/coreclr/templates/platform-matrix.yml +++ b/eng/pipelines/coreclr/templates/platform-matrix.yml @@ -57,12 +57,12 @@ jobs: registry: mcr helixQueues: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - (Ubuntu.1804.Arm64.Open)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855 + - (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855 - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.helixQueueGroup, 'pr', 'ci', 'corefx')) }}: - - (Debian.9.Arm64.Open)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-74c9941-20190620155840 + - (Debian.9.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-74c9941-20190620155840 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - (Debian.9.Arm64)Ubuntu.1604.Arm64.Docker@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-74c9941-20190620155840 - - (Ubuntu.1804.Arm64)Ubuntu.1604.Arm64.Docker@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855 + - (Debian.9.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-74c9941-20190620155840 + - (Ubuntu.1804.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855 crossrootfsDir: '/crossrootfs/arm64' ${{ insert }}: ${{ parameters.jobParameters }} @@ -109,9 +109,9 @@ jobs: registry: mcr helixQueues: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - (Alpine.38.Arm64.Open)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 + - (Alpine.38.Arm64.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - (Alpine.38.Arm64)Ubuntu.1604.Arm64.Docker@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 + - (Alpine.38.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 crossrootfsDir: '/crossrootfs/arm64' ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/libraries/linux.yml b/eng/pipelines/libraries/linux.yml index b3960d3299704b..2f58da1b2b66a6 100644 --- a/eng/pipelines/libraries/linux.yml +++ b/eng/pipelines/libraries/linux.yml @@ -131,7 +131,7 @@ stages: - linuxArmQueues: \(Debian.9.Arm32.Open\)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-74c9941-20190620155841 - alpineQueues: \(Alpine.38.Amd64.Open\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190620184125+\(Alpine.39.Amd64.Open\)ubuntu.1604.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190620184719+\(Alpine.310.Amd64.Open\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010 - alpineArm64Queues: \(Alpine.38.Arm64.Open\)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035 - - linuxArm64Queues: \(Ubuntu.1604.Arm64.Open\)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-a45aeeb-20190620160300 + - linuxArm64Queues: \(Ubuntu.1804.ArmArch.Open\)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-a45aeeb-20190620160300 # Legs without helix testing # Don't run these legs in outerloop builds diff --git a/global.json b/global.json index ae629df3988627..2ec200b90748a4 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19564.6", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19564.6", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19564.6", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19564.6", - "Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19564.6", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19566.1", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19566.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19566.1", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19566.1", + "Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19566.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19563.3", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index bdc7658893e2bd..ee1a80d71879e8 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -8,7 +8,6 @@ 3.0.0-preview6.19280.1 - 2.4.1-pre.build.4059 1.0.0-beta-build0015 2.0.43 1.0.4-preview6.19326.1 @@ -42,49 +41,6 @@ MicrosoftNETCoreRuntimeCoreCLRPackageVersion Microsoft.NETCore.Runtime.CoreCLR - - File - $(MSBuildThisFileDirectory)ILAsmVersion.txt - Microsoft.NETCore.ILAsm - - - - - - - - - - - - - - $(XunitPackageVersion) - - - - - - - - - - - 1.0.0-alpha-build0040 - - - - - - - - $(XunitPerformanceApiPackageVersion) - - - - %(Identity) - true - diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj index 6583060a74ca9b..361b1c57fa87d6 100644 --- a/src/coreclr/tests/external/external.csproj +++ b/src/coreclr/tests/external/external.csproj @@ -16,8 +16,7 @@ .NETCoreApp,Version=v3.0 netcoreapp3.0 win7-x86;win7-x64 - xunit.runner.console - netcoreapp2.0 + netcoreapp2.1 SharedLibrary false false @@ -78,23 +77,20 @@ - - - + + + - - + false - $(XUnitRunnerPackageId) - $(XUnitPackageVersion) + $(MicrosoftDotNetXUnitConsoleRunnerPackage) + $(MicrosoftDotNetXUnitConsoleRunnerVersion) diff --git a/src/coreclr/tests/scripts/scripts.csproj b/src/coreclr/tests/scripts/scripts.csproj index 7a632012053e39..57d5a035ea44dc 100644 --- a/src/coreclr/tests/scripts/scripts.csproj +++ b/src/coreclr/tests/scripts/scripts.csproj @@ -14,8 +14,8 @@ 1.0.0-alpha-build0040 - - $(XunitPackageVersion) + + $(MicrosoftDotNetXUnitConsoleRunnerVersion) 1.0.0-prerelease-00629-04 diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index 0736ac725b3c05..18549b9f203ae2 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -108,8 +108,8 @@ $(_XunitEpilog) - - + +