From 3ba5fa513263d941be88641f27463a0e3d1df23f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 12 May 2022 20:04:33 +0000 Subject: [PATCH] Merged PR 22879: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade This pull request updates the following dependencies [marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934) ## From https://github.com/dotnet/arcade - **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934 - **Build**: 20220511.7 - **Date Produced**: May 11, 2022 5:34:05 PM UTC - **Commit**: e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - **Branch**: refs/heads/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22254.3 to 6.0.0-beta.22261.7][1] [1]: https://github.com/dotnet/arcade/compare/5fdd5b6...e3cbecc [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 6.0.105 [marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934) --- NuGet.config | 6 ------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 284909916..44bb1133f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -42,9 +39,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea7c41e2..591badacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index bada13902..305b5eda5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22254.3 + 6.0.0-beta.22261.7 diff --git a/global.json b/global.json index c751a7b2d..de4424c2a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.104", + "dotnet": "6.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" } }