From f3d1e75f41e27b49090c88aad07840b0521f830f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Apr 2026 19:21:27 +0000 Subject: [PATCH 1/6] Initial commit for subscription 94ba9a9b-a084-4c1e-bf44-d0c711c17773 From 4a1b6e3d7b257bf2eae5945daccc5825dc1ee661 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 3 Apr 2026 15:19:05 -0500 Subject: [PATCH 2/6] Resolve codeflow conflict: keep KnownWebAssemblySdkPack in Directory.Build.targets The VMR's copy of Directory.Build.targets was missing the KnownWebAssemblySdkPack entry added by sdk#53135 for WASM Framework materialization. Keep the sdk main version which includes this line. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Build.props | 4 ++++ eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- src/Layout/redist/targets/BundledManifests.targets | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 9c20ef3cf4a5..ad3625068de8 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,5 +1,9 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71da20b3ac34..67fbc2c00a00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 039a5932acae..a858ff7d865d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ $([System.String]::Copy('$(VersionSDKMinorPatch)').PadLeft(2, '0')) $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview - 3 + 4 diff --git a/src/Layout/redist/targets/BundledManifests.targets b/src/Layout/redist/targets/BundledManifests.targets index 208f8e965f2e..73a9eced257f 100644 --- a/src/Layout/redist/targets/BundledManifests.targets +++ b/src/Layout/redist/targets/BundledManifests.targets @@ -80,7 +80,7 @@ LogFile="$(SignCheckLog)" ErrorLogFile="$(SignCheckErrorLog)" Recursive="true" - Format="UnsignedFiles" /> + FileStatus="UnsignedFiles" /> Date: Sat, 4 Apr 2026 02:11:03 +0000 Subject: [PATCH 3/6] Backflow from https://github.com/dotnet/dotnet / 1a405c7 build 309188 [[ commit created by automation ]] --- Directory.Packages.props | 1 - .../redist/targets/BundledManifests.targets | 38 ------------------- 2 files changed, 39 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 21d623676105..53fc75ccf766 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -53,7 +53,6 @@ - diff --git a/src/Layout/redist/targets/BundledManifests.targets b/src/Layout/redist/targets/BundledManifests.targets index 73a9eced257f..1869f9c8df75 100644 --- a/src/Layout/redist/targets/BundledManifests.targets +++ b/src/Layout/redist/targets/BundledManifests.targets @@ -51,46 +51,8 @@ [%(Version)] - - - - $(ArtifactsLogDir)\workloadmanifestsigncheck.log - $(ArtifactsLogDir)\workloadmanifestsigncheck.errors.log - - - - - - $([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi')))) - - - - - - - - - - - - Date: Sat, 4 Apr 2026 02:11:05 +0000 Subject: [PATCH 4/6] Update dependencies from build 309188 Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.DotNet.Web.ItemTemplates.11.0, Microsoft.DotNet.Web.ProjectTemplates.11.0, Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.DotNet.Wpf.ProjectTemplates, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 11.0.0-preview.4.26202.104 -> 11.0.0-preview.4.26203.108) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.26202.104 -> 10.0.0-preview.26203.108) Microsoft.Build, Microsoft.Build.Localization (Version 18.6.0-preview-26202-104 -> 18.6.0-preview-26203-108) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.6.0-rc.20304 -> 7.6.0-rc.20408) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab, Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 11.0.100-preview.4.26202.104 -> 11.0.100-preview.4.26203.108) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.ExternalAccess.HotReload, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.7.0-1.26202.104 -> 5.7.0-1.26203.108) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.26202.104 -> 2.0.0-preview.1.26203.108) Microsoft.DiaSymReader, System.CommandLine (Version 3.0.0-preview.4.26202.104 -> 3.0.0-preview.4.26203.108) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.26202.104 -> 11.0.0-beta.26203.108) Microsoft.FSharp.Compiler (Version 15.2.100-preview4.26202.104 -> 15.2.100-preview4.26203.108) Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.5.0-preview-26202-104 -> 18.5.0-preview-26203-108) Microsoft.Web.Xdt (Version 3.3.0-preview.4.26202.104 -> 3.3.0-preview.4.26203.108) [[ commit created by automation ]] --- eng/Version.Details.props | 268 ++++----- eng/Version.Details.xml | 538 +++++++++--------- eng/common/core-templates/job/onelocbuild.yml | 4 +- .../job/publish-build-assets.yml | 4 +- .../core-templates/post-build/post-build.yml | 16 +- eng/common/core-templates/stages/renovate.yml | 2 +- eng/common/templates-official/job/job.yml | 7 +- .../variables/pool-providers.yml | 2 +- eng/common/templates/job/job.yml | 6 +- .../templates/variables/pool-providers.yml | 2 +- global.json | 4 +- 11 files changed, 426 insertions(+), 427 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ffdaeb0c23fb..c38ddb7b9d1a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,141 +8,141 @@ This file should be imported by eng/Versions.props 2.1.0 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 10.0.0-preview.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 18.6.0-preview-26202-104 - 18.6.0-preview-26202-104 - 7.6.0-rc.20304 - 11.0.100-preview.4.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 10.0.0-preview.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 2.0.0-preview.1.26202.104 - 3.0.0-preview.4.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 15.2.100-preview4.26202.104 - 11.0.0-preview.4.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 10.0.0-preview.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 18.6.0-preview-26203-108 + 18.6.0-preview-26203-108 + 7.6.0-rc.20408 + 11.0.100-preview.4.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 10.0.0-preview.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 2.0.0-preview.1.26203.108 + 3.0.0-preview.4.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 15.2.100-preview4.26203.108 + 11.0.0-preview.4.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.26202.104 - 11.0.0-preview.4.26202.104 - 18.5.0-preview-26202-104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 18.5.0-preview-26202-104 - 18.5.0-preview-26202-104 - 3.3.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 11.0.0-preview.4.26202.104 - 3.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 + 10.0.0-preview.26203.108 + 11.0.0-preview.4.26203.108 + 18.5.0-preview-26203-108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 18.5.0-preview-26203-108 + 18.5.0-preview-26203-108 + 3.3.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 11.0.0-preview.4.26203.108 + 3.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 2.2.1-preview.26201.3 4.2.1-preview.26201.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67fbc2c00a00..20b32b741196 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 @@ -68,174 +68,174 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 https://github.com/microsoft/testfx @@ -577,9 +577,9 @@ https://github.com/microsoft/testfx 4b12ce96553c32c1038bf81176b98a79994d6967 - + https://github.com/dotnet/dotnet - 0d6cc667e66d7bec23439335118137f78c70306c + 1a405c76db678301b6f6f5b22d2a63a152c26b97 diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index c5788829a872..eefed3b667a4 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -52,13 +52,13 @@ jobs: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows steps: diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index c9ee8ffd8f1d..9d7490518c48 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -74,13 +74,13 @@ jobs: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2026.amd64 os: windows 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 c5ece1850063..0994189969f3 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng @@ -154,14 +154,14 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) @@ -215,14 +215,14 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) @@ -276,18 +276,18 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2026.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/core-templates/stages/renovate.yml b/eng/common/core-templates/stages/renovate.yml index 41f3b6cc8570..edab28182585 100644 --- a/eng/common/core-templates/stages/renovate.yml +++ b/eng/common/core-templates/stages/renovate.yml @@ -68,7 +68,7 @@ parameters: type: object default: name: NetCore1ESPool-Internal - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows resources: diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 92a0664f5647..f70224eaa456 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -44,11 +44,10 @@ jobs: sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: - - output: buildArtifacts + - output: pipelineArtifact displayName: Publish Logs - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' - publishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() sbomEnabled: false # we don't need SBOM for logs diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index 1f308b24efc4..2cc3ae305d5a 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 +# image: windows.vs2026.amd64 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 238fa0818f7b..7f1b5d97d1ab 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -61,16 +61,16 @@ jobs: sbomEnabled: false # we don't need SBOM for logs - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: false args: displayName: Publish Logs - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' - publishLocation: Container + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() + sbomEnabled: false - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..587770f0add4 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2026.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index 20d6390a38e1..e6cabbe7ca05 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26202.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26202.104", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26203.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26203.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 003c0f459f92ca55d997477096d1d0ba9a919f99 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sat, 4 Apr 2026 00:40:32 -0500 Subject: [PATCH 5/6] Fix merge resolution: use newer 26203.108 versions from codeflow The previous merge resolution used -X theirs (preferring main) which took main's older 26202.104 versions for the renamed xUnit v3 packages. The codeflow PR had 26203.108 versions which are newer. Update all version references to use the newer versions while keeping main's package renames (XunitV3 suffixes). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Version.Details.props | 268 +++++++++++++++++++------------------- eng/Version.Details.xml | 8 +- 2 files changed, 138 insertions(+), 138 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 99c3def7ea86..0ec42c6c7738 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,141 +8,141 @@ This file should be imported by eng/Versions.props 2.1.0 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 10.0.0-preview.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 18.6.0-preview-26202-104 - 18.6.0-preview-26202-104 - 7.6.0-rc.20304 - 11.0.100-preview.4.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 10.0.0-preview.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 2.0.0-preview.1.26202.104 - 3.0.0-preview.4.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-beta.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 15.2.100-preview4.26202.104 - 11.0.0-preview.4.26202.104 - 5.7.0-1.26202.104 - 5.7.0-1.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 10.0.0-preview.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 18.6.0-preview-26203-108 + 18.6.0-preview-26203-108 + 7.6.0-rc.20408 + 11.0.100-preview.4.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 10.0.0-preview.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 2.0.0-preview.1.26203.108 + 3.0.0-preview.4.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-beta.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 15.2.100-preview4.26203.108 + 11.0.0-preview.4.26203.108 + 5.7.0-1.26203.108 + 5.7.0-1.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.26202.104 - 11.0.0-preview.4.26202.104 - 18.5.0-preview-26202-104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 11.0.100-preview.4.26202.104 - 18.5.0-preview-26202-104 - 18.5.0-preview-26202-104 - 3.3.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 7.6.0-rc.20304 - 11.0.0-preview.4.26202.104 - 3.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 - 11.0.0-preview.4.26202.104 + 10.0.0-preview.26203.108 + 11.0.0-preview.4.26203.108 + 18.5.0-preview-26203-108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 11.0.100-preview.4.26203.108 + 18.5.0-preview-26203-108 + 18.5.0-preview-26203-108 + 3.3.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 7.6.0-rc.20408 + 11.0.0-preview.4.26203.108 + 3.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 + 11.0.0-preview.4.26203.108 2.2.1-preview.26201.3 4.2.1-preview.26201.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2a04f9d3c73..e60b4c655404 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,15 +22,15 @@ https://github.com/dotnet/dotnet 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet 1a405c76db678301b6f6f5b22d2a63a152c26b97 @@ -557,7 +557,7 @@ https://github.com/dotnet/dotnet 1a405c76db678301b6f6f5b22d2a63a152c26b97 - + https://github.com/dotnet/dotnet 1a405c76db678301b6f6f5b22d2a63a152c26b97 From f84c0547fa3672d687f124d7fdf038d2101bec88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sat, 4 Apr 2026 10:49:36 +0200 Subject: [PATCH 6/6] Fix Version.Details.props property names for XunitV3 template engine packages Rename properties to match the dependency names in Version.Details.xml after the xUnit v3 migration renamed them. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Version.Details.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0ec42c6c7738..ac7cea426718 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -235,11 +235,11 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion) + $(MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion) $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksXunitV3PackageVersion) + $(MicrosoftTemplateEngineMocksXunitV3PackageVersion) $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperXunitV3PackageVersion) + $(MicrosoftTemplateEngineTestHelperXunitV3PackageVersion) $(MicrosoftTemplateEngineUtilsPackageVersion) $(MicrosoftTemplateSearchCommonPackageVersion) $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion)