From fd30a7920cdc9f5619811060a27e89875e3109c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Jan 2025 05:03:00 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20250115.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25065.2 --- NuGet.config | 20 ++++++++++++++++++++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- eng/common/template-guidance.md | 2 +- global.json | 8 ++++---- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fa908668f8f..4df3f3ee5d19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,19 @@ + + + + + + + + + + @@ -30,9 +40,19 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4207ebf11cf..d32f5dba60f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 1c84ba570b05..3cbaaa768508 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 9.0.0-alpha.1.24575.1 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 5ef6c30ba924..98bbc1ded0ba 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -57,7 +57,7 @@ extends: Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). -# Development notes +## Development notes **Folder / file structure** diff --git a/global.json b/global.json index f0a083e23ce2..08f8940f9acd 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.101" + "version": "9.0.102" }, "tools": { - "dotnet": "9.0.101", + "dotnet": "9.0.102", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -27,7 +27,7 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2" } } From 6bbc7b53e8151991ee77b05ec0dd614367f1097c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Feb 2025 05:03:02 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20250127.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25077.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- eng/common/internal/Tools.csproj | 10 ---------- global.json | 4 ++-- 4 files changed, 18 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d32f5dba60f0..675f7c135ef6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 3cbaaa768508..66aa64ff4b7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 9.0.0-alpha.1.24575.1 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 32f79dfb3402..feaa6d20812d 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -15,16 +15,6 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - diff --git a/global.json b/global.json index 08f8940f9acd..6eac55436ca8 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4" } } From 3476f4bb90d092d86131d56c22a99276a1aeaca8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 6 Feb 2025 14:26:22 -0800 Subject: [PATCH 3/3] Remove redundant package sources from NuGet.config --- NuGet.config | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4df3f3ee5d19..9fa908668f8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,19 +5,9 @@ - - - - - - - - - - @@ -40,19 +30,9 @@ - - - - - - - - - -