From 11c21def76afa04550e9ee8b8df3e891535c485c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 19:10:32 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/arcade build 20220329.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22179.1 -> To Version 7.0.0-beta.22179.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb0cc08f3..e369e618e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + cfdac3560f1c887780bac171df7c22f7805e6f40 - + https://github.com/dotnet/arcade - 1527dc867ccb652def4c0f57fbd2ebbed3a94019 + cfdac3560f1c887780bac171df7c22f7805e6f40 diff --git a/global.json b/global.json index 3a60f2067..17b3771ae 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100", + "dotnet": "7.0.100-preview.2.22153.17", "runtimes": { "dotnet": [ "2.1.11" @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.3" } } From 9e3cd0cf18ea3b01f7443fba62b1b329b61c6d34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Mar 2022 20:33:35 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20220329.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22179.1 -> To Version 7.0.0-beta.22179.4 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e369e618e..87fe829b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - cfdac3560f1c887780bac171df7c22f7805e6f40 + a83e6ecc4d39baf1e8e3e5f650272fd7710eec30 - + https://github.com/dotnet/arcade - cfdac3560f1c887780bac171df7c22f7805e6f40 + a83e6ecc4d39baf1e8e3e5f650272fd7710eec30 diff --git a/global.json b/global.json index 17b3771ae..5831ab5c1 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.4" } } From 97a58a897e562a4e66603192d91179778e506c19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 31 Mar 2022 09:43:46 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/arcade build 20220331.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22179.1 -> To Version 7.0.0-beta.22181.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87fe829b0..b0f1ed75e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - a83e6ecc4d39baf1e8e3e5f650272fd7710eec30 + 82e8ceb1749ec927b1d493d6e4d23d56d70fb3fa - + https://github.com/dotnet/arcade - a83e6ecc4d39baf1e8e3e5f650272fd7710eec30 + 82e8ceb1749ec927b1d493d6e4d23d56d70fb3fa diff --git a/global.json b/global.json index 5831ab5c1..21ea29d81 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake-test": "3.11.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.1" } } From 038c04cec3e8d84b18bc9a184c399b0778f732b6 Mon Sep 17 00:00:00 2001 From: Ricardo Arenas Date: Thu, 31 Mar 2022 07:31:28 -0700 Subject: [PATCH 4/6] Add new sdk to helix steps --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 627647194..664a70b56 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -169,7 +169,7 @@ stages: XUnitPublishTargetFramework: net6.0 IncludeDotNetCli: true DotNetCliPackageType: sdk - DotNetCliVersion: 6.0.100 + DotNetCliVersion: 7.0.100-preview.2.22153.17 EnableXUnitReporter: true WaitForWorkItemCompletion: true ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: From f8ba91551cff4ae22b8856cd41e94b73f0a25a2b Mon Sep 17 00:00:00 2001 From: Ricardo Arenas Date: Thu, 31 Mar 2022 07:49:38 -0700 Subject: [PATCH 5/6] .NET 7 all the things --- azure-pipelines.yml | 2 +- src/Validation/src/Validation.csproj | 2 +- src/Validation/tests/Validation.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 664a70b56..e59f4616d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -166,7 +166,7 @@ stages: XUnitProjects: $(Build.SourcesDirectory)/src/Validation/tests/Validation.Tests.csproj XUnitTargetFramework: netcoreapp2.0 XUnitRunnerVersion: 2.4.2-pre.9 - XUnitPublishTargetFramework: net6.0 + XUnitPublishTargetFramework: net7.0 IncludeDotNetCli: true DotNetCliPackageType: sdk DotNetCliVersion: 7.0.100-preview.2.22153.17 diff --git a/src/Validation/src/Validation.csproj b/src/Validation/src/Validation.csproj index 351ebe736..dec4f31ca 100644 --- a/src/Validation/src/Validation.csproj +++ b/src/Validation/src/Validation.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 true true diff --git a/src/Validation/tests/Validation.Tests.csproj b/src/Validation/tests/Validation.Tests.csproj index 9da2c2383..857c950f9 100644 --- a/src/Validation/tests/Validation.Tests.csproj +++ b/src/Validation/tests/Validation.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 false From ad066a7d61451eecea907d741793c2d812332886 Mon Sep 17 00:00:00 2001 From: Ricardo Arenas Date: Thu, 31 Mar 2022 08:11:31 -0700 Subject: [PATCH 6/6] update docker container used --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e59f4616d..f7363f27f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -41,7 +41,7 @@ schedules: resources: containers: - container: LinuxContainer - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-20210714125435-9b5bbc2 stages: - stage: build