From 07b77653a1401edf61e0f8fed93c41c7705a1e26 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:52 -0700 Subject: [PATCH 1/2] Update branding to 7.0.310 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index aa10713a7..c062b2ed5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 23c6cc482330c6a57fa6739740b45b4b633b1ec5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:13:57 +0000 Subject: [PATCH 2/2] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17446) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc1a1596f..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aefc4f1b5..cef41663f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c062b2ed5..6fc67f8b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23478.1 diff --git a/global.json b/global.json index bf1732f08..4a49aa951 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" } }