From 7743e076a1962f5e6c6aed1684738cf75042bea1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Oct 2025 16:23:06 +0000 Subject: [PATCH 01/11] Backflow from https://github.com/dotnet/dotnet / d9ea74c build 287957 [[ commit created by automation ]] --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 968b8a18201c..063fd0e23ac8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.8 + 17.14.28 18.0 @@ -125,7 +125,7 @@ - 1.8.1 + 1.10.2 4.0.1 From ae4d053a81e7ad1c66c9a09fdf64dbcfcdeffe81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Oct 2025 16:23:08 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/dotnet build 287957 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.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, 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 10.0.0-rc.1.25515.110 -> 10.0.0-rc.1.25520.116) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25515.110 -> 10.0.0-preview.25520.116) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.1.0-preview-25515-110 -> 18.1.0-preview-25520-116) 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.0.0-preview.1.1610 -> 7.0.0-preview.1.2116) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25515.110 -> 10.0.0-beta.25520.116) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.3.0-1.25515.110 -> 5.3.0-1.25520.116) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25515.110 -> 2.0.0-preview.1.25520.116) Microsoft.DiaSymReader (Version 2.2.0-beta.25515.110 -> 2.2.0-beta.25520.116) 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.25515.110 -> 11.0.0-beta.25520.116) Microsoft.FSharp.Compiler (Version 14.0.0-alpha1.25515.110 -> 15.0.0-alpha1.25520.116) 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-alpha.25515.110 -> 11.0.100-alpha.25520.116) Microsoft.Web.Xdt (Version 3.2.0-preview.25515.110 -> 3.2.0-preview.25520.116) System.CommandLine (Version 2.0.0-rc.1.25515.110 -> 2.0.0-rc.1.25520.116) --- eng/Version.Details.props | 260 +++++++++---------- eng/Version.Details.xml | 522 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 393 insertions(+), 393 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5a0a9343b7bc..c8f9e5dbbd77 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,137 +6,137 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-preview.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 18.1.0-preview-25515-110 - 18.1.0-preview-25515-110 - 7.0.0-preview.1.1610 - 10.0.0-beta.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 10.0.0-preview.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 2.0.0-preview.1.25515.110 - 2.2.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 14.0.0-alpha1.25515.110 - 10.0.0-rc.1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-preview.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 18.1.0-preview-25520-116 + 18.1.0-preview-25520-116 + 7.0.0-preview.1.2116 + 10.0.0-beta.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 10.0.0-preview.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 2.0.0-preview.1.25520.116 + 2.2.0-beta.25520.116 + 11.0.0-beta.25520.116 + 11.0.0-beta.25520.116 + 11.0.0-beta.25520.116 + 11.0.0-beta.25520.116 + 11.0.0-beta.25520.116 + 11.0.0-beta.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 11.0.0-beta.25520.116 + 11.0.0-beta.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 15.0.0-alpha1.25520.116 + 10.0.0-rc.1.25520.116 + 5.3.0-1.25520.116 + 5.3.0-1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 10.0.0-preview.7.25377.103 - 10.0.0-preview.25515.110 - 10.0.0-rc.1.25515.110 - 18.1.0-preview-25515-110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 18.1.0-preview-25515-110 - 18.1.0-preview-25515-110 - 3.2.0-preview.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 10.0.0-rc.1.25515.110 - 2.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 + 10.0.0-preview.25520.116 + 10.0.0-rc.1.25520.116 + 18.1.0-preview-25520-116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-beta.25520.116 + 10.0.0-beta.25520.116 + 10.0.0-beta.25520.116 + 10.0.0-beta.25520.116 + 10.0.0-beta.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 11.0.100-alpha.25520.116 + 18.1.0-preview-25520-116 + 18.1.0-preview-25520-116 + 3.2.0-preview.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 7.0.0-preview.1.2116 + 10.0.0-rc.1.25520.116 + 2.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25520.116 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88a6f5e89be2..424074186a14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx d4c42dc54c6dd64f61c41349180ab19b621a9895 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + d9ea74c08f25e83a811bd061a44ed2efa47e9d22 diff --git a/global.json b/global.json index 6e18af32ed70..9d0cb17a4c48 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25515.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25515.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25520.116", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25520.116", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 8cd52d2e9b29288cf1941d77b8012c3e2245e360 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Oct 2025 02:09:00 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/dotnet build 288041 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.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0, Microsoft.Extensions.Configuration.Ini, 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 10.0.0-rc.1.25520.116 -> 10.0.0-rc.1.25521.106) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25520.116 -> 10.0.0-preview.25521.106) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.1.0-preview-25520-116 -> 18.1.0-preview-25521-106) 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.0.0-preview.1.2116 -> 7.0.0-preview.1.2206) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25520.116 -> 10.0.0-beta.25521.106) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.3.0-1.25520.116 -> 5.3.0-1.25521.106) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25520.116 -> 2.0.0-preview.1.25521.106) Microsoft.DiaSymReader (Version 2.2.0-beta.25520.116 -> 2.2.0-beta.25521.106) 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.25520.116 -> 11.0.0-beta.25521.106) Microsoft.FSharp.Compiler (Version 15.0.0-alpha1.25520.116 -> 15.0.0-alpha1.25521.106) 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-alpha.25520.116 -> 11.0.100-alpha.25521.106) Microsoft.Web.Xdt (Version 3.2.0-preview.25520.116 -> 3.2.0-preview.25521.106) System.CommandLine (Version 2.0.0-rc.1.25520.116 -> 2.0.0-rc.1.25521.106) --- eng/Version.Details.props | 260 ++++----- eng/Version.Details.xml | 522 +++++++++--------- eng/common/SetupNugetSources.sh | 6 +- .../job/publish-build-assets.yml | 24 +- .../core-templates/post-build/post-build.yml | 450 +++++++-------- .../steps/install-microbuild.yml | 15 +- eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/sdk-task.ps1 | 2 + global.json | 4 +- 9 files changed, 654 insertions(+), 633 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c8f9e5dbbd77..f5037c0e5326 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,137 +6,137 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-preview.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 18.1.0-preview-25520-116 - 18.1.0-preview-25520-116 - 7.0.0-preview.1.2116 - 10.0.0-beta.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 10.0.0-preview.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 2.0.0-preview.1.25520.116 - 2.2.0-beta.25520.116 - 11.0.0-beta.25520.116 - 11.0.0-beta.25520.116 - 11.0.0-beta.25520.116 - 11.0.0-beta.25520.116 - 11.0.0-beta.25520.116 - 11.0.0-beta.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 11.0.0-beta.25520.116 - 11.0.0-beta.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 15.0.0-alpha1.25520.116 - 10.0.0-rc.1.25520.116 - 5.3.0-1.25520.116 - 5.3.0-1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-preview.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 18.1.0-preview-25521-106 + 18.1.0-preview-25521-106 + 7.0.0-preview.1.2206 + 10.0.0-beta.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 10.0.0-preview.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 2.0.0-preview.1.25521.106 + 2.2.0-beta.25521.106 + 11.0.0-beta.25521.106 + 11.0.0-beta.25521.106 + 11.0.0-beta.25521.106 + 11.0.0-beta.25521.106 + 11.0.0-beta.25521.106 + 11.0.0-beta.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 11.0.0-beta.25521.106 + 11.0.0-beta.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 15.0.0-alpha1.25521.106 + 10.0.0-rc.1.25521.106 + 5.3.0-1.25521.106 + 5.3.0-1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 10.0.0-preview.7.25377.103 - 10.0.0-preview.25520.116 - 10.0.0-rc.1.25520.116 - 18.1.0-preview-25520-116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-beta.25520.116 - 10.0.0-beta.25520.116 - 10.0.0-beta.25520.116 - 10.0.0-beta.25520.116 - 10.0.0-beta.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 11.0.100-alpha.25520.116 - 18.1.0-preview-25520-116 - 18.1.0-preview-25520-116 - 3.2.0-preview.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 7.0.0-preview.1.2116 - 10.0.0-rc.1.25520.116 - 2.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 - 10.0.0-rc.1.25520.116 + 10.0.0-preview.25521.106 + 10.0.0-rc.1.25521.106 + 18.1.0-preview-25521-106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-beta.25521.106 + 10.0.0-beta.25521.106 + 10.0.0-beta.25521.106 + 10.0.0-beta.25521.106 + 10.0.0-beta.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 11.0.100-alpha.25521.106 + 18.1.0-preview-25521-106 + 18.1.0-preview-25521-106 + 3.2.0-preview.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 7.0.0-preview.1.2206 + 10.0.0-rc.1.25521.106 + 2.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 + 10.0.0-rc.1.25521.106 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 424074186a14..a5e8b9f63b7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d https://github.com/microsoft/testfx @@ -561,9 +561,9 @@ https://github.com/microsoft/testfx d4c42dc54c6dd64f61c41349180ab19b621a9895 - + https://github.com/dotnet/dotnet - d9ea74c08f25e83a811bd061a44ed2efa47e9d22 + ce8b0d8b87e180c6c044ee5828bd4fffab60951d diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef012..b97cc536379d 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { grep -i " /dev/null if [ "$?" == "0" ]; then echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry - local OldDisableValue="" - local NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1b..721a5566699f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -91,8 +91,8 @@ jobs: fetchDepth: 3 clean: true - - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: - - ${{ if eq(parameters.publishingVersion, 3) }}: + - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: + - ${{ if eq(parameters.publishingVersion, 3) }}: - task: DownloadPipelineArtifact@2 displayName: Download Asset Manifests inputs: @@ -117,9 +117,16 @@ jobs: flattenFolders: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: AzureCLI@2 displayName: Publish Build Assets inputs: @@ -132,9 +139,12 @@ jobs: /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -162,7 +172,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + sbomEnabled: false # we don't need SBOM for logs - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: @@ -195,9 +205,11 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c675..0cea81c74f22 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -1,106 +1,106 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: requireDefaultChannels - displayName: Fail the build if there are no default channel(s) registrations for the current build - type: boolean - default: false - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - - name: isAssetlessBuild - type: boolean - displayName: Is Assetless Build - default: false - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - - - name: is1ESPipeline - type: boolean - default: false +# Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. +# Publishing V1 is no longer supported +# Publishing V2 is no longer supported +# Publishing V3 is the default +- name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + +- name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + +- name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + +- name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + +- name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + +- name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + +- name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + +- name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + +- name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false + +- name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + +- name: isAssetlessBuild + type: boolean + displayName: Is Assetless Build + default: false + +# These parameters let the user customize the call to sdk-task.ps1 for publishing +# symbols & general artifacts as well as for signing validation +- name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + +- name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + +- name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + +# Which stages should finish execution before post-build stages start +- name: validateDependsOn + type: object + default: + - build + +- name: publishDependsOn + type: object + default: + - Validate + +# Optional: Call asset publishing rather than running in a separate stage +- name: publishAssetsImmediately + type: boolean + default: false + +- name: is1ESPipeline + type: boolean + default: false stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: @@ -108,10 +108,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: NuGet Validation @@ -134,28 +134,28 @@ stages: demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation @@ -169,54 +169,54 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) - job: displayName: SourceLink Validation @@ -230,41 +230,41 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - stage: publish_using_darc @@ -274,10 +274,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: Publish Using Darc @@ -291,30 +291,36 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: > + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 # Populate internal runtime variables. + + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' @@ -323,3 +329,5 @@ stages: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index bdebec0eaa9b..3d42d9a56615 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,9 +13,6 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true - # Location of the MicroBuild output folder - # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. - microBuildOutputFolder: '$(Build.SourcesDirectory)' # Microbuild version microbuildPluginVersion: 'latest' @@ -24,14 +21,16 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable + # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. + # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj + # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. + installationPath: $(Agent.TempDirectory)/.dotnet-microbuild condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -71,7 +70,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -93,7 +92,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1eda208a3bbf..48e55598bdd2 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -7,7 +7,9 @@ param( [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $RequireDefaultChannels, - [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing + [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 4655af7a2d88..9ae443f1c36b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -9,6 +9,8 @@ Param( [switch][Alias('nobl')]$excludeCIBinaryLog, [switch]$noWarnAsError, [switch] $help, + [string] $runtimeSourceFeed = '', + [string] $runtimeSourceFeedKey = '', [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) diff --git a/global.json b/global.json index 9d0cb17a4c48..37e46a52243c 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25520.116", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25520.116", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25521.106", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25521.106", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 2dab934a96af92bb8050f3948167a54095143513 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 14:05:44 -0700 Subject: [PATCH 04/11] Pin System.Memory to the correct version per @/ericstj MS Build transitively pins packages such as https://github.com/dotnet/msbuild/blob/164abd434ee16ef434f6405d3a1b5d479ce3e46f/src/MSBuild/app.config#L79-L82 System.Memory and when we include System.Configuration.ConfigurationManager's later version, we include System.Memory (4.6.3). 4.5.5 is `SystemMemoryToolsetPackageVersion` which is supposedly the minimum package version that would be used in .netcore, but that conflicts with the msbuild version., which has a lower version dotnet nuget -y can follow the chain (deps.json or project assets.json typically works) and see why that version of that dependency was used. cpm lifts it to 10.0 since this task includes msbuild, so we need to explicitly reference the msbuild matching system.memory --- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 3e34d3e2a29f..f63ad6724552 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -50,6 +50,7 @@ + From bbdcaa345b01b0dacd8ca5bc6c9c50d8491eaa4c Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 28 Oct 2025 15:08:57 -0700 Subject: [PATCH 05/11] Use VersionOverride, not Version We confirmed the assembly version of 4.5.5 is actually version 4.0.1.2 in net 461: https://nuget.info/packages/System.Memory/4.5.5 --- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index f63ad6724552..d4ae500d7fb5 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -50,7 +50,7 @@ - + From c7453a8474be9ed3e501845954d9bc773f6aa0db Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 19:38:48 +0000 Subject: [PATCH 06/11] Initial plan From 3d785e89beb1f389c73b70a8d792a27a4d6db4e6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 19:50:52 +0000 Subject: [PATCH 07/11] Replace :: with @ in template package version separators Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- ...nstallPackageAvailableFromBuiltInsWithForce.verified.txt | 4 ++-- ...urceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt | 6 +++--- ...ationMessage_WhenLegacyCommandIsUsed_common.verified.txt | 4 ++-- ...InstallMultiplePackageAvailableFromBuiltIns.verified.txt | 2 +- ...s.CannotInstallPackageAvailableFromBuiltIns.verified.txt | 2 +- ...allTests.CannotInstallSameSourceTwice_NuGet.verified.txt | 4 ++-- ...ShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt index 9ee051e49339..50bba7e0c220 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallPackageAvailableFromBuiltInsWithForce.verified.txt @@ -1,11 +1,11 @@ The following template packages will be installed: - Microsoft.DotNet.Common.ItemTemplates::%VERSION% + Microsoft.DotNet.Common.ItemTemplates@%VERSION% Installing the template package(s) will override the available template package(s). The following template package(s) are already available: Microsoft.DotNet.Common.ItemTemplates@%VERSION% -Success: Microsoft.DotNet.Common.ItemTemplates::6.0.100 installed the following templates: +Success: Microsoft.DotNet.Common.ItemTemplates@6.0.100 installed the following templates: Template Name Short Name Language Tags ------------------------------- ------------- -------- -------- dotnet gitignore file gitignore Config diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt index c01cc68e6335..ef375b01e68b 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanInstallSameSourceTwice_RemoteNuGet_WhenSourceIsSpecified.verified.txt @@ -1,9 +1,9 @@ The following template packages will be installed: - Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 + Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 Microsoft.DotNet.Common.ProjectTemplates.5.0 (version 5.0.0) is already installed, it will be replaced with version 5.0.0. -Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled. -Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 installed the following templates: +Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled. +Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 installed the following templates: Template Name Short Name Language Tags ------------------- ---------- ---------- -------------- Class library classlib [C#],F#,VB Common/Library diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt index 640aab54d053..a95637c2cde9 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CanShowDeprecationMessage_WhenLegacyCommandIsUsed_common.verified.txt @@ -3,9 +3,9 @@ For more information, run: dotnet new install -h The following template packages will be installed: - Microsoft.DotNet.Web.ItemTemplates::5.0.0 + Microsoft.DotNet.Web.ItemTemplates@5.0.0 -Success: Microsoft.DotNet.Web.ItemTemplates::5.0.0 installed the following templates: +Success: Microsoft.DotNet.Web.ItemTemplates@5.0.0 installed the following templates: Template Name Short Name Language Tags -------------------- -------------- -------- ----------- MVC ViewImports viewimports [C#] Web/ASP.NET diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt index a82dac7da80f..33c9ec6a9d9a 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallMultiplePackageAvailableFromBuiltIns.verified.txt @@ -3,6 +3,6 @@ The following template package(s) are already available: Microsoft.DotNet.Common.ItemTemplates@%VERSION% To install the template package(s) anyway, apply '--force' option: - dotnet new install Microsoft.DotNet.Common.ItemTemplates::6.0.100 Microsoft.DotNet.Web.ItemTemplates::5.0.0 --force + dotnet new install Microsoft.DotNet.Common.ItemTemplates@6.0.100 Microsoft.DotNet.Web.ItemTemplates@5.0.0 --force For details on the exit code, refer to https://aka.ms/templating-exit-codes#106 \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt index 1006e1eb33c6..38a53afd87f6 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallPackageAvailableFromBuiltIns.verified.txt @@ -3,6 +3,6 @@ The following template package(s) are already available: Microsoft.DotNet.Common.ItemTemplates@%VERSION% To install the template package(s) anyway, apply '--force' option: - dotnet new install Microsoft.DotNet.Common.ItemTemplates::6.0.100 --force + dotnet new install Microsoft.DotNet.Common.ItemTemplates@6.0.100 --force For details on the exit code, refer to https://aka.ms/templating-exit-codes#106 \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt index 199105c985c4..22cd4ccffc53 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.CannotInstallSameSourceTwice_NuGet.verified.txt @@ -1,5 +1,5 @@ -Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 is already installed. +Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 is already installed. To reinstall the same version of the template package, use '--force' option: - dotnet new install Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 --force + dotnet new install Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 --force For details on the exit code, refer to https://aka.ms/templating-exit-codes#106 \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt index d5ea8c4c265f..c7807f2c1c62 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewInstallTests.DoNotShowDeprecationMessage_WhenNewCommandIsUsed.verified.txt @@ -1,7 +1,7 @@ The following template packages will be installed: - Microsoft.DotNet.Web.ItemTemplates::5.0.0 + Microsoft.DotNet.Web.ItemTemplates@5.0.0 -Success: Microsoft.DotNet.Web.ItemTemplates::5.0.0 installed the following templates: +Success: Microsoft.DotNet.Web.ItemTemplates@5.0.0 installed the following templates: Template Name Short Name Language Tags -------------------- -------------- -------- ----------- MVC ViewImports viewimports [C#] Web/ASP.NET From f88dc2b7e00d4ccdf620b4be3000870a15270e11 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 17 Nov 2025 21:05:44 +0000 Subject: [PATCH 08/11] Update test code to use @ separator instead of :: Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../DotnetNewInstallTests.cs | 58 +++++++++---------- .../DotnetNewUninstallTests.cs | 24 ++++---- .../DotnetNewUpdateTests.cs | 16 ++--- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs index 1b90e9d43929..653d2f7998d8 100644 --- a/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs +++ b/test/dotnet-new.IntegrationTests/DotnetNewInstallTests.cs @@ -36,7 +36,7 @@ public void CanInstallRemoteNuGetPackage(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("web") .And.HaveStdOutContaining("blazorwasm"); } @@ -85,7 +85,7 @@ public void CanInstallRemoteNuGetPackage_LatestVariations() .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("console") .And.NotHaveStdOutContaining("web"); } @@ -93,7 +93,7 @@ public void CanInstallRemoteNuGetPackage_LatestVariations() // Install command are expected to output the requested version literaly as they got it on input, // but otherwise the outputs are expected to be equal string? command3Out = command3.StdOut?.Replace( - "Microsoft.DotNet.Common.ProjectTemplates.5.0::*", + "Microsoft.DotNet.Common.ProjectTemplates.5.0@*", "Microsoft.DotNet.Common.ProjectTemplates.5.0"); Assert.Equal(command1.StdOut, command2.StdOut); @@ -105,7 +105,7 @@ public void CanInstallRemoteNuGetPackage_LatestVariations() [InlineData("install")] public void CanInstallRemoteNuGetPackageWithVersion(string commandName) { - new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(CreateTemporaryFolder(folderName: "Home")) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -115,8 +115,8 @@ public void CanInstallRemoteNuGetPackageWithVersion(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0 installed the following templates:") + .And.HaveStdOutContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0 installed the following templates:") .And.HaveStdOutContaining("web") .And.HaveStdOutContaining("blazorwasm"); } @@ -144,7 +144,7 @@ public void CanInstallRemoteNuGetPackageWithVersionWildcard(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::5\\.0([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@5\\.0([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("console") .And.NotHaveStdOutContaining("web"); } @@ -152,11 +152,11 @@ public void CanInstallRemoteNuGetPackageWithVersionWildcard(string commandName) // Install command are expected to output the requested version literally as they got it on input, // but otherwise the outputs are expected to be equal string? command1Out = command1.StdOut?.Replace( - "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.*", + "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.*", "Microsoft.DotNet.Common.ProjectTemplates.5.0"); string? command2Out = command2.StdOut?.Replace( - "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.*", + "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.*", "Microsoft.DotNet.Common.ProjectTemplates.5.0"); Assert.Equal(command1Out, command2Out); @@ -165,7 +165,7 @@ public void CanInstallRemoteNuGetPackageWithVersionWildcard(string commandName) [Fact] public void CanInstallRemoteNuGetPackageWithPrereleaseVersion() { - new DotnetNewCommand(_log, "-i", "Microsoft.Azure.WebJobs.ProjectTemplates::4.0.1844-preview1", "--nuget-source", "https://api.nuget.org/v3/index.json") + new DotnetNewCommand(_log, "-i", "Microsoft.Azure.WebJobs.ProjectTemplates@4.0.1844-preview1", "--nuget-source", "https://api.nuget.org/v3/index.json") .WithCustomHive(CreateTemporaryFolder(folderName: "Home")) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -174,7 +174,7 @@ public void CanInstallRemoteNuGetPackageWithPrereleaseVersion() .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft.Azure.WebJobs.ProjectTemplates::4.0.1844-preview1 installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft.Azure.WebJobs.ProjectTemplates@4.0.1844-preview1 installed the following templates:") .And.HaveStdOutContaining("func"); } @@ -193,7 +193,7 @@ public void CanInstallRemoteNuGetPackageWithNuGetSource(string commandName) .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("blip-console"); new DotnetNewCommand(_log, commandName, "Take.Blip.Client.Templates", "--add-source", "https://api.nuget.org/v3/index.json") @@ -205,7 +205,7 @@ public void CanInstallRemoteNuGetPackageWithNuGetSource(string commandName) .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Take\\.Blip\\.Client\\.Templates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("blip-console"); } @@ -223,7 +223,7 @@ public void CanInstallLocalNuGetPackage(string commandName) .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("TestAssets.TemplateWithTags") .And.HaveStdOutContaining("TestAssets.ConfigurationKitchenSink"); } @@ -243,7 +243,7 @@ public void CanPrintDebugOutputWhenInstalling(string commandName) .NotHaveStdErr() .And.NotHaveStdOutContaining("Determining projects to restore...") .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Web\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("web") .And.HaveStdOutContaining("blazorwasm") .And.HaveStdOutMatching("\\[\\d{4}\\-\\d{2}\\-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{1,3}\\] " + Regex.Escape("[Debug] [Microsoft.TemplateEngine.Edge.Installers.NuGet.NuGetInstaller] => [Execute]: Microsoft.DotNet.Web.ProjectTemplates.5.0 is not a local NuGet package.")) @@ -323,12 +323,12 @@ public void CannotInstallRemotePackageWithIncorrectVersion(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0::16.0.0") + new DotnetNewCommand(_log, commandName, "Microsoft.DotNet.Web.ProjectTemplates.5.0@16.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() .Should().Fail() - .And.HaveStdErrContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0::16.0.0 could not be installed, the package does not exist"); + .And.HaveStdErrContaining("Microsoft.DotNet.Web.ProjectTemplates.5.0@16.0.0 could not be installed, the package does not exist"); } [Fact] @@ -384,7 +384,7 @@ public void CanUpdateSameSource_NuGet(string installCommandName, string uninstal { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -407,17 +407,17 @@ public void CanUpdateSameSource_NuGet(string installCommandName, string uninstal Assert.True(File.Exists(Path.Combine(home, "packages", "Microsoft.DotNet.Common.ProjectTemplates.5.0.5.0.0.nupkg"))); - new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.1") + new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.1") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.1") + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.1") .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0 (version 5.0.0) is already installed, it will be replaced with version 5.0.1") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled") - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.1 installed the following templates:") + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled") + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.1 installed the following templates:") .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("classlib"); @@ -457,7 +457,7 @@ public async Task InstallingSamePackageFromRemoteUpdatesLocal(string installComm .Execute() .Should().ExitWith(0) .And.NotHaveStdErr() - .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("classlib"); @@ -472,17 +472,17 @@ public async Task InstallingSamePackageFromRemoteUpdatesLocal(string installComm .And.HaveStdOutContaining("Version:") .And.NotHaveStdOutContaining("Version: 5.0.0"); - new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, installCommandName, "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .And.HaveStdOutMatching("Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0 \\(version ([\\d\\.a-z-])+\\) is already installed, it will be replaced with version 5\\.0\\.0") - .And.HaveStdOutMatching("Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ was successfully uninstalled") - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 installed the following templates:") + .And.HaveStdOutMatching("Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ was successfully uninstalled") + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 installed the following templates:") .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("classlib"); @@ -553,7 +553,7 @@ public void ReinstallDoesntRemoveTemplates() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("TestAssets.TemplateWithTags") .And.HaveStdOutContaining("TestAssets.ConfigurationKitchenSink"); @@ -564,7 +564,7 @@ public void ReinstallDoesntRemoveTemplates() .Should().ExitWith(0) .And.NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be installed:") - .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates::([\\d\\.a-z-])+ installed the following templates:") + .And.HaveStdOutMatching($"Success: Microsoft\\.TemplateEngine\\.TestTemplates@([\\d\\.a-z-])+ installed the following templates:") .And.HaveStdOutContaining("TestAssets.TemplateWithTags") .And.HaveStdOutContaining("TestAssets.ConfigurationKitchenSink"); } diff --git a/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs index 99a793a56371..45dfb6217364 100644 --- a/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs +++ b/test/dotnet-new.IntegrationTests/DotnetNewUninstallTests.cs @@ -45,7 +45,7 @@ public void CanListInstalledSources_Folder(string commandName) public void CanListInstalledSources_NuGet(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -140,7 +140,7 @@ public void CanUninstall_Folder(string commandName) public void CanUninstall_NuGet(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "-i", "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -181,7 +181,7 @@ public void CanUninstall_NuGet(string commandName) .ExitWith(0) .And .NotHaveStdErr() - .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0 was uninstalled."); + .And.HaveStdOutContaining($"Success: Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0 was uninstalled."); new DotnetNewCommand(_log, commandName) .WithCustomHive(home) @@ -225,7 +225,7 @@ public void CanUninstallSeveralSources_LegacySyntax() .ExitWith(0) .And .NotHaveStdErr() - .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) + .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) .And.HaveStdOutContaining($"Success: {basicFSharp} was uninstalled."); new DotnetNewCommand(_log, "-u") @@ -271,7 +271,7 @@ public void CanUninstallSeveralSources() .ExitWith(0) .And .NotHaveStdErr() - .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) + .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ was uninstalled\\.\\s*$", RegexOptions.Multiline) .And.HaveStdOutContaining($"Success: {basicFSharp} was uninstalled."); new DotnetNewCommand(_log, "uninstall") @@ -294,7 +294,7 @@ public void CanUninstallSeveralSources() public void CannotUninstallUnknownPackage(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Web.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Web.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -322,7 +322,7 @@ public void CannotUninstallUnknownPackage(string commandName) public void CannotUninstallByTemplateName(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home) .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -338,7 +338,7 @@ public void CannotUninstallByTemplateName(string commandName) .Should().Fail() .And.HaveStdErrContaining("The template package 'console' is not found") .And.HaveStdErrContaining("The template 'console' is included to the packages:") - .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 (contains 2 templates)") + .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 (contains 2 templates)") // .And.HaveStdErrContaining("To list the templates installed in a package, use dotnet new ") .And.HaveStdErrContaining("To uninstall the template package use:") .And.HaveStdErrContaining(" dotnet new uninstall Microsoft.DotNet.Common.ProjectTemplates.5.0"); @@ -350,7 +350,7 @@ public void CannotUninstallByTemplateName(string commandName) public void CannotUninstallByTemplateName_ShowsAllPackages(string commandName) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -359,7 +359,7 @@ public void CannotUninstallByTemplateName_ShowsAllPackages(string commandName) .And .NotHaveStdErr(); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.3.1::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.3.1@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -375,8 +375,8 @@ public void CannotUninstallByTemplateName_ShowsAllPackages(string commandName) .Should().Fail() .And.HaveStdErrContaining("The template package 'console' is not found") .And.HaveStdErrContaining("The template 'console' is included to the packages:") - .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 (contains 2 templates)") - .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.3.1::5.0.0 (contains 2 templates)") + .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 (contains 2 templates)") + .And.HaveStdErrContaining(" Microsoft.DotNet.Common.ProjectTemplates.3.1@5.0.0 (contains 2 templates)") .And.HaveStdErrContaining("To uninstall the template package use:") .And.HaveStdErrContaining(" dotnet new uninstall Microsoft.DotNet.Common.ProjectTemplates."); } diff --git a/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs index 61eaf09f8815..cdce076bdca9 100644 --- a/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs +++ b/test/dotnet-new.IntegrationTests/DotnetNewUpdateTests.cs @@ -19,7 +19,7 @@ public DotnetNewUpdateTests(ITestOutputHelper log) : base(log) public void CanCheckForUpdate(string testCase) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -52,7 +52,7 @@ public void ReportsErrorOnUpdateCheckOfLocalPackage() { string nugetName = "TestNupkgInstallTemplate"; string nugetVersion = "0.0.1"; - string nugetFullName = $"{nugetName}::{nugetVersion}"; + string nugetFullName = $"{nugetName}@{nugetVersion}"; string nugetFileName = $"{nugetName}.{nugetVersion}.nupkg"; string workingDirectory = CreateTemporaryFolder(); string home = CreateTemporaryFolder(folderName: "Home"); @@ -111,7 +111,7 @@ public void DoesNotShowUpdatesWhenAllTemplatesAreUpToDate(string testCase) public void PrintInfoOnUpdateOnCreation() { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -141,7 +141,7 @@ public void PrintInfoOnUpdateOnCreation() public void DoesNotPrintUpdateInfoOnCreation_WhenNoUpdateCheckOption() { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -251,7 +251,7 @@ public void DoNotShowDeprecationMessage_WhenNewCommandIsUsed_Check() public void CanApplyUpdates(string testCase) { string home = CreateTemporaryFolder(folderName: "Home"); - new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0") + new DotnetNewCommand(_log, "install", "Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0") .WithCustomHive(home).WithoutBuiltInTemplates() .WithWorkingDirectory(CreateTemporaryFolder()) .Execute() @@ -287,9 +287,9 @@ public void CanApplyUpdates(string testCase) .And .NotHaveStdErr() .And.HaveStdOutContaining("The following template packages will be updated:") - .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 was successfully uninstalled") - .And.NotHaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0::5.0.0 is already installed and will be replaced with version") - .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0::([\\d\\.a-z-])+ installed the following templates:\\s*$", System.Text.RegularExpressions.RegexOptions.Multiline) + .And.HaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 was successfully uninstalled") + .And.NotHaveStdOutContaining("Microsoft.DotNet.Common.ProjectTemplates.5.0@5.0.0 is already installed and will be replaced with version") + .And.HaveStdOutMatching($"^Success: Microsoft\\.DotNet\\.Common\\.ProjectTemplates\\.5\\.0@([\\d\\.a-z-])+ installed the following templates:\\s*$", System.Text.RegularExpressions.RegexOptions.Multiline) .And.HaveStdOutContaining("console") .And.HaveStdOutContaining("Console App"); } From 91496aa8c53b71913ee40ca8678a03298094f13a Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 18 Nov 2025 16:34:29 -0600 Subject: [PATCH 09/11] Remove duplicate NuGet package properties from Version.Details.props (#51793) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com> --- eng/Version.Details.props | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 194e1dddb58c..162ae6f5680b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,6 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25521.106 18.1.0-preview-25521-106 18.1.0-preview-25521-106 - 7.0.0-preview.1.2206 10.0.0-beta.25521.106 5.3.0-1.25521.106 5.3.0-1.25521.106 @@ -99,22 +98,6 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25521.106 10.0.0-rc.1.25521.106 10.0.0-rc.1.25521.106 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 - 7.0.0-preview.1.2206 10.0.0-rc.1.25521.106 2.0.0-rc.1.25521.106 10.0.0-rc.1.25521.106 From 187eb0014036bd9b79dfcbf4b8054a8c32918359 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 18 Nov 2025 19:49:40 -0500 Subject: [PATCH 10/11] Add missing properties in Version.Details.props --- eng/Version.Details.props | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 162ae6f5680b..797dbc048b00 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -73,6 +73,15 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25521.106 10.0.0-rc.1.25521.106 10.0.0-preview.7.25377.103 + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) 10.0.0-preview.25521.106 10.0.0-rc.1.25521.106 18.1.0-preview-25521-106 From 0e6c6a7b1ac6715dc2a77f870ef0abb279cf21f9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 19 Nov 2025 08:38:15 +0100 Subject: [PATCH 11/11] Move properties in Version.Details.props to where they belong --- eng/Version.Details.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797dbc048b00..c7629de2576b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -73,15 +73,6 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25521.106 10.0.0-rc.1.25521.106 10.0.0-preview.7.25377.103 - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) 10.0.0-preview.25521.106 10.0.0-rc.1.25521.106 18.1.0-preview-25521-106 @@ -196,8 +187,16 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -214,6 +213,7 @@ This file should be imported by eng/Versions.props $(MicrosoftNETHostModelPackageVersion) $(MicrosoftNETILLinkTasksPackageVersion) $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion)