From dd6b28e402eab014256c2eb165f9323e14514be1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Aug 2025 18:49:22 +0000 Subject: [PATCH 1/8] Backflow from https://github.com/dotnet/dotnet / adfea8e build 279079 [[ commit created by automation ]] --- eng/targets/CSharp.Common.targets | 7 ++++++- eng/targets/Wix.Common.targets | 2 +- .../App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj | 1 - .../src/Microsoft.AspNetCore.App.Runtime.sfxproj | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index 6b6a41ca4a64..471a470911ee 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -94,7 +94,12 @@ <_Parameter2>$(RepositoryUrl)/tree/$(SourceRevisionId) - + + <_Parameter1>OriginalRepoCommitHash + <_Parameter2>$(RepoOriginalSourceRevisionId) + + + <_Parameter1>Serviceable <_Parameter2>True diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 72cec114582b..e159100ea531 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -22,7 +22,7 @@ <_GeneratedPackageVersion>$(PackageVersion) <_GeneratedPackageVersion - Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) + Condition="! $(PackageVersion.Contains('$(_BuildNumberLabels)'))">$(VersionPrefix)-$(_PreReleaseLabel)$(_BuildNumberLabels) $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix) diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj index 33d1bcd4d9c9..8829d5788ee9 100644 --- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj +++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj @@ -38,7 +38,6 @@ true true true - true true diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj index 9b6b8325b7e9..6e335490fbc4 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj @@ -46,7 +46,6 @@ true true true - true true From 6b0b77ceaec6f236b8d82d3a654fd6ffa7d2bb3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Aug 2025 18:49:24 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/dotnet build 279079 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-preview.7.25377.103 -> 10.0.0-rc.1.25413.101) 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-rc.1.25377.103 -> 10.0.0-rc.1.25413.101) 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.25377.103 -> 10.0.0-beta.25413.101) Microsoft.Web.Xdt (Version 3.2.0-preview.25377.103 -> 3.2.0-preview.25413.101) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 6.2.4 -> 7.0.0-preview.1.41901) --- eng/Version.Details.props | 192 +++++---- eng/Version.Details.xml | 376 +++++++++--------- eng/common/core-templates/job/onelocbuild.yml | 30 +- eng/common/tools.ps1 | 13 + eng/common/tools.sh | 24 ++ global.json | 10 +- 6 files changed, 339 insertions(+), 306 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index dec8cb2c5379..f611370ed192 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,95 +7,98 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.1.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-rc.1.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 3.2.0-preview.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.7.25377.103 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-beta.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 3.2.0-preview.25413.101 + 7.0.0-preview.1.41901 + 7.0.0-preview.1.41901 + 7.0.0-preview.1.41901 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 + 10.0.0-rc.1.25413.101 4.13.0-3.24613.7 4.13.0-3.24613.7 @@ -116,10 +119,6 @@ This file should be imported by eng/Versions.props 17.12.36 17.12.36 17.12.36 - - 6.2.4 - 6.2.4 - 6.2.4 @@ -185,6 +184,9 @@ This file should be imported by eng/Versions.props $(MicrosoftNETCoreBrowserDebugHostTransportPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftWebXdtPackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetVersioningPackageVersion) $(SystemCollectionsImmutablePackageVersion) $(SystemCompositionPackageVersion) $(SystemConfigurationConfigurationManagerPackageVersion) @@ -233,9 +235,5 @@ This file should be imported by eng/Versions.props $(MicrosoftBuildFrameworkPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) $(MicrosoftBuildUtilitiesCorePackageVersion) - - $(NuGetFrameworksPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetVersioningPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b432d69f2ed..e592c986b5bf 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 - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d - + https://github.com/dotnet/dotnet - 6a953e76162f3f079405f80e28664fa51b136740 + adfea8e331724cfd46007dfefec405b5e5faad1d https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - - https://github.com/nuget/nuget.client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + adfea8e331724cfd46007dfefec405b5e5faad1d - - https://github.com/nuget/nuget.client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + adfea8e331724cfd46007dfefec405b5e5faad1d - - https://github.com/nuget/nuget.client - 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 + + https://github.com/dotnet/dotnet + adfea8e331724cfd46007dfefec405b5e5faad1d diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8034815f4213..8bf7d23355bc 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -27,7 +27,7 @@ parameters: is1ESPipeline: '' jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} @@ -99,22 +99,20 @@ jobs: mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish Localization Files - pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} + # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact + - task: CopyFiles@2 + displayName: Copy LocProject.json + inputs: + SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + Contents: 'LocProject.json' + TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' + condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: - displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' - publishLocation: Container - artifactName: Loc + targetPath: '$(Build.ArtifactStagingDirectory)/loc' + artifactName: 'Loc' + displayName: 'Publish Localization Files' condition: ${{ parameters.condition }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 996a5f9c8725..d4cfd9ccd806 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -257,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' + $shouldDownload = $false + if (!(Test-Path $installScript)) { + $shouldDownload = $true + } else { + # Check if the script is older than 30 days + $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime + if ($fileAge.Days -gt 30) { + Write-Host "Existing install script is too old, re-downloading..." + $shouldDownload = $true + } + } + + if ($shouldDownload) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3def02a638d2..c1841c9dfd0f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -300,8 +300,29 @@ function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local timestamp_file="$root/.dotnet-install.timestamp" + local should_download=false if [[ ! -a "$install_script" ]]; then + should_download=true + elif [[ -f "$timestamp_file" ]]; then + # Check if the script is older than 30 days using timestamp file + local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0") + local current_time=$(date +%s) + local age_seconds=$((current_time - download_time)) + + # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds + if [[ $age_seconds -gt 2592000 ]]; then + echo "Existing install script is too old, re-downloading..." + should_download=true + fi + else + # No timestamp file exists, assume script is old and re-download + echo "No timestamp found for existing install script, re-downloading..." + should_download=true + fi + + if [[ "$should_download" == true ]]; then mkdir -p "$root" echo "Downloading '$install_script_url'" @@ -328,6 +349,9 @@ function GetDotNetInstallScript { ExitWithExitCode $exit_code } fi + + # Create timestamp file to track download time in seconds from epoch + date +%s > "$timestamp_file" fi # return value _GetDotNetInstallScript="$install_script" diff --git a/global.json b/global.json index 19f5826c86f4..5367c2cdb8b2 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-preview.7.25322.101" + "version": "10.0.100-preview.7.25372.107" }, "tools": { - "dotnet": "10.0.100-preview.7.25322.101", + "dotnet": "10.0.100-preview.7.25372.107", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25377.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25413.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25413.101", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25413.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 23eadceec5f656f6e61fc5ef03cc4c7f2716940f Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 7 Aug 2025 14:21:19 -0700 Subject: [PATCH 3/8] Update KnownILLinkPack/KnownILCompilerPack instead of using a PackageReference to Microsoft.DotNet.ILCompiler. This uses the same mechanism that the repo already uses for updating the apphost/ref/runtime packs as well as the crossgen2 pack --- .../linker/SupportFiles/Directory.Build.targets | 17 +++++++---------- .../GenerateFiles/Directory.Build.props.in | 3 --- .../GenerateFiles/Directory.Build.targets.in | 9 +++++---- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index b05e614c036f..26dae763a703 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -1,18 +1,8 @@ - - - - true - - - - - $(TargetRuntimeIdentifier) + + $(MicrosoftNETCoreAppRefVersion) + + + + $(MicrosoftNETCoreAppRefVersion) + - true diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index 60823e68259d..1e45b541923e 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -56,10 +56,6 @@ Condition=" (('$(ProjectTargetFrameworkIdentifier)' == '${DefaultNetCoreTargetFramework}') AND '${DefaultNetCoreTargetFramework}' == '$(ProjectTargetFrameworkVersion)') AND '$(TargetLatestDotNetRuntime)' != 'false' " RuntimeFrameworkVersion="${MicrosoftNETCoreAppRefVersion}" TargetingPackVersion="${MicrosoftNETCoreAppRefVersion}" /> - - @@ -118,6 +114,11 @@ Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion} + + $(MicrosoftNETCoreAppRefVersion) + + Date: Thu, 7 Aug 2025 16:13:26 -0700 Subject: [PATCH 4/8] Apply suggestions from code review --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 5367c2cdb8b2..0dff18cde5f7 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-preview.7.25372.107" + "version": "10.0.100-preview.7.25380.108" }, "tools": { - "dotnet": "10.0.100-preview.7.25372.107", + "dotnet": "10.0.100-preview.7.25380.108", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" From af2d93472161d6e76c2c7997b8ec70bafa29f27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Fri, 8 Aug 2025 13:34:59 +0200 Subject: [PATCH 5/8] Add base href for GlobalizationWasmApp --- .../test/testassets/GlobalizationWasmApp/wwwroot/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html index a9345d1495c5..7201ad0e358b 100644 --- a/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html +++ b/src/Components/test/testassets/GlobalizationWasmApp/wwwroot/index.html @@ -1,5 +1,6 @@ + From 6d47019365e193a1bba961014d2bde985882115b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Sat, 9 Aug 2025 10:57:13 +0200 Subject: [PATCH 6/8] Disable HotReload in WasmMinimal --- .../Components.WasmMinimal/Components.WasmMinimal.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj index deabcd7fccae..5cd17cfac619 100644 --- a/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj +++ b/src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj @@ -6,6 +6,7 @@ enable WasmMinimal true + false From 8a46fe0ec399013bdd4a24b62a8cb5d29ec2be80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Fi=C5=A1era?= Date: Sat, 9 Aug 2025 13:14:38 +0200 Subject: [PATCH 7/8] Disable HotReload in CustomBasePathApp and HostedInAspNet.Client Tests that host multiple apps doesn't resolve JS initializers correctly --- .../testassets/CustomBasePathApp/CustomBasePathApp.csproj | 1 + .../HostedInAspNet.Client/HostedInAspNet.Client.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj b/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj index 64512155abe0..227013061d9a 100644 --- a/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj +++ b/src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj @@ -2,6 +2,7 @@ $(DefaultNetCoreTargetFramework) + false /app diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj index c43a347a6150..382d39138d8c 100644 --- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj +++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj @@ -2,6 +2,7 @@ $(DefaultNetCoreTargetFramework) + false From cd3cd0fbe37173c3d882966101cc53f87c1cd049 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 13 Aug 2025 12:01:38 -0700 Subject: [PATCH 8/8] Update eng/tools/GenerateFiles/Directory.Build.targets.in --- eng/tools/GenerateFiles/Directory.Build.targets.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index 1e45b541923e..6f763355eb28 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -116,7 +116,7 @@ $(MicrosoftNETCoreAppRefVersion) + Condition="'%(TargetFramework)' == '${DefaultNetCoreTargetFramework}'">${MicrosoftNETCoreAppRefVersion}