From 2a628aee24ecec664032b582aa99617df753b573 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Nov 2025 16:15:30 +0000 Subject: [PATCH 1/2] Backflow from https://github.com/dotnet/dotnet / 77ee357 build 289869 [[ commit created by automation ]] --- eng/SignCheckExclusionsFile.txt | 5 ----- eng/Versions.props | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 eng/SignCheckExclusionsFile.txt diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt deleted file mode 100644 index a65b9f27f9b0..000000000000 --- a/eng/SignCheckExclusionsFile.txt +++ /dev/null @@ -1,5 +0,0 @@ -*apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. -*.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be. -*.js;; We do not sign JavaScript files. -*netfxca|*wixca|*wixdepca|*wixuiwixca;*.msi; We do not sign WiX content in our installers. -*wixstdba.dll;*.exe; diff --git a/eng/Versions.props b/eng/Versions.props index 4329e3d7dbd6..1f4cdc8734ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 10 0 0 - 1 + 3 true 8.0.1 *-* From 609d668d7074ea1c1f52e4c440c4e679994430d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Nov 2025 16:15:32 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 289869 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting (Version 10.0.0-rc.1.25531.101 -> 10.0.0-rc.3.25556.111) dotnet-ef, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools (Version 10.0.0-rtm.25531.101 -> 10.0.1-servicing.25556.111) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 11.0.0-beta.25531.101 -> 11.0.0-beta.25556.111) Microsoft.Web.Xdt (Version 3.2.0-preview.25531.101 -> 3.2.0-preview.25556.111) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-preview.1.3201 -> 7.0.0-preview.1.5711) --- eng/Version.Details.props | 184 ++++----- eng/Version.Details.xml | 370 +++++++++--------- .../job/publish-build-assets.yml | 5 + .../core-templates/post-build/post-build.yml | 4 + .../steps/install-microbuild-impl.yml | 6 +- .../steps/install-microbuild.yml | 15 +- .../core-templates/steps/publish-logs.yml | 2 + eng/common/post-build/redact-logs.ps1 | 4 +- global.json | 6 +- 9 files changed, 305 insertions(+), 291 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ed1c880b89be..76d3a0eb0bdf 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,98 +6,98 @@ This file should be imported by eng/Versions.props - 10.0.0-rtm.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 11.0.0-beta.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rtm.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 3.2.0-preview.25531.101 - 7.0.0-preview.1.3201 - 7.0.0-preview.1.3201 - 7.0.0-preview.1.3201 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 - 10.0.0-rc.1.25531.101 + 10.0.1-servicing.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 11.0.0-beta.25556.111 + 10.0.1-servicing.25556.111 + 10.0.1-servicing.25556.111 + 10.0.1-servicing.25556.111 + 10.0.1-servicing.25556.111 + 10.0.1-servicing.25556.111 + 10.0.1-servicing.25556.111 + 10.0.1-servicing.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 3.2.0-preview.25556.111 + 7.0.0-preview.1.5711 + 7.0.0-preview.1.5711 + 7.0.0-preview.1.5711 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 + 10.0.0-rc.3.25556.111 4.13.0-3.24613.7 4.13.0-3.24613.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c88279d8089..6c28e705143c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,333 +8,333 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 - + https://github.com/dotnet/dotnet - 6ad4d0db4a7569ab9944901096381c5eff133709 + 77ee357638bcd8fa66a1c16fa588dcd5818068d2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 721a5566699f..4d282377c187 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -189,6 +189,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x - task: AzureCLI@2 displayName: Publish Using Darc diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 0cea81c74f22..0af41fe5f9f7 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -313,6 +313,10 @@ stages: - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index 9fdf3a116774..b9e0143ee92a 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -20,15 +20,15 @@ parameters: steps: - ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: - task: MicroBuildSigningPluginPreview@4 - displayName: Install Preview MicroBuild plugin (Windows) + displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} condition: ${{ parameters.condition }} - ${{ else }}: - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) + displayName: Install MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 3d42d9a56615..bdebec0eaa9b 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,6 +13,9 @@ 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' @@ -21,16 +24,14 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - # 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 + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -70,7 +71,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -92,7 +93,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} 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/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a0..0664c343b2af 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -28,6 +28,8 @@ steps: arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc19591507..fc0218a013d1 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/global.json b/global.json index d60e8797c6f4..68dfa6f70229 100644 --- a/global.json +++ b/global.json @@ -32,9 +32,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25531.101", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25531.101", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25531.101", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25556.111", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25556.111", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"