From a1381ad09d95477e8357e58b7e1048e92c68b1ed Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 4 Dec 2025 14:48:42 -0800 Subject: [PATCH] Revert "[release/10.0.1xx] Source code updates from dotnet/dotnet (#9563)" This reverts commit 266f9e2da2f988305a842e83a4285e941b8f7ddb. --- NuGet.config | 2 +- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 16 +++++++--------- global.json | 6 +++--- ...Microsoft.TemplateEngine.Authoring.CLI.csproj | 2 +- ...osoft.TemplateSearch.TemplateDiscovery.csproj | 2 +- 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f6d9f74e4f..9e8e3819c5e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a4f947616f1..22e674d4e82 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25603.103 - 2.0.2 + 10.0.0-beta.25568.102 + 2.0.1 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f0ae97e91..f05f9ae6ec5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 5ddd0ddc0ebadca21645a05c419ed5a034454605 + 115a29577547ce136b754d96d2ebfb184595a923 - + https://github.com/dotnet/dotnet - 5ddd0ddc0ebadca21645a05c419ed5a034454605 + 115a29577547ce136b754d96d2ebfb184595a923 diff --git a/eng/Versions.props b/eng/Versions.props index 5137bcd3efd..a4510e13dab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,14 @@ - - - + - 10.0.102 + 10.0.101 + + false + release + servicing - - - - true + true - diff --git a/global.json b/global.json index e89125da118..d5ae4d8140a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100", + "version": "10.0.100-rc.2.25502.107", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,9 +10,9 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100" + "dotnet": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.102" } } diff --git a/tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj b/tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj index d32d7ea4bea..41225d3e7c3 100644 --- a/tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj +++ b/tools/Microsoft.TemplateEngine.Authoring.CLI/Microsoft.TemplateEngine.Authoring.CLI.csproj @@ -2,7 +2,7 @@ Exe - $(NetToolCurrent) + $(NetMinimum) A dotnet CLI tool with commands for template authoring. true true diff --git a/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 7e4442edc38..47f44840b47 100644 --- a/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -1,7 +1,7 @@ - $(NetToolCurrent) + $(NetMinimum) Exe true false