From 4e21829351693dd7afdbfb158d8a3cd06621750c Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 16 May 2023 16:27:49 -0700 Subject: [PATCH 1/5] Update to preview 4 --- global.json | 2 +- src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 3bb21a95e30..e186e08b228 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.3.23178.7" + "dotnet": "8.0.100-preview.4.23260.5" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23262.5", diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props index f54318659a8..6ce028b4b67 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props @@ -2,7 +2,7 @@ false - 8.0.0-preview.3.23177.8 + 8.0.0-preview.4.23260.4 runtime $(BundledNETCoreAppPackageVersion) From 7de3c82566b95e51b3d475887e1ab25ce085e183 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 May 2023 09:27:02 -0700 Subject: [PATCH 2/5] Attempt to use CBL mariner 2 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index db237835156..259c688b679 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -54,7 +54,7 @@ variables: resources: containers: - container: LinuxContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm stages: - stage: build From 6222929f9f5570586651712f8128f6682e1e272f Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 May 2023 10:41:41 -0700 Subject: [PATCH 3/5] Update queues --- tests/UnitTests.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index cf72d8d5112..9ce0b8668b4 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -59,7 +59,7 @@ - + @@ -71,7 +71,7 @@ - + From 37018f34f0d1abd2b8b931ed668dc7d3d0d5bf77 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 19 May 2023 12:54:00 -0700 Subject: [PATCH 4/5] Update UnitTests.proj --- tests/UnitTests.proj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index 9ce0b8668b4..7717a44778d 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -59,9 +59,9 @@ - + - + @@ -71,9 +71,9 @@ - + - + From e4686ab4834f218ff3d0b984fb2ced1b03000085 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 22 May 2023 08:58:44 -0700 Subject: [PATCH 5/5] Update UnitTests.proj --- tests/UnitTests.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index 7717a44778d..b7c0a817347 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -59,7 +59,7 @@ - + @@ -71,7 +71,7 @@ - +