From a30a69fea1834bc988cedd1a5577e6773e0833c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:00 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..0c9f7c70d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 3168133a01772e53f66b7748511b284b950df57d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:39 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c9f7c70d..e36277abf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 8e1ac043f8b4472ab7d95491d72003f3427abb9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..b9d31b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From c5024f481376f38a4b480409e908feb600706b77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:37 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23620.3 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cc0c1769..7a1d9e0d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 95123c15c..36c28d660 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From 48bc53793dab3cc1b9a911044ab90117d858a4ae Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:47:54 -0600 Subject: [PATCH 5/5] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> -