From 10f67796921eb70a9974cd5608c1552a5bdc875d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Aug 2025 04:29:34 +0000 Subject: [PATCH 1/2] Backflow from https://github.com/dotnet/dotnet / 7f2a07b build 279809 [[ commit created by automation ]] --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d57f9aad228c..98b8e045e661 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 10 0 0 - 1 + 2 true 8.0.1 *-* From c8c4c5cfa8b68e48d846f68f8adec810bd6db892 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Aug 2025 04:29:35 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/dotnet build 279809 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, 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.25414.103 -> 10.0.0-rc.2.25416.109) 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 10.0.0-beta.25414.103 -> 10.0.0-beta.25416.109) Microsoft.Web.Xdt (Version 3.2.0-preview.25414.103 -> 3.2.0-preview.25416.109) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-preview.1.42003 -> 7.0.0-preview.1.41709) Microsoft.Extensions.Caching.Hybrid, Microsoft.Extensions.Diagnostics.Testing, Microsoft.Extensions.TimeProvider.Testing (Version 9.9.0-preview.1.25415.2 -> 9.9.0-preview.1.25415.2) optimization.windows_nt-x64.MIBC.Runtime, optimization.windows_nt-x86.MIBC.Runtime, optimization.linux-x64.MIBC.Runtime, optimization.windows_nt-arm64.MIBC.Runtime, optimization.linux-arm64.MIBC.Runtime (Version 1.0.0-prerelease.25413.5 -> 1.0.0-prerelease.25413.5) --- eng/Version.Details.props | 184 ++++----- eng/Version.Details.xml | 370 +++++++++--------- .../steps/install-microbuild.yml | 6 +- eng/common/generate-locproject.ps1 | 49 ++- eng/common/tools.ps1 | 6 +- global.json | 6 +- 6 files changed, 329 insertions(+), 292 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c38ad9a868e5..27042355dfe2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,98 +7,98 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-beta.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 3.2.0-preview.25414.103 - 7.0.0-preview.1.42003 - 7.0.0-preview.1.42003 - 7.0.0-preview.1.42003 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 - 10.0.0-rc.1.25414.103 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-beta.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 3.2.0-preview.25416.109 + 7.0.0-preview.1.41709 + 7.0.0-preview.1.41709 + 7.0.0-preview.1.41709 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 + 10.0.0-rc.2.25416.109 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 83477db61648..00b67d2bfa57 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 - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index da30e67bc34c..f614d1440edb 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -53,10 +53,8 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 524aaa57f2b7..fa1cdc2b3007 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFilesV3 = @() +$wxlFilesV5 = @() $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them if (-not $wxlFiles) { $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $content = Get-Content $_.FullName -Raw + + # Split files on schema to select different parser settings in the generated project. + if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*") + { + $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*") + { + $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + } } } @@ -114,7 +126,32 @@ $locJson = @{ CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( - $wxlFiles | ForEach-Object { + $wxlFilesV3 | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "P210WxlSchemaV4.lss" ) + LocItems = @( + $wxlFilesV5 | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d4cfd9ccd806..4920464cc4ae 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -544,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - $vswhereVersion = '2.5.2' + # keep this in sync with the VSWhereVersion in DefaultVersions.props + $vswhereVersion = '3.1.7' } $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" @@ -552,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere' + Write-Host 'Downloading vswhere $vswhereVersion' + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) diff --git a/global.json b/global.json index d0d0ec0aa022..f94c31e20aee 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25414.103", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25414.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25416.109", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }