From e595f8bbce5d02d915ff3591b577be9a60a26876 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 02:11:46 +0000 Subject: [PATCH 1/5] Backflow from https://github.com/dotnet/dotnet / 02dfa78 build 293404 [[ commit created by automation ]] --- eng/Versions.props | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a4510e13dab..5137bcd3efd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,14 +1,16 @@ - + + + - 10.0.101 - - false - release - + 10.0.102 servicing + + + + true - true + From 494104c27021d0be28a81c799286f595be48a127 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 02:11:52 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/dotnet build 293404 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25568.102 -> 10.0.0-beta.25604.105) System.CommandLine (Version 2.0.1 -> 2.0.2) --- NuGet.config | 2 +- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/core-templates/job/source-build.yml | 2 +- global.json | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e8e3819c5e..6730f6e07aa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 22e674d4e82..b01985842b5 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.25568.102 - 2.0.1 + 10.0.0-beta.25604.105 + 2.0.2 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f05f9ae6ec5..6cfbabfe0c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 115a29577547ce136b754d96d2ebfb184595a923 + 02dfa783c1f4223a5590a1b689ef381c337db1ab - + https://github.com/dotnet/dotnet - 115a29577547ce136b754d96d2ebfb184595a923 + 02dfa783c1f4223a5590a1b689ef381c337db1ab diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 4f45cce0f3f..d805d5faeb9 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-azurelinux-3 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index d5ae4d8140a..59a483250ee 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "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-rc.2.25502.107" + "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25568.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25604.105" } } From ada559bf414bb2f0221cc85b7a881a8713fec33e Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 10 Dec 2025 15:08:53 -0800 Subject: [PATCH 3/5] Install .NET 9 so the tests can properly run again --- azure-pipelines.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e0a39a94361..3b5082714df 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,6 +95,9 @@ extends: preSteps: - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force displayName: Create artifacts/bin directory + - powershell: | + eng/common/dotnet-install.ps1 -Version 9.0.100 -InstallDir "$(Build.SourcesDirectory)\.dotnet" -NoPath + displayName: Install .NET 9 SDK jobs: - ${{ each config in parameters.buildConfigurations }}: - job: Windows_NT_${{ config.buildConfig }} @@ -147,6 +150,8 @@ extends: - _SignType: none steps: - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self + - script: ./eng/common/dotnet-install.sh --version 9.0.100 --install-dir $(Build.SourcesDirectory)/.dotnet --no-path + displayName: Install .NET 9 SDK - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine @@ -172,6 +177,8 @@ extends: - _SignType: none steps: - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self + - script: ./eng/common/dotnet-install.sh --version 9.0.100 --install-dir $(Build.SourcesDirectory)/.dotnet --no-path + displayName: Install .NET 9 SDK - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine From bac8ca96568c98f0a39cc3a9f64b8d1d62014c75 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 11 Dec 2025 11:20:37 -0800 Subject: [PATCH 4/5] Revert "Install .NET 9 so the tests can properly run again" This reverts commit ada559bf414bb2f0221cc85b7a881a8713fec33e. --- azure-pipelines.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3b5082714df..e0a39a94361 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -95,9 +95,6 @@ extends: preSteps: - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force displayName: Create artifacts/bin directory - - powershell: | - eng/common/dotnet-install.ps1 -Version 9.0.100 -InstallDir "$(Build.SourcesDirectory)\.dotnet" -NoPath - displayName: Install .NET 9 SDK jobs: - ${{ each config in parameters.buildConfigurations }}: - job: Windows_NT_${{ config.buildConfig }} @@ -150,8 +147,6 @@ extends: - _SignType: none steps: - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self - - script: ./eng/common/dotnet-install.sh --version 9.0.100 --install-dir $(Build.SourcesDirectory)/.dotnet --no-path - displayName: Install .NET 9 SDK - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine @@ -177,8 +172,6 @@ extends: - _SignType: none steps: - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self - - script: ./eng/common/dotnet-install.sh --version 9.0.100 --install-dir $(Build.SourcesDirectory)/.dotnet --no-path - displayName: Install .NET 9 SDK - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine From 5042c5f00a17a16cd53c1ab26b930633e9557605 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Dec 2025 09:56:31 -0800 Subject: [PATCH 5/5] Fix up 10.0 references (#9628) * update to net10 * target netcurrent * Move from Minimum to Current * update version.details --- Directory.Packages.props | 2 +- eng/Version.Details.props | 20 +++++----- eng/Version.Details.xml | 40 +++++++++---------- ...crosoft.TemplateEngine.Abstractions.csproj | 2 +- ...osoft.TemplateEngine.Core.Contracts.csproj | 2 +- .../Microsoft.TemplateEngine.Core.csproj | 2 +- .../Microsoft.TemplateEngine.Edge.csproj | 2 +- .../Microsoft.TemplateEngine.IDE.csproj | 2 +- ...ngine.Orchestrator.RunnableProjects.csproj | 2 +- .../Microsoft.TemplateEngine.Utils.csproj | 2 +- .../Microsoft.TemplateSearch.Common.csproj | 2 +- ...rosoft.TemplateEngine.Authoring.CLI.csproj | 2 +- ...ngine.Authoring.TemplateApiVerifier.csproj | 2 +- ...teEngine.Authoring.TemplateVerifier.csproj | 2 +- ...mplateEngine.TemplateLocalizer.Core.csproj | 2 +- ...ft.TemplateSearch.TemplateDiscovery.csproj | 2 +- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 135c4e3791f..f35fddcd2af 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b01985842b5..3bc79c55ef0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -9,17 +9,17 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25604.105 2.0.2 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 - 9.0.3 + 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cfbabfe0c5..13f8c50c51c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,45 +13,45 @@ 02dfa783c1f4223a5590a1b689ef381c337db1ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - feff23845f6205a1ece39e1bd9b978948a52295a + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - feff23845f6205a1ece39e1bd9b978948a52295a + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - feff23845f6205a1ece39e1bd9b978948a52295a + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - feff23845f6205a1ece39e1bd9b978948a52295a + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - feff23845f6205a1ece39e1bd9b978948a52295a + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/src/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj b/src/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj index 16cfae321af..618fe20653d 100644 --- a/src/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj +++ b/src/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) Contracts for extending Template Engine true true diff --git a/src/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj b/src/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj index 24fe9d48e8c..a5976a0745d 100644 --- a/src/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj +++ b/src/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) Contracts for extending Microsoft.TemplateEngine.Core true true diff --git a/src/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj b/src/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj index 93646ed46f5..1d1030ee839 100644 --- a/src/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj +++ b/src/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) Common operations for instantiating templates using forward-only input stream operations true true diff --git a/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj b/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj index 7581ff66ca9..4e2f31cc381 100644 --- a/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj +++ b/src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) Helper package for adding Template Engine to consuming applications true true diff --git a/src/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj b/src/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj index 045baeb80d0..3d51d28f92f 100644 --- a/src/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj +++ b/src/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) Helper package for adding Template Engine to IDEs true true diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj index 9f091fd4ae3..32609e9dc4d 100644 --- a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj +++ b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) An extension for Template Engine that allows projects that still run to be used as templates true true diff --git a/src/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj b/src/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj index 75d8fe8c312..8ca4128f300 100644 --- a/src/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj +++ b/src/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) Components used by all Template Engine extensions and consumers true true diff --git a/src/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj b/src/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj index 65f7625bc69..8e5c9cfec83 100644 --- a/src/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj +++ b/src/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);$(NetFrameworkMinimum) + $(NetCurrent);$(NetFrameworkCurrent) Components used by the template discovery tool, and also used for related functionality in the CLI. true true 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 41225d3e7c3..7d7cbcffaba 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 - $(NetMinimum) + $(NetCurrent) A dotnet CLI tool with commands for template authoring. true true diff --git a/tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj b/tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj index 9da576e4472..e496990fa04 100644 --- a/tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj +++ b/tools/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier/Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj @@ -1,7 +1,7 @@ - $(NetMinimum) + $(NetCurrent) The extension of templates verification engine enabling verification testing through dotnet template engine API. true true diff --git a/tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj b/tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj index 5fa2e726122..3c950e2b140 100644 --- a/tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj +++ b/tools/Microsoft.TemplateEngine.Authoring.TemplateVerifier/Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj @@ -1,7 +1,7 @@ - $(NetMinimum) + $(NetCurrent) The verification engine for the templates for .NET template engine. true true diff --git a/tools/Microsoft.TemplateEngine.TemplateLocalizer.Core/Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj b/tools/Microsoft.TemplateEngine.TemplateLocalizer.Core/Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj index 98e89ab25d0..f2038dda6a4 100644 --- a/tools/Microsoft.TemplateEngine.TemplateLocalizer.Core/Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj +++ b/tools/Microsoft.TemplateEngine.TemplateLocalizer.Core/Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj @@ -1,7 +1,7 @@ - $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum) + $(NetCurrent);netstandard2.0;$(NetFrameworkCurrent) The core API for Template Localizer tool. true true diff --git a/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj b/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj index 47f44840b47..70687948f0a 100644 --- a/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj +++ b/tools/Microsoft.TemplateSearch.TemplateDiscovery/Microsoft.TemplateSearch.TemplateDiscovery.csproj @@ -1,7 +1,7 @@ - $(NetMinimum) + $(NetCurrent) Exe true false