From 4593e7a44e3d6a497fb350683cffbf6ffd0802db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 02:02:28 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/dotnet build 293255 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25574.108 -> 11.0.0-beta.25603.106) System.CommandLine (Version 3.0.0-alpha.1.25574.108 -> 3.0.0-alpha.1.25603.106) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/core-templates/job/source-index-stage1.yml | 4 ++-- eng/common/core-templates/post-build/post-build.yml | 8 ++++---- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b3ce959cf82..6bcdb21fce0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25574.108 - 3.0.0-alpha.1.25574.108 + 11.0.0-beta.25603.106 + 3.0.0-alpha.1.25603.106 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53e58e8effe..ed08d75fd07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d..58b7a76814e 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 6f0929c039b..06864cd1feb 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -175,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -236,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36..b64b66a6275 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 444ff4be50a..1556562c68f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -390,8 +390,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 - $defaultXCopyMSBuildVersion = '17.14.16' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 7a8199c6228..d733f383c86 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": "11.0.0-beta.25574.108" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.106" } } From 9a2557070b21f6a97fe83de746fc40af681b8c61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Dec 2025 02:02:52 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/dotnet build 293565 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25603.106 -> 11.0.0-beta.25605.110) System.CommandLine (Version 3.0.0-alpha.1.25603.106 -> 3.0.0-alpha.1.25605.110) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/core-templates/job/job.yml | 2 ++ global.json | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6bcdb21fce0..63fae9510ff 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25603.106 - 3.0.0-alpha.1.25603.106 + 11.0.0-beta.25605.110 + 3.0.0-alpha.1.25605.110 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed08d75fd07..452a901e2a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + 5a69737e6f6447fe397d552503a3909ea49f6f34 - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + 5a69737e6f6447fe397d552503a3909ea49f6f34 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb4ccc023a3..748c4f07a64 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -73,6 +73,8 @@ jobs: templateContext: ${{ parameters.templateContext }} variables: + - name: AllowPtrToDetectTestRunRetryFiles + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/global.json b/global.json index d733f383c86..56df0e7e1c0 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.106" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25605.110" } } From 095c4d72b08dfd2ad5a96a4e6dfaa9a0c3fd9ce1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 02:04:39 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/dotnet build 293750 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25605.110 -> 11.0.0-beta.25608.101) System.CommandLine (Version 3.0.0-alpha.1.25605.110 -> 3.0.0-alpha.1.25608.101) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/core-templates/job/source-index-stage1.yml | 4 ++-- global.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 63fae9510ff..1e2834ce180 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25605.110 - 3.0.0-alpha.1.25605.110 + 11.0.0-beta.25608.101 + 3.0.0-alpha.1.25608.101 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 452a901e2a2..7e708950398 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 5a69737e6f6447fe397d552503a3909ea49f6f34 + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5a69737e6f6447fe397d552503a3909ea49f6f34 + ce3dea8b1d1c12cf4b85999f834052d942d84a6d diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 58b7a76814e..76baf5c2725 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/global.json b/global.json index 56df0e7e1c0..0b0471efc70 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25605.110" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25608.101" } } From 44e7fafb301f768fd4f8f08d04b5ab203b075c05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:04:04 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/dotnet build 294068 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25608.101 -> 11.0.0-beta.25609.108) System.CommandLine (Version 3.0.0-alpha.1.25608.101 -> 3.0.0-alpha.1.25609.108) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1e2834ce180..10f9ebee3ed 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25608.101 - 3.0.0-alpha.1.25608.101 + 11.0.0-beta.25609.108 + 3.0.0-alpha.1.25609.108 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e708950398..1582f7857ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - ce3dea8b1d1c12cf4b85999f834052d942d84a6d + d65136bfc1cc606d916ceaa102a4c1925e2b5d59 - + https://github.com/dotnet/dotnet - ce3dea8b1d1c12cf4b85999f834052d942d84a6d + d65136bfc1cc606d916ceaa102a4c1925e2b5d59 diff --git a/global.json b/global.json index 0b0471efc70..c871b7a7bbd 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25608.101" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25609.108" } } From 548b6dfa31695543448014c498c42a3ced355866 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Dec 2025 02:03:08 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/dotnet build 294309 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25609.108 -> 11.0.0-beta.25611.103) System.CommandLine (Version 3.0.0-alpha.1.25609.108 -> 3.0.0-alpha.1.25611.103) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 10f9ebee3ed..1de719e2e63 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25609.108 - 3.0.0-alpha.1.25609.108 + 11.0.0-beta.25611.103 + 3.0.0-alpha.1.25611.103 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1582f7857ad..18610ca4d33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - d65136bfc1cc606d916ceaa102a4c1925e2b5d59 + a137035987f8faebec182016349982241a2eebd1 - + https://github.com/dotnet/dotnet - d65136bfc1cc606d916ceaa102a4c1925e2b5d59 + a137035987f8faebec182016349982241a2eebd1 diff --git a/global.json b/global.json index c871b7a7bbd..eff5f07d2fa 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25609.108" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.103" } } From fadec91c29d18258829095d70a2c5ea415b49cdf Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Dec 2025 09:56:31 -0800 Subject: [PATCH 6/7] 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 0bbc90ced15..ffbe1d900ca 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 1de719e2e63..77098e3e3b8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -9,17 +9,17 @@ This file should be imported by eng/Versions.props 11.0.0-beta.25611.103 3.0.0-alpha.1.25611.103 - 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 18610ca4d33..5c8eac0c18a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,45 +13,45 @@ a137035987f8faebec182016349982241a2eebd1 - + 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 From 1c1f841695eda9a01a868cfdb12dab3cdc15b84e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Dec 2025 02:03:12 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/dotnet build 294593 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25611.103 -> 11.0.0-beta.25613.101) System.CommandLine (Version 3.0.0-alpha.1.25611.103 -> 3.0.0-alpha.1.25613.101) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 19 +++++++++++++------ global.json | 2 +- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 77098e3e3b8..c88895be534 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25611.103 - 3.0.0-alpha.1.25611.103 + 11.0.0-beta.25613.101 + 3.0.0-alpha.1.25613.101 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c8eac0c18a..2ddc061b029 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + dc803dea8a5917a87a812a05bae596c299368a43 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d99..c282d3ae403 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac..eea88e653c9 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 1556562c68f..f6bde268379 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -273,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -506,7 +506,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -552,23 +552,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index eff5f07d2fa..4e1bbebcc4e 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.103" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25613.101" } }