From 9ee3a381a6a5d9df2cd9492d57c97e9ba4e28c6e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 16:36:44 -0700 Subject: [PATCH 01/30] [release/10.0] [Blazor] Increment MaxItemCount when OverscanCount > MaxItemCount (#63767) * Virtualize test * Fix test * Fix test --------- Co-authored-by: Javier Calvarro Nelson --- .../Web/src/Virtualization/Virtualize.cs | 4 + .../test/E2ETest/Tests/VirtualizationTest.cs | 99 ++++++++++++++++++- .../test/testassets/BasicTestApp/Index.razor | 1 + .../VirtualizationLargeOverscan.razor | 12 +++ 4 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor diff --git a/src/Components/Web/src/Virtualization/Virtualize.cs b/src/Components/Web/src/Virtualization/Virtualize.cs index 6ce14ee0952d..8e2d84f2f11b 100644 --- a/src/Components/Web/src/Virtualization/Virtualize.cs +++ b/src/Components/Web/src/Virtualization/Virtualize.cs @@ -362,6 +362,10 @@ private void CalcualteItemDistribution( _ => MaxItemCount }; + // Count the OverscanCount as used capacity, so we don't end up in a situation where + // the user has set a very low MaxItemCount and we end up in an infinite loading loop. + maxItemCount += OverscanCount * 2; + itemsInSpacer = Math.Max(0, (int)Math.Floor(spacerSize / _itemSize) - OverscanCount); visibleItemCapacity = (int)Math.Ceiling(containerSize / _itemSize) + 2 * OverscanCount; unusedItemCapacity = Math.Max(0, visibleItemCapacity - maxItemCount); diff --git a/src/Components/test/E2ETest/Tests/VirtualizationTest.cs b/src/Components/test/E2ETest/Tests/VirtualizationTest.cs index 565dc0190fcd..4fa21ef3fe11 100644 --- a/src/Components/test/E2ETest/Tests/VirtualizationTest.cs +++ b/src/Components/test/E2ETest/Tests/VirtualizationTest.cs @@ -291,14 +291,14 @@ public void CanLimitMaxItemsRendered(bool useAppContext) // we only render 10 items due to the MaxItemCount setting var scrollArea = Browser.Exists(By.Id("virtualize-scroll-area")); var getItems = () => scrollArea.FindElements(By.ClassName("my-item")); - Browser.Equal(10, () => getItems().Count); + Browser.Equal(16, () => getItems().Count); Browser.Equal("Id: 0; Name: Thing 0", () => getItems().First().Text); // Scrolling still works and loads new data, though there's no guarantee about // exactly how many items will show up at any one time Browser.ExecuteJavaScript("document.getElementById('virtualize-scroll-area').scrollTop = 300;"); Browser.NotEqual("Id: 0; Name: Thing 0", () => getItems().First().Text); - Browser.True(() => getItems().Count > 3 && getItems().Count <= 10); + Browser.True(() => getItems().Count > 3 && getItems().Count <= 16); } [Fact] @@ -573,6 +573,101 @@ public void EmptyContentRendered_Async() int GetPlaceholderCount() => Browser.FindElements(By.Id("async-placeholder")).Count; } + [Fact] + public void CanElevateEffectiveMaxItemCount_WhenOverscanExceedsMax() + { + Browser.MountTestComponent(); + var container = Browser.Exists(By.Id("virtualize-large-overscan")); + // Ensure we have an initial contiguous batch and the elevated effective max has kicked in (>= OverscanCount) + var indices = GetVisibleItemIndices(); + Browser.True(() => indices.Count >= 200); + + // Give focus so PageDown works + container.Click(); + + var js = (IJavaScriptExecutor)Browser; + var lastMaxIndex = -1; + var lastScrollTop = -1L; + + // Check if we've reached (or effectively reached) the bottom + var scrollHeight = (long)js.ExecuteScript("return arguments[0].scrollHeight", container); + var clientHeight = (long)js.ExecuteScript("return arguments[0].clientHeight", container); + var scrollTop = (long)js.ExecuteScript("return arguments[0].scrollTop", container); + while (scrollTop + clientHeight < scrollHeight) + { + // Validate contiguity on the current page + Browser.True(() => IsCurrentViewContiguous(indices)); + + // Track progress in indices + var currentMax = indices.Max(); + Assert.True(currentMax >= lastMaxIndex, $"Unexpected backward movement: previous max {lastMaxIndex}, current max {currentMax}."); + lastMaxIndex = currentMax; + + // Send PageDown + container.SendKeys(Keys.PageDown); + + // Wait for scrollTop to change (progress) to avoid infinite loop + var prevScrollTop = scrollTop; + Browser.True(() => + { + var st = (long)js.ExecuteScript("return arguments[0].scrollTop", container); + if (st > prevScrollTop) + { + lastScrollTop = st; + return true; + } + return false; + }); + scrollHeight = (long)js.ExecuteScript("return arguments[0].scrollHeight", container); + clientHeight = (long)js.ExecuteScript("return arguments[0].clientHeight", container); + scrollTop = (long)js.ExecuteScript("return arguments[0].scrollTop", container); + } + + // Final contiguous assertion at bottom + Browser.True(() => IsCurrentViewContiguous()); + + // Helper: check visible items contiguous with no holes + bool IsCurrentViewContiguous(List existingIndices = null) + { + var indices = existingIndices ?? GetVisibleItemIndices(); + if (indices.Count == 0) + { + return false; + } + + if (indices[^1] - indices[0] != indices.Count - 1) + { + return false; + } + for (var i = 1; i < indices.Count; i++) + { + if (indices[i] - indices[i - 1] != 1) + { + return false; + } + } + return true; + } + + List GetVisibleItemIndices() + { + var elements = container.FindElements(By.CssSelector(".large-overscan-item")); + var list = new List(elements.Count); + foreach (var el in elements) + { + var text = el.Text; + if (text.StartsWith("Item ", StringComparison.Ordinal)) + { + if (int.TryParse(text.AsSpan(5), NumberStyles.Integer, CultureInfo.InvariantCulture, out var value)) + { + list.Add(value); + } + } + } + return list; + } + } + private string[] GetPeopleNames(IWebElement container) { var peopleElements = container.FindElements(By.CssSelector(".person span")); diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor index a3bc250f0634..d7df87adbeed 100644 --- a/src/Components/test/testassets/BasicTestApp/Index.razor +++ b/src/Components/test/testassets/BasicTestApp/Index.razor @@ -119,6 +119,7 @@ + diff --git a/src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor b/src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor new file mode 100644 index 000000000000..3beb29cf87c2 --- /dev/null +++ b/src/Components/test/testassets/BasicTestApp/VirtualizationLargeOverscan.razor @@ -0,0 +1,12 @@ +@* Test component to validate behavior when OverscanCount greatly exceeds MaxItemCount. *@ +@using Microsoft.AspNetCore.Components.Web.Virtualization + +
+ +
Item @context
+ +
+ +@code { + private IList _items = Enumerable.Range(0, 5000).ToList(); +} From 60477d3e7f54dcb7d90a51ceb28f1586ede11c4a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 08:33:18 -0700 Subject: [PATCH 02/30] Load handler DLL with load dir on the path. (#63781) Co-authored-by: Aditya Mandaleeka --- .../IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index fcd4205138c9..c94fbb77a7ab 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -110,7 +110,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication LOG_INFOF(L"Loading request handler: '%ls'", handlerDllPath.c_str()); - hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str()); + hRequestHandlerDll = LoadLibraryEx(handlerDllPath.c_str(), nullptr, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); if (preventUnload) From a10e95a57daf8ad9fa25fd5db5214703886239cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 09:16:39 -0700 Subject: [PATCH 03/30] [release/10.0] Source code updates from dotnet/dotnet (#63806) * Backflow from https://github.com/dotnet/dotnet / 537ecf8 build 284571 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284571 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.2.25468.104 -> 10.0.0-rc.2.25473.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 10.0.0-beta.25468.104 -> 10.0.0-beta.25473.111) Microsoft.Web.Xdt (Version 3.2.0-preview.25468.104 -> 3.2.0-preview.25473.111) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-preview.2.46904 -> 7.0.0-preview.2.47411) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 184 ++++----- eng/Version.Details.xml | 370 +++++++++--------- global.json | 6 +- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 5 +- .../ANCMV2/AncmV2.wixproj | 5 +- src/Installers/Windows/Wix.targets | 1 + 6 files changed, 285 insertions(+), 286 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 34e606099902..9c367233065c 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-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 3.2.0-preview.25468.104 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 7.0.0-preview.2.46904 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 3.2.0-preview.25473.111 + 7.0.0-preview.2.47411 + 7.0.0-preview.2.47411 + 7.0.0-preview.2.47411 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.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 298dcd5d1569..b1ba1dc8043e 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 - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd diff --git a/global.json b/global.json index eacd7f971696..c6e026e1380a 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25473.111", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 1ea503e35bce..2feb99a03c34 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -2,11 +2,10 @@ - AspNetCoreModuleV2IISExpress true 17c76489-4c09-4e14-b81c-7a86cd937144 Package - $(Name)_$(Platform) + ancm_iis_express_$(Platform)_en_v2_$(_ProductVersionForInstallers) ICE03 true 2.0 @@ -64,7 +63,7 @@ - ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt) + $(OutputName)$(TargetExt) ASP.NET Core Module IIS Express V2 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index b906475388a8..e151146e4796 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -2,11 +2,10 @@ - AspNetCoreModuleV2 true f9bacb48-3bd7-4ec2-ae31-664e8703ec12 Package - $(Name)_$(Platform) + aspnetcoremodule_$(Platform)_en_v2_$(_ProductVersionForInstallers) true 2.0 true @@ -49,7 +48,7 @@ - aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt) + $(OutputName)$(TargetExt) ASP.NET Core Module V2 diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 43323e6b49dd..adb7dd2c416f 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -129,6 +129,7 @@ PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" PdbType="$(DebugType)" SourceFiles="@(Compile)" + SuppressSpecificWarnings="$(SuppressSpecificWarnings)" LocalizationFiles="@(_WixLocalizationFile)" BindPaths="@(BindPath)" WixpackWorkingDir="$(WixpackWorkingDir)"> From 9ab274622cc88f3c959bf2a297b908187b457b62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 11:16:56 -0700 Subject: [PATCH 04/30] [release/10.0] Source code updates from dotnet/dotnet (#63837) * Backflow from https://github.com/dotnet/dotnet / c9f0e3e build 284752 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284752 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.2.25473.111 -> 10.0.0-rtm.25475.106) 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.25473.111 -> 10.0.0-beta.25475.106) Microsoft.Web.Xdt (Version 3.2.0-preview.25473.111 -> 3.2.0-preview.25475.106) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-preview.2.47411 -> 7.0.0-rc.47606) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 184 +++++++++---------- eng/Version.Details.xml | 370 +++++++++++++++++++------------------- eng/Versions.props | 6 +- global.json | 6 +- 4 files changed, 283 insertions(+), 283 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9c367233065c..dd26d92857f0 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-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 3.2.0-preview.25473.111 - 7.0.0-preview.2.47411 - 7.0.0-preview.2.47411 - 7.0.0-preview.2.47411 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-beta.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 3.2.0-preview.25475.106 + 7.0.0-rc.47606 + 7.0.0-rc.47606 + 7.0.0-rc.47606 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 + 10.0.0-rtm.25475.106 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 b1ba1dc8043e..dd7633a38e0c 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 - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 diff --git a/eng/Versions.props b/eng/Versions.props index 9a4c1065ae21..df7f15551a4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 10 0 0 - 2 + true 8.0.1 *-* @@ -19,8 +19,8 @@ --> false release - rc - RC $(PreReleaseVersionIteration) + rtm + RTM $(PreReleaseVersionIteration) true false $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) diff --git a/global.json b/global.json index c6e026e1380a..6552a108d9c2 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25473.111", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25475.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25475.106", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25475.106", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From de27170cb82cb7501b4160c9900e724e44769d93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 11:36:44 -0700 Subject: [PATCH 05/30] Update dependencies from https://github.com/dotnet/extensions build 20250925.1 (#63861) On relative base path root Microsoft.Extensions.Caching.Hybrid , Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.10.0-preview.1.25468.3 -> To Version 9.10.0-preview.1.25475.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 6 +++--- eng/Version.Details.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index dd26d92857f0..f49bc7f4d403 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -104,9 +104,9 @@ This file should be imported by eng/Versions.props 4.13.0-3.24613.7 4.13.0-3.24613.7 - 9.10.0-preview.1.25468.3 - 9.10.0-preview.1.25468.3 - 9.10.0-preview.1.25468.3 + 9.10.0-preview.1.25475.1 + 9.10.0-preview.1.25475.1 + 9.10.0-preview.1.25475.1 1.0.0-prerelease.25467.1 1.0.0-prerelease.25467.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd7633a38e0c..3cff3cc0ee98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -390,17 +390,17 @@ https://github.com/dotnet/dotnet c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/extensions - 53ef1158f9f42632e111d6873a8cd72b803b4ae6 + c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31 - + https://github.com/dotnet/extensions - 53ef1158f9f42632e111d6873a8cd72b803b4ae6 + c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31 - + https://github.com/dotnet/extensions - 53ef1158f9f42632e111d6873a8cd72b803b4ae6 + c4e57fb1e6b8403a527ea3cd737f1146dcbc1f31 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization From bb04bd92c01d4024354b2b36f8758211a262b5d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 13:42:40 -0700 Subject: [PATCH 06/30] [release/10.0] Source code updates from dotnet/dotnet (#63853) * Backflow from https://github.com/dotnet/dotnet / e1eaf1b build 284895 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284895 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-rtm.25475.106 -> 10.0.0-rtm.25476.104) 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.25475.106 -> 10.0.0-beta.25476.104) Microsoft.Web.Xdt (Version 3.2.0-preview.25475.106 -> 3.2.0-preview.25476.104) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.47606 -> 7.0.0-rc.47704) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 184 +++++++++---------- eng/Version.Details.xml | 370 +++++++++++++++++++------------------- global.json | 6 +- 3 files changed, 280 insertions(+), 280 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f49bc7f4d403..fdfa821306de 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.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-beta.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 3.2.0-preview.25475.106 - 7.0.0-rc.47606 - 7.0.0-rc.47606 - 7.0.0-rc.47606 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 - 10.0.0-rtm.25475.106 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-beta.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 3.2.0-preview.25476.104 + 7.0.0-rc.47704 + 7.0.0-rc.47704 + 7.0.0-rc.47704 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 + 10.0.0-rtm.25476.104 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 3cff3cc0ee98..fd249d613c3d 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 - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 diff --git a/global.json b/global.json index 6552a108d9c2..b739b35cb35d 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25475.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25475.106", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25475.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25476.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25476.104", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25476.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From 0147b789cd1c61d1e9f81200f2a053ed68aed406 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 09:57:15 -0700 Subject: [PATCH 07/30] [release/10.0] Source code updates from dotnet/dotnet (#63880) * Backflow from https://github.com/dotnet/dotnet / 8aba88f build 285155 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 285155 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-rtm.25476.104 -> 10.0.0-rtm.25479.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.25476.104 -> 10.0.0-beta.25479.109) Microsoft.Web.Xdt (Version 3.2.0-preview.25476.104 -> 3.2.0-preview.25479.109) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.47704 -> 7.0.0-rc.48009) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 184 ++++----- eng/Version.Details.xml | 370 +++++++++---------- eng/common/post-build/nuget-verification.ps1 | 2 +- es-metadata.yml | 8 + global.json | 6 +- 5 files changed, 289 insertions(+), 281 deletions(-) create mode 100644 es-metadata.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fdfa821306de..36950e10ab5a 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.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-beta.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 3.2.0-preview.25476.104 - 7.0.0-rc.47704 - 7.0.0-rc.47704 - 7.0.0-rc.47704 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 - 10.0.0-rtm.25476.104 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-beta.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 3.2.0-preview.25479.109 + 7.0.0-rc.48009 + 7.0.0-rc.48009 + 7.0.0-rc.48009 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.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 fd249d613c3d..63773c0c025c 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 - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index a365194a9389..ac5c69ffcac5 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/es-metadata.yml b/es-metadata.yml new file mode 100644 index 000000000000..a9fe05cc4ca9 --- /dev/null +++ b/es-metadata.yml @@ -0,0 +1,8 @@ +schemaVersion: 0.0.1 +isProduction: true +accountableOwners: + service: 4db45fa9-fb0f-43ce-b523-ad1da773dfbc +routing: + defaultAreaPath: + org: devdiv + path: DevDiv\ASP.NET Core\Policy Violations diff --git a/global.json b/global.json index b739b35cb35d..9679d3ebca38 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25476.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25476.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25476.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.109", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25479.109", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From 3031a306b8a85dd122dfe339578cfbd9bd283fee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Oct 2025 14:12:26 -0700 Subject: [PATCH 08/30] Update dependencies from https://github.com/dotnet/dotnet build 285185 (#63890) 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-rtm.25479.109 -> 10.0.0-rtm.25479.115) 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.25479.109 -> 10.0.0-beta.25479.115) Microsoft.Web.Xdt (Version 3.2.0-preview.25479.109 -> 3.2.0-preview.25479.115) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.48009 -> 7.0.0-rc.48015) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 184 +++++++++---------- eng/Version.Details.xml | 370 +++++++++++++++++++------------------- global.json | 6 +- 3 files changed, 280 insertions(+), 280 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 36950e10ab5a..f4a813d12a67 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.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-beta.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 3.2.0-preview.25479.109 - 7.0.0-rc.48009 - 7.0.0-rc.48009 - 7.0.0-rc.48009 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 - 10.0.0-rtm.25479.109 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 3.2.0-preview.25479.115 + 7.0.0-rc.48015 + 7.0.0-rc.48015 + 7.0.0-rc.48015 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 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 63773c0c025c..eceb2d55f97a 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 - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 diff --git a/global.json b/global.json index 9679d3ebca38..ca40e9fd11ce 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.109", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25479.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.115", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25479.115", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From b5c6e0d57deea9fbac36077786f91b8bd52ad8e3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 2 Oct 2025 09:34:36 -0700 Subject: [PATCH 09/30] Fix ANCM Install path for WOW64 (#63899) --- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index deec6789d766..82a20b5acd33 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -260,7 +260,7 @@ - + From 00cd83ba4fb0b27543cb90e7c5c65efcf13c0ab4 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 2 Oct 2025 14:50:27 -0700 Subject: [PATCH 10/30] Loc update (#63907) --- .../App.Runtime/bundle/theme/1040/bundle.wxl | 12 ++++++------ .../LCID/1031/setupstrings.wxl | 2 +- .../LCID/1040/setupstrings.wxl | 2 +- .../LCID/1041/setupstrings.wxl | 2 +- .../LCID/1049/setupstrings.wxl | 2 +- .../Windows/WindowsHostingBundle/LCID/1033/thm.wxl | 2 +- .../Windows/WindowsHostingBundle/LCID/1040/thm.wxl | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl index 44d3acd9f917..4cf802a593b3 100644 --- a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl @@ -10,14 +10,14 @@ - +/norestart - Consente di impedire qualsiasi tentativo di riavvio. Per impostazione predefinita, prima del riavvio verrà visualizzato un prompt nell'interfaccia utente. +/log log.txt - Esegue la registrazione in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%."/> diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl index 094740c09ab4..a5ee63ec96b9 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl +++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1031/setupstrings.wxl @@ -14,7 +14,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl index aababea00f5a..5e5308659482 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl +++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1040/setupstrings.wxl @@ -14,7 +14,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl index d29fc94c5bc0..7937128b2916 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl +++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1041/setupstrings.wxl @@ -14,7 +14,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl index 78a0fe983199..650f939b3045 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl +++ b/src/Installers/Windows/AspNetCoreModule-Setup/LCID/1049/setupstrings.wxl @@ -14,7 +14,7 @@ - + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl index 9c417855c5a7..5fe7efe2ab1a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl @@ -75,4 +75,4 @@ - \ No newline at end of file + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl index d27135649d1f..6549efc8249b 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl @@ -11,7 +11,7 @@ - + From b1ba55c2231c77190eaeb232294fbd48eac49ccb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 14:50:36 -0700 Subject: [PATCH 11/30] Add loc strings for license hyperlinks (#63908) Co-authored-by: wtgodbe --- src/Framework/App.Runtime/bundle/bundle.thm | 6 +++--- src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl | 3 +++ .../Windows/WindowsHostingBundle/LCID/1033/thm.wxl | 3 +++ src/Installers/Windows/WindowsHostingBundle/bundle.thm | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Framework/App.Runtime/bundle/bundle.thm b/src/Framework/App.Runtime/bundle/bundle.thm index 350e9d4bf8d8..4a7934d05a67 100644 --- a/src/Framework/App.Runtime/bundle/bundle.thm +++ b/src/Framework/App.Runtime/bundle/bundle.thm @@ -32,9 +32,9 @@ - <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> - <A HREF="https://aka.ms/dotnet-license-windows">Licensing Information for .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> + #(loc.PrivacyStatementLink) + #(loc.DotNetCLITelemetryLink) + #(loc.DotNetEulaLink) + +@code { + private int currentCount = 0; + + private void IncrementCount() + { + currentCount++; + } +} \ No newline at end of file From 6bc82e1e64faeeec0bfbe4f7b8edfc2ee52da2c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 09:36:05 -0700 Subject: [PATCH 23/30] Update dependencies from https://github.com/dotnet/dotnet build 286841 (#64022) 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-rtm.25510.102 -> 10.0.0-rtm.25513.102) 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.25510.102 -> 10.0.0-beta.25513.102) Microsoft.Web.Xdt (Version 3.2.0-preview.25510.102 -> 3.2.0-preview.25513.102) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.1102 -> 7.0.0-rc.1402) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 184 +++++++-------- eng/Version.Details.xml | 370 +++++++++++++++---------------- eng/common/SetupNugetSources.ps1 | 71 +++--- eng/common/SetupNugetSources.sh | 175 +++++++++------ global.json | 6 +- 5 files changed, 421 insertions(+), 385 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2040400484f9..81c977cfdd0b 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.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-beta.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 3.2.0-preview.25510.102 - 7.0.0-rc.1102 - 7.0.0-rc.1102 - 7.0.0-rc.1102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 - 10.0.0-rtm.25510.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 3.2.0-preview.25513.102 + 7.0.0-rc.1402 + 7.0.0-rc.1402 + 7.0.0-rc.1402 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 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 7e71ad8053bb..4135a2542e2f 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 - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 8656e755a6efd273c038b670bc52648783d3f667 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 9445c3143258..fc8d618014e0 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -7,7 +7,7 @@ # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup internal Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 +# Adds or enables the package source with the given name +function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { + if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) { + AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password + } +} + # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) { + Write-Host "Adding package source $SourceName" + $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) $sources.AppendChild($packageSource) | Out-Null } else { - Write-Host "Package source $SourceName already present." + Write-Host "Package source $SourceName already present and enabled." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) { return; } + Write-Host "Inserting credential for feed: " $source + # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd +# Enable all darc-int package sources. +function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) { + $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroInternalSources) { + EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key } } -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise. +function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) { + $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']") + if ($DisabledPackageSource) { + Write-Host "Enabling internal source '$($DisabledPackageSource.key)'." + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) + + AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password + return $true } + return $false } if (!(Test-Path $ConfigFile -PathType Leaf)) { @@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to or create one if none exist already +# Get reference to - fail if none exist $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-Null + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 } $creds = $null +$feedSuffix = "v3/index.json" if ($Password) { + $feedSuffix = "v2" # Looks for a node. Create it if none is found. $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") if ($creds -eq $null) { @@ -138,33 +154,22 @@ if ($Password) { } } +$userName = "dn-bot" + # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources -} - -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password - -# 3.1 uses a different feed url format so it's handled differently here -$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds } - $dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ddf4efc81a4a..dd2564aef012 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -52,78 +52,126 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" +# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found. +EnableInternalPackageSource() { + local PackageSourceName="$1" + + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return 1 # No disabled sources section + fi + + # Check if this source name is disabled + 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" + + # Add the source name to PackageSources for credential handling + PackageSources+=("$PackageSourceName") + return 0 # Found and enabled + fi + + return 1 # Not found in disabled sources +} + +# Add source entry to PackageSources +AddPackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Check if source already exists + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Package source $SourceName already present and enabled." + PackageSources+=("$SourceName") + return + fi + + echo "Adding package source $SourceName" + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile" + PackageSources+=("$SourceName") +} + +# Adds or enables the package source with the given name +AddOrEnablePackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Try to enable if disabled, if not found then add new source + EnableInternalPackageSource "$SourceName" + if [ "$?" != "0" ]; then + AddPackageSource "$SourceName" "$SourceEndPoint" + fi +} - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -fi +# Enable all darc-int package sources +EnableMaestroInternalPackageSources() { + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return # No disabled sources section + fi + + # Find all darc-int disabled sources + local DisabledDarcIntSources=() + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"') + + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]]; then + EnableInternalPackageSource "$DisabledSourceName" + fi + done +} -# Ensure there is a ... section. -grep -i "" $ConfigFile +# Ensure there is a ... section. +grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding ... section." - - PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 fi PackageSources=() -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "... section. + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + echo "Adding ... section." - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') +fi + +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +grep -i "" $ConfigFile > /dev/null +if [ "$?" == "0" ]; then + echo "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnableMaestroInternalPackageSources fi DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null if [ "$?" == "0" ]; then - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal") - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding $FeedPrefix-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal-transport") + AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix" + AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix" fi done @@ -139,29 +187,12 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." + echo " Inserting credential for feed: $FeedName" PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done fi - -# Re-enable any entries in disabledPackageSources where the feed name contains darc-int -grep -i "" $ConfigFile -if [ "$?" == "0" ]; then - DisabledDarcIntSources=() - echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]] - then - OldDisableValue="" - NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile - echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" - fi - done -fi diff --git a/global.json b/global.json index 0db56904b992..0b9c3374897e 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25510.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25510.102", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25510.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25513.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From ca23a78fe760b894c5eb94b0c0d531418614a0c4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:50:49 -0700 Subject: [PATCH 24/30] [release/10.0] Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2814832 (#64030) * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2807742 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2807742 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2810305 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2811174 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2811174 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2812045 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2812965 * Localized file check-in by OneLocBuild Task: Build definition ID 1159: Build ID 2813637 --------- Co-authored-by: dotnet bot --- .../App.Runtime/bundle/theme/1028/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1029/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1031/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1036/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1040/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1041/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1042/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1045/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1046/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1049/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/1055/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/2052/bundle.wxl | 3 +++ .../App.Runtime/bundle/theme/3082/bundle.wxl | 3 +++ .../Windows/WindowsHostingBundle/LCID/1028/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1029/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1031/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1033/thm.wxl | 2 +- .../Windows/WindowsHostingBundle/LCID/1036/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1040/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1041/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1042/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1045/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1046/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1049/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/1055/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/2052/thm.wxl | 11 ++++++++++- .../Windows/WindowsHostingBundle/LCID/3082/thm.wxl | 11 ++++++++++- 27 files changed, 170 insertions(+), 14 deletions(-) diff --git a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl index 3d717fd188a2..98438707f1fc 100644 --- a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl index 526548d3bb9c..b9f103b6f663 100644 --- a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl index 42fda4edf539..041e420cce85 100644 --- a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl index c3dc0db29087..bb4e4443f41a 100644 --- a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl index 4cf802a593b3..cd35cff97681 100644 --- a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl index 84d6e94be0f2..07ec85e5459b 100644 --- a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl index 1993c7929403..fa156e015132 100644 --- a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl index e9238f39dba2..e9dd3ad9f88e 100644 --- a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl index c540ddd64f7c..52dc6e0a764c 100644 --- a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl index 4d8465ca45ab..4b2e77b12218 100644 --- a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl index beaea73b402b..7256f4f39272 100644 --- a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl index 810dd7ead9a0..8356b9b25999 100644 --- a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl index b532f4681380..24e40a2fdd0b 100644 --- a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl @@ -69,6 +69,9 @@ ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl index 91430c73448d..94663921e880 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl index 814a9e043f22..e11617a2fafc 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl index 609f7953625f..dbb61e806f0a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl index 7489ae998196..5c2e7c738aab 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl @@ -78,4 +78,4 @@ - + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl index 3716eff07744..aea0327ac7ed 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl index 6549efc8249b..6d7e60ad9fe3 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl index d682cbea7bb7..a1bb66ae24ad 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl index 747578c9c2f1..b68016d16866 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl index 0b3ce04d4136..85aed5f3987a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl index 007312cd2951..bdf95eb8452a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl index 0f0fdef22d95..11960f0328cd 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl index 2f49f0b41390..28f4b29ca640 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl index baeb5a50c3ed..a094db252697 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl index 0803bae91388..d2bedbd1f614 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl @@ -11,7 +11,13 @@ - + @@ -61,6 +67,9 @@ + + + From 41c64e8dda09533fd3c43acfd946982bd692a1f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 14:46:39 -0700 Subject: [PATCH 25/30] Merged PR 51302: Fix chunked request parsing (#64038) Co-authored-by: Brennan Conroy --- src/Servers/Kestrel/Core/src/CoreStrings.resx | 3 + .../Http/Http1ChunkedEncodingMessageBody.cs | 45 +++++- .../Internal/Http/RequestRejectionReason.cs | 3 +- .../src/KestrelBadHttpRequestException.cs | 3 + .../Kestrel/Core/test/MessageBodyTests.cs | 4 +- .../ChunkedRequestTests.cs | 147 ++++++++++++++++++ 6 files changed, 195 insertions(+), 10 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/CoreStrings.resx b/src/Servers/Kestrel/Core/src/CoreStrings.resx index 55f5bde688f0..c6fb576b6011 100644 --- a/src/Servers/Kestrel/Core/src/CoreStrings.resx +++ b/src/Servers/Kestrel/Core/src/CoreStrings.resx @@ -740,4 +740,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l The client sent a {frameType} frame to a control stream that was too large. + + Bad chunk extension. + \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs index 5e426ed25721..6f2b39a205b7 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs @@ -16,6 +16,7 @@ internal sealed class Http1ChunkedEncodingMessageBody : Http1MessageBody { // byte consts don't have a data type annotation so we pre-cast it private const byte ByteCR = (byte)'\r'; + private const byte ByteLF = (byte)'\n'; // "7FFFFFFF\r\n" is the largest chunk size that could be returned as an int. private const int MaxChunkPrefixBytes = 10; @@ -27,6 +28,8 @@ internal sealed class Http1ChunkedEncodingMessageBody : Http1MessageBody private readonly Pipe _requestBodyPipe; private ReadResult _readResult; + private static readonly bool InsecureChunkedParsing = AppContext.TryGetSwitch("Microsoft.AspNetCore.Server.Kestrel.EnableInsecureChunkedRequestParsing", out var value) && value; + public Http1ChunkedEncodingMessageBody(Http1Connection context, bool keepAlive) : base(context, keepAlive) { @@ -345,15 +348,31 @@ private void ParseChunkedPrefix(in ReadOnlySequence buffer, out SequencePo KestrelBadHttpRequestException.Throw(RequestRejectionReason.BadChunkSizeData); } + // https://www.rfc-editor.org/rfc/rfc9112#section-7.1 + // chunk = chunk-size [ chunk-ext ] CRLF + // chunk-data CRLF + + // https://www.rfc-editor.org/rfc/rfc9112#section-7.1.1 + // chunk-ext = *( BWS ";" BWS chunk-ext-name + // [BWS "=" BWS chunk-ext-val] ) + // chunk-ext-name = token + // chunk-ext-val = token / quoted-string private void ParseExtension(ReadOnlySequence buffer, out SequencePosition consumed, out SequencePosition examined) { - // Chunk-extensions not currently parsed - // Just drain the data - examined = buffer.Start; + // Chunk-extensions parsed for \r\n and throws for unpaired \r or \n. do { - SequencePosition? extensionCursorPosition = buffer.PositionOf(ByteCR); + SequencePosition? extensionCursorPosition; + if (InsecureChunkedParsing) + { + extensionCursorPosition = buffer.PositionOf(ByteCR); + } + else + { + extensionCursorPosition = buffer.PositionOfAny(ByteCR, ByteLF); + } + if (extensionCursorPosition == null) { // End marker not found yet @@ -361,9 +380,10 @@ private void ParseExtension(ReadOnlySequence buffer, out SequencePosition examined = buffer.End; AddAndCheckObservedBytes(buffer.Length); return; - }; + } var extensionCursor = extensionCursorPosition.Value; + var charsToByteCRExclusive = buffer.Slice(0, extensionCursor).Length; var suffixBuffer = buffer.Slice(extensionCursor); @@ -378,7 +398,9 @@ private void ParseExtension(ReadOnlySequence buffer, out SequencePosition suffixBuffer = suffixBuffer.Slice(0, 2); var suffixSpan = suffixBuffer.ToSpan(); - if (suffixSpan[1] == '\n') + if (InsecureChunkedParsing + ? (suffixSpan[1] == ByteLF) + : (suffixSpan[0] == ByteCR && suffixSpan[1] == ByteLF)) { // We consumed the \r\n at the end of the extension, so switch modes. _mode = _inputLength > 0 ? Mode.Data : Mode.Trailer; @@ -387,13 +409,22 @@ private void ParseExtension(ReadOnlySequence buffer, out SequencePosition examined = suffixBuffer.End; AddAndCheckObservedBytes(charsToByteCRExclusive + 2); } - else + else if (InsecureChunkedParsing) { + examined = buffer.Start; // Don't consume suffixSpan[1] in case it is also a \r. buffer = buffer.Slice(charsToByteCRExclusive + 1); consumed = extensionCursor; AddAndCheckObservedBytes(charsToByteCRExclusive + 1); } + else + { + consumed = suffixBuffer.End; + examined = suffixBuffer.End; + + // We have \rX or \nX, that's an invalid extension. + KestrelBadHttpRequestException.Throw(RequestRejectionReason.BadChunkExtension); + } } while (_mode == Mode.Extension); } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs b/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs index 827192823023..91467c6cb046 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs @@ -16,6 +16,7 @@ internal enum RequestRejectionReason UnexpectedEndOfRequestContent, BadChunkSuffix, BadChunkSizeData, + BadChunkExtension, ChunkedRequestIncomplete, InvalidRequestTarget, InvalidCharactersInHeaderName, @@ -31,5 +32,5 @@ internal enum RequestRejectionReason ConnectMethodRequired, MissingHostHeader, MultipleHostHeaders, - InvalidHostHeader + InvalidHostHeader, } diff --git a/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs b/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs index 05ae34f89802..6bfa5bfe60c4 100644 --- a/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs +++ b/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs @@ -49,6 +49,9 @@ internal static BadHttpRequestException GetException(RequestRejectionReason reas case RequestRejectionReason.BadChunkSizeData: ex = new BadHttpRequestException(CoreStrings.BadRequest_BadChunkSizeData, StatusCodes.Status400BadRequest, reason); break; + case RequestRejectionReason.BadChunkExtension: + ex = new BadHttpRequestException(CoreStrings.BadRequest_BadChunkExtension, StatusCodes.Status400BadRequest, reason); + break; case RequestRejectionReason.ChunkedRequestIncomplete: ex = new BadHttpRequestException(CoreStrings.BadRequest_ChunkedRequestIncomplete, StatusCodes.Status400BadRequest, reason); break; diff --git a/src/Servers/Kestrel/Core/test/MessageBodyTests.cs b/src/Servers/Kestrel/Core/test/MessageBodyTests.cs index bf21a25153de..fa27c98f399a 100644 --- a/src/Servers/Kestrel/Core/test/MessageBodyTests.cs +++ b/src/Servers/Kestrel/Core/test/MessageBodyTests.cs @@ -338,14 +338,14 @@ public async Task ReadExitsGivenIncompleteChunkedExtension() var stream = new HttpRequestStream(Mock.Of(), reader); reader.StartAcceptingReads(body); - input.Add("5;\r\0"); + input.Add("5;\r"); var buffer = new byte[1024]; var readTask = stream.ReadAsync(buffer, 0, buffer.Length); Assert.False(readTask.IsCompleted); - input.Add("\r\r\r\nHello\r\n0\r\n\r\n"); + input.Add("\nHello\r\n0\r\n\r\n"); Assert.Equal(5, await readTask.DefaultTimeout()); try diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs index 5140f2c7e649..0e37009b4544 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs @@ -4,6 +4,7 @@ using System.Buffers; using System.Globalization; using System.Text; +using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.InternalTesting; using Microsoft.AspNetCore.Server.Kestrel.Core; @@ -18,6 +19,70 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests; public class ChunkedRequestTests : LoggedTest { + [Theory] + [InlineData("2;\rxx\r\nxy\r\n0")] // \r in chunk extensions + [InlineData("2;\nxx\r\nxy\r\n0")] // \n in chunk extensions + public async Task RejectsInvalidChunkExtensions(string invalidChunkLine) + { + var testContext = new TestServiceContext(LoggerFactory); + + await using (var server = new TestServer(AppChunked, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "Content-Type: text/plain", + "", + invalidChunkLine, + "", + ""); + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Content-Length: 0", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + } + } + } + + [Theory] + [InlineData("2;a=b;b=c\r\nxy\r\n0")] // Multiple chunk extensions + [InlineData("2; \r\nxy\r\n0")] // Space in chunk extensions (BWS) + [InlineData("2;;;\r\nxy\r\n0")] // Multiple ';' in chunk extensions + [InlineData("2;novalue\r\nxy\r\n0")] // Name only chunk extension + //[InlineData("2 ;\r\nxy\r\n0")] // Technically allowed per spec, but we never supported it, and no one should be sending it + public async Task AllowsValidChunkExtensions(string chunkLine) + { + var testContext = new TestServiceContext(LoggerFactory); + + await using (var server = new TestServer(AppChunked, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "Content-Type: text/plain", + "", + chunkLine, + "", + ""); + await connection.Receive( + "HTTP/1.1 200 OK", + "Content-Length: 2", + $"Date: {testContext.DateHeaderValue}", + "", + "xy"); + } + } + } + private async Task App(HttpContext httpContext) { var request = httpContext.Request; @@ -1120,4 +1185,86 @@ await connection.Receive( } } } + + [Fact] + public async Task MultiReadWithInvalidNewlineAcrossReads() + { + // Inline so that we know when the first connection.Send has been parsed so we can send the next part + var testContext = new TestServiceContext(LoggerFactory) + { Scheduler = System.IO.Pipelines.PipeScheduler.Inline }; + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + await using (var server = new TestServer(async httpContext => + { + var request = httpContext.Request; + var readTask = request.BodyReader.ReadAsync(); + tcs.TrySetResult(); + var readResult = await readTask; + request.BodyReader.AdvanceTo(readResult.Buffer.End); + }, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.SendAll( + "GET / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "", + "1;\r"); + await tcs.Task; + await connection.SendAll( + "\r"); + + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Content-Length: 0", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + } + } + } + + [Fact] + public async Task InvalidNewlineInFirstReadWithPartialChunkExtension() + { + // Inline so that we know when the first connection.Send has been parsed so we can send the next part + var testContext = new TestServiceContext(LoggerFactory) + { Scheduler = System.IO.Pipelines.PipeScheduler.Inline }; + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + await using (var server = new TestServer(async httpContext => + { + var request = httpContext.Request; + var readTask = request.BodyReader.ReadAsync(); + tcs.TrySetResult(); + var readResult = await readTask; + request.BodyReader.AdvanceTo(readResult.Buffer.End); + }, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.SendAll( + "GET / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "", + "1;\n"); + await tcs.Task; + await connection.SendAll( + "t"); + + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Content-Length: 0", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + } + } + } } From 9fc1da3057ef21c3771ecd55ad8f6e1ec72c62bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 16:21:31 -0700 Subject: [PATCH 26/30] [release/10.0] Add UrlFormat to ObsoleteAttribute for ASPDEPR diagnostics (#64018) * Initial plan * Add UrlFormat to all ASPDEPR obsoletions Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com> * Use Obsoletions.AspNetCoreSharedUrlFormat constant for all ASPDEPR UrlFormat references Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com> * Fix UrlFormat to use numeric diagnostic IDs instead of full ASPDEPR IDs Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com> * Remove unnecessary reference to Obsoletions.cs in the project file --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: joperezr <13854455+joperezr@users.noreply.github.com> Co-authored-by: Jose Perez Rodriguez --- src/DefaultBuilder/src/Microsoft.AspNetCore.csproj | 4 ++++ src/DefaultBuilder/src/WebHost.cs | 3 ++- src/Hosting/Abstractions/src/IWebHost.cs | 3 ++- src/Hosting/Abstractions/src/IWebHostBuilder.cs | 3 ++- .../src/Microsoft.AspNetCore.Hosting.Abstractions.csproj | 4 ++++ .../Hosting/src/Microsoft.AspNetCore.Hosting.csproj | 1 + src/Hosting/Hosting/src/WebHostBuilder.cs | 3 ++- src/Hosting/Hosting/src/WebHostExtensions.cs | 3 ++- .../TestHost/src/Microsoft.AspNetCore.TestHost.csproj | 4 ++++ src/Hosting/TestHost/src/TestServer.cs | 7 ++++--- src/Hosting/TestHost/src/WebHostBuilderExtensions.cs | 5 +++-- .../Microsoft.AspNetCore.Hosting.WindowsServices.csproj | 4 ++++ src/Hosting/WindowsServices/src/WebHostService.cs | 3 ++- .../src/WebHostWindowsServiceExtensions.cs | 3 ++- .../HttpOverrides/src/ForwardedHeadersOptions.cs | 3 ++- src/Middleware/HttpOverrides/src/IPNetwork.cs | 3 ++- .../src/Microsoft.AspNetCore.HttpOverrides.csproj | 4 ++++ .../Mvc.Core/src/Infrastructure/ActionContextAccessor.cs | 3 ++- .../src/Infrastructure/IActionContextAccessor.cs | 3 ++- .../Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj | 1 + .../src/AssemblyPartExtensions.cs | 3 ++- .../RazorRuntimeCompilationMvcBuilderExtensions.cs | 3 ++- .../RazorRuntimeCompilationMvcCoreBuilderExtensions.cs | 3 ++- .../src/FileProviderRazorProjectItem.cs | 3 ++- ...rosoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj | 4 ++++ .../src/MvcRazorRuntimeCompilationOptions.cs | 3 ++- src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs | 5 +++-- .../OpenApiEndpointConventionBuilderExtensions.cs | 5 +++-- src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj | 1 + src/Shared/Obsoletions.cs | 9 +++++++++ 30 files changed, 81 insertions(+), 25 deletions(-) diff --git a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj index 7c8c5ea97aa1..b7b1e259a1e3 100644 --- a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj @@ -35,6 +35,10 @@ + + + + diff --git a/src/DefaultBuilder/src/WebHost.cs b/src/DefaultBuilder/src/WebHost.cs index b31a3bfd2d86..68703a76854c 100644 --- a/src/DefaultBuilder/src/WebHost.cs +++ b/src/DefaultBuilder/src/WebHost.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -21,7 +22,7 @@ namespace Microsoft.AspNetCore; /// /// Provides convenience methods for creating instances of and with pre-configured defaults. /// -[Obsolete("WebHost is obsolete. Use HostBuilder or WebApplicationBuilder instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] +[Obsolete("WebHost is obsolete. Use HostBuilder or WebApplicationBuilder instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public static class WebHost { /// diff --git a/src/Hosting/Abstractions/src/IWebHost.cs b/src/Hosting/Abstractions/src/IWebHost.cs index 25dbbc87c388..adfa708db5e5 100644 --- a/src/Hosting/Abstractions/src/IWebHost.cs +++ b/src/Hosting/Abstractions/src/IWebHost.cs @@ -2,13 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Shared; namespace Microsoft.AspNetCore.Hosting; /// /// Represents a configured web host. /// -[Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] +[Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public interface IWebHost : IDisposable { /// diff --git a/src/Hosting/Abstractions/src/IWebHostBuilder.cs b/src/Hosting/Abstractions/src/IWebHostBuilder.cs index 78fde1cb897d..713a1069e1a5 100644 --- a/src/Hosting/Abstractions/src/IWebHostBuilder.cs +++ b/src/Hosting/Abstractions/src/IWebHostBuilder.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -15,7 +16,7 @@ public interface IWebHostBuilder /// /// Builds an which hosts a web application. /// - [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] IWebHost Build(); /// diff --git a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 9b5d4268cb21..ed3426d65288 100644 --- a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -17,4 +17,8 @@ + + + + diff --git a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj index fb5a2e295272..eb2052e0b5e7 100644 --- a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj @@ -20,6 +20,7 @@ + diff --git a/src/Hosting/Hosting/src/WebHostBuilder.cs b/src/Hosting/Hosting/src/WebHostBuilder.cs index 23d57a3e59ac..0317c83bd1db 100644 --- a/src/Hosting/Hosting/src/WebHostBuilder.cs +++ b/src/Hosting/Hosting/src/WebHostBuilder.cs @@ -9,6 +9,7 @@ using System.Runtime.ExceptionServices; using Microsoft.AspNetCore.Hosting.Builder; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -20,7 +21,7 @@ namespace Microsoft.AspNetCore.Hosting; /// /// A builder for /// -[Obsolete("WebHostBuilder is deprecated in favor of HostBuilder and WebApplicationBuilder. For more information, visit https://aka.ms/aspnet/deprecate/004.", DiagnosticId = "ASPDEPR004")] +[Obsolete("WebHostBuilder is deprecated in favor of HostBuilder and WebApplicationBuilder. For more information, visit https://aka.ms/aspnet/deprecate/004.", DiagnosticId = "ASPDEPR004", UrlFormat = Obsoletions.AspNetCoreDeprecate004Url)] public class WebHostBuilder : IWebHostBuilder { private readonly HostingEnvironment _hostingEnvironment; diff --git a/src/Hosting/Hosting/src/WebHostExtensions.cs b/src/Hosting/Hosting/src/WebHostExtensions.cs index 157058b84349..4ad56d847d07 100644 --- a/src/Hosting/Hosting/src/WebHostExtensions.cs +++ b/src/Hosting/Hosting/src/WebHostExtensions.cs @@ -4,6 +4,7 @@ #nullable enable using Microsoft.AspNetCore.Hosting.Server.Features; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -12,7 +13,7 @@ namespace Microsoft.AspNetCore.Hosting; /// /// Contains extensions for managing the lifecycle of an . /// -[Obsolete("WebHostExtensions is obsolete. Use Host.CreateDefaultBuilder or WebApplication.CreateBuilder instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] +[Obsolete("WebHostExtensions is obsolete. Use Host.CreateDefaultBuilder or WebApplication.CreateBuilder instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public static class WebHostExtensions { /// diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj index 77b288b7250f..3dc6a0dbecb3 100644 --- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj @@ -13,6 +13,10 @@ + + + + diff --git a/src/Hosting/TestHost/src/TestServer.cs b/src/Hosting/TestHost/src/TestServer.cs index 8ded1f8e5a72..f3256b860cf7 100644 --- a/src/Hosting/TestHost/src/TestServer.cs +++ b/src/Hosting/TestHost/src/TestServer.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.TestHost; @@ -80,7 +81,7 @@ public TestServer(IServiceProvider services, IFeatureCollection featureCollectio /// For use with IWebHostBuilder. /// /// - [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public TestServer(IWebHostBuilder builder) : this(builder, CreateTestFeatureCollection()) { @@ -91,7 +92,7 @@ public TestServer(IWebHostBuilder builder) /// /// /// - [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public TestServer(IWebHostBuilder builder, IFeatureCollection featureCollection) { ArgumentNullException.ThrowIfNull(builder); @@ -113,7 +114,7 @@ public TestServer(IWebHostBuilder builder, IFeatureCollection featureCollection) /// /// Gets the instance associated with the test server. /// - [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public IWebHost Host { get diff --git a/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs b/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs index b2e6b0a9619e..86e3739d52a3 100644 --- a/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs +++ b/src/Hosting/TestHost/src/WebHostBuilderExtensions.cs @@ -6,6 +6,7 @@ using System.Net.Http; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -53,7 +54,7 @@ public static IWebHostBuilder UseTestServer(this IWebHostBuilder builder, Action /// /// /// - [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public static TestServer GetTestServer(this IWebHost host) { return (TestServer)host.Services.GetRequiredService(); @@ -64,7 +65,7 @@ public static TestServer GetTestServer(this IWebHost host) /// /// /// - [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost is obsolete. Use IHost instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] public static HttpClient GetTestClient(this IWebHost host) { return host.GetTestServer().CreateClient(); diff --git a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj index 9f788a462f9e..1ab9352c8357 100644 --- a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj +++ b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj @@ -18,6 +18,10 @@ + + + + diff --git a/src/Hosting/WindowsServices/src/WebHostService.cs b/src/Hosting/WindowsServices/src/WebHostService.cs index da6bcff59b53..74b5bfc3933a 100644 --- a/src/Hosting/WindowsServices/src/WebHostService.cs +++ b/src/Hosting/WindowsServices/src/WebHostService.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using System.ServiceProcess; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -12,7 +13,7 @@ namespace Microsoft.AspNetCore.Hosting.WindowsServices; /// Provides an implementation of a Windows service that hosts ASP.NET Core. /// [DesignerCategory("Code")] -[Obsolete("Use UseWindowsService and AddHostedService instead. For more information, visit https://aka.ms/aspnet/deprecate/009.", DiagnosticId = "ASPDEPR009")] +[Obsolete("Use UseWindowsService and AddHostedService instead. For more information, visit https://aka.ms/aspnet/deprecate/009.", DiagnosticId = "ASPDEPR009", UrlFormat = Obsoletions.AspNetCoreDeprecate009Url)] public class WebHostService : ServiceBase { private readonly IWebHost _host; diff --git a/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs b/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs index e9ce70d3e309..3f5790a8e78e 100644 --- a/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs +++ b/src/Hosting/WindowsServices/src/WebHostWindowsServiceExtensions.cs @@ -2,13 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.ServiceProcess; +using Microsoft.AspNetCore.Shared; namespace Microsoft.AspNetCore.Hosting.WindowsServices; /// /// Extensions to for hosting inside a Windows service. /// -[Obsolete("Use UseWindowsService and AddHostedService instead. For more information, visit https://aka.ms/aspnet/deprecate/009.", DiagnosticId = "ASPDEPR009")] +[Obsolete("Use UseWindowsService and AddHostedService instead. For more information, visit https://aka.ms/aspnet/deprecate/009.", DiagnosticId = "ASPDEPR009", UrlFormat = Obsoletions.AspNetCoreDeprecate009Url)] public static class WebHostWindowsServiceExtensions { /// diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs index bd835a21a673..043994b0a772 100644 --- a/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs +++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersOptions.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.AspNetCore.HttpOverrides; +using Microsoft.AspNetCore.Shared; using AspNetIPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork; using IPAddress = System.Net.IPAddress; using IPNetwork = System.Net.IPNetwork; @@ -90,7 +91,7 @@ public class ForwardedHeadersOptions /// Address ranges of known proxies to accept forwarded headers from. /// Obsolete, please use instead /// - [Obsolete("Please use KnownIPNetworks instead. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005")] + [Obsolete("Please use KnownIPNetworks instead. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005", UrlFormat = Obsoletions.AspNetCoreDeprecate005Url)] public IList KnownNetworks => _knownNetworks; /// diff --git a/src/Middleware/HttpOverrides/src/IPNetwork.cs b/src/Middleware/HttpOverrides/src/IPNetwork.cs index 945d3e8eacb7..11bfeb0160bc 100644 --- a/src/Middleware/HttpOverrides/src/IPNetwork.cs +++ b/src/Middleware/HttpOverrides/src/IPNetwork.cs @@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Net; using System.Net.Sockets; +using Microsoft.AspNetCore.Shared; namespace Microsoft.AspNetCore.HttpOverrides; @@ -11,7 +12,7 @@ namespace Microsoft.AspNetCore.HttpOverrides; /// A representation of an IP network based on CIDR notation. /// Please use instead /// -[Obsolete("Please use System.Net.IPNetwork instead. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005")] +[Obsolete("Please use System.Net.IPNetwork instead. For more information, visit https://aka.ms/aspnet/deprecate/005.", DiagnosticId = "ASPDEPR005", UrlFormat = Obsoletions.AspNetCoreDeprecate005Url)] public class IPNetwork { /// diff --git a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj index 2a5fbb97210a..15e0c1a903cb 100644 --- a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj @@ -18,4 +18,8 @@ + + + + diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs index accf130e6bf0..6d310128fcad 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/ActionContextAccessor.cs @@ -4,13 +4,14 @@ #nullable enable using System.Diagnostics.CodeAnalysis; +using Microsoft.AspNetCore.Shared; namespace Microsoft.AspNetCore.Mvc.Infrastructure; /// /// Type that provides access to an . /// -[Obsolete("ActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006")] +[Obsolete("ActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006", UrlFormat = Obsoletions.AspNetCoreDeprecate006Url)] public class ActionContextAccessor : IActionContextAccessor { internal static readonly IActionContextAccessor Null = new NullActionContextAccessor(); diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs index 60fa2bdf4931..a33dd2ff72c5 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/IActionContextAccessor.cs @@ -4,13 +4,14 @@ #nullable enable using System.Diagnostics.CodeAnalysis; +using Microsoft.AspNetCore.Shared; namespace Microsoft.AspNetCore.Mvc.Infrastructure; /// /// Defines an interface for exposing an . /// -[Obsolete("IActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006")] +[Obsolete("IActionContextAccessor is obsolete and will be removed in a future version. For more information, visit https://aka.ms/aspnet/deprecate/006.", DiagnosticId = "ASPDEPR006", UrlFormat = Obsoletions.AspNetCoreDeprecate006Url)] public interface IActionContextAccessor { /// diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj index 2f0ca390d01f..fa00f51a8fe1 100644 --- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj @@ -40,6 +40,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs index a15d1155ae54..9be63233422a 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/AssemblyPartExtensions.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Linq; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.DependencyModel; namespace Microsoft.AspNetCore.Mvc.ApplicationParts; @@ -9,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts; /// /// Static class that adds methods to . /// -[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003")] +[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)] public static class AssemblyPartExtensions { /// diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs index 071f204bc552..76d1dc802d4c 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs @@ -2,13 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; +using Microsoft.AspNetCore.Shared; namespace Microsoft.Extensions.DependencyInjection; /// /// Static class that adds razor compilation extension methods. /// -[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003")] +[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)] public static class RazorRuntimeCompilationMvcBuilderExtensions { /// diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs index 6c9462972811..86c1a02df57d 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs @@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Shared; using Microsoft.CodeAnalysis.Razor; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; @@ -20,7 +21,7 @@ namespace Microsoft.Extensions.DependencyInjection; /// /// Static class that adds razor runtime compilation extension methods. /// -[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003")] +[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)] public static class RazorRuntimeCompilationMvcCoreBuilderExtensions { /// diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs index b867ac2d8e9c..9bc702527788 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/FileProviderRazorProjectItem.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.AspNetCore.Razor.Language; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; @@ -9,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; /// /// A file provider . /// -[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003")] +[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)] public class FileProviderRazorProjectItem : RazorProjectItem { private readonly string _root; diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index a8425cf70113..661eeae9fb01 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -22,6 +22,10 @@ + + + + diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs index bf352f49114d..6ec9876dcd88 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/MvcRazorRuntimeCompilationOptions.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.ApplicationParts; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.FileProviders; namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; @@ -10,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; /// /// Used to configure razor compilation. /// -[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003")] +[Obsolete("Razor runtime compilation is obsolete and is not recommended for production scenarios. For production scenarios, use the default build time compilation. For development scenarios, use Hot Reload instead. For more information, visit https://aka.ms/aspnet/deprecate/003.", DiagnosticId = "ASPDEPR003", UrlFormat = Obsoletions.AspNetCoreDeprecate003Url)] public class MvcRazorRuntimeCompilationOptions { /// diff --git a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs index f66529562e0f..3976128cd958 100644 --- a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs +++ b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.AspNetCore.Shared; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -577,7 +578,7 @@ private static void EnsureDepsFile() /// The used to /// create the server. /// The with the bootstrapped application. - [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the overloads that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the overloads that takes an IServiceProvider instead. For more information, visit https://aka.ms/aspnet/deprecate/008.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] protected virtual TestServer CreateServer(IWebHostBuilder builder) => new(builder); /// @@ -856,7 +857,7 @@ public DelegatedWebApplicationFactory( _configuration = configureWebHost; } - [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.", DiagnosticId = "ASPDEPR008")] + [Obsolete("IWebHost, which this method uses, is obsolete. Use one of the ctors that takes an IServiceProvider instead.", DiagnosticId = "ASPDEPR008", UrlFormat = Obsoletions.AspNetCoreDeprecate008Url)] protected override TestServer CreateServer(IWebHostBuilder builder) => _createServer(builder); protected override TestServer CreateServer(IServiceProvider serviceProvider) => _createServerFromServiceProvider(serviceProvider); diff --git a/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs b/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs index 0f3ed82a2a3e..e29a2dd86167 100644 --- a/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs +++ b/src/OpenApi/src/Extensions/OpenApiEndpointConventionBuilderExtensions.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.OpenApi; using Microsoft.AspNetCore.Routing; +using Microsoft.AspNetCore.Shared; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -29,7 +30,7 @@ public static class OpenApiEndpointConventionBuilderExtensions /// /// The . /// A that can be used to further customize the endpoint. - [Obsolete("WithOpenApi is deprecated and will be removed in a future release. For more information, visit https://aka.ms/aspnet/deprecate/002.", DiagnosticId = "ASPDEPR002")] + [Obsolete("WithOpenApi is deprecated and will be removed in a future release. For more information, visit https://aka.ms/aspnet/deprecate/002.", DiagnosticId = "ASPDEPR002", UrlFormat = Obsoletions.AspNetCoreDeprecate002Url)] [RequiresDynamicCode(TrimWarningMessage)] [RequiresUnreferencedCode(TrimWarningMessage)] public static TBuilder WithOpenApi(this TBuilder builder) where TBuilder : IEndpointConventionBuilder @@ -49,7 +50,7 @@ public static TBuilder WithOpenApi(this TBuilder builder) where TBuild /// The . /// An that returns a new OpenAPI annotation given a generated operation. /// A that can be used to further customize the endpoint. - [Obsolete("WithOpenApi is deprecated and will be removed in a future release. For more information, visit https://aka.ms/aspnet/deprecate/002.", DiagnosticId = "ASPDEPR002")] + [Obsolete("WithOpenApi is deprecated and will be removed in a future release. For more information, visit https://aka.ms/aspnet/deprecate/002.", DiagnosticId = "ASPDEPR002", UrlFormat = Obsoletions.AspNetCoreDeprecate002Url)] [RequiresDynamicCode(TrimWarningMessage)] [RequiresUnreferencedCode(TrimWarningMessage)] public static TBuilder WithOpenApi(this TBuilder builder, Func configureOperation) diff --git a/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj b/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj index 66aa82bbf270..686bdcaf6329 100644 --- a/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj +++ b/src/OpenApi/src/Microsoft.AspNetCore.OpenApi.csproj @@ -29,6 +29,7 @@ + diff --git a/src/Shared/Obsoletions.cs b/src/Shared/Obsoletions.cs index 69b49d150afb..62085ec6b61d 100644 --- a/src/Shared/Obsoletions.cs +++ b/src/Shared/Obsoletions.cs @@ -12,4 +12,13 @@ internal sealed class Obsoletions internal const string RuntimeTlsCipherAlgorithmEnumsMessage = "KeyExchangeAlgorithm, KeyExchangeStrength, CipherAlgorithm, CipherStrength, HashAlgorithm and HashStrength properties are obsolete. Use NegotiatedCipherSuite instead."; internal const string RuntimeTlsCipherAlgorithmEnumsDiagId = "SYSLIB0058"; + + // ASP.NET Core deprecated API URLs (not using {0} placeholder - these are explicit URLs) + internal const string AspNetCoreDeprecate002Url = "https://aka.ms/aspnet/deprecate/002"; + internal const string AspNetCoreDeprecate003Url = "https://aka.ms/aspnet/deprecate/003"; + internal const string AspNetCoreDeprecate004Url = "https://aka.ms/aspnet/deprecate/004"; + internal const string AspNetCoreDeprecate005Url = "https://aka.ms/aspnet/deprecate/005"; + internal const string AspNetCoreDeprecate006Url = "https://aka.ms/aspnet/deprecate/006"; + internal const string AspNetCoreDeprecate008Url = "https://aka.ms/aspnet/deprecate/008"; + internal const string AspNetCoreDeprecate009Url = "https://aka.ms/aspnet/deprecate/009"; } From ebb03987e334f29882a2acdc66afea47a73427db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 10:57:59 -0700 Subject: [PATCH 27/30] Merge pull request #64014 from dotnet/backport/pr-63981-to-release/10.0 [release/10.0] Allow `UserStore` to update passkey name --- .../src/IdentityUserPasskeyExtensions.cs | 35 +++ .../EntityFrameworkCore/src/UserOnlyStore.cs | 40 +--- .../EntityFrameworkCore/src/UserStore.cs | 39 +-- .../test/EF.InMemory.Test/InMemoryContext.cs | 52 +++- .../InMemoryStoreWithGenericsTest.cs | 4 + .../test/EF.Test/DbUtil.cs | 5 + .../test/EF.Test/SqlStoreTestBase.cs | 1 + .../UserStoreEncryptPersonalDataTest.cs | 1 + .../test/EF.Test/UserStoreTest.cs | 67 +++--- .../Utilities/ScratchDatabaseFixture.cs | 10 +- .../src/IdentitySpecificationTestBase.cs | 222 +++++++++++++++++- .../src/UserManagerSpecificationTests.cs | 1 + .../test/InMemory.Test/InMemoryStore.cs | 77 ++++++ 13 files changed, 437 insertions(+), 117 deletions(-) create mode 100644 src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs diff --git a/src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs b/src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs new file mode 100644 index 000000000000..4e2f4a040a58 --- /dev/null +++ b/src/Identity/EntityFrameworkCore/src/IdentityUserPasskeyExtensions.cs @@ -0,0 +1,35 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore; + +internal static class IdentityUserPasskeyExtensions +{ + extension(IdentityUserPasskey passkey) + where TKey : IEquatable + { + public void UpdateFromUserPasskeyInfo(UserPasskeyInfo passkeyInfo) + { + passkey.Data.Name = passkeyInfo.Name; + passkey.Data.SignCount = passkeyInfo.SignCount; + passkey.Data.IsBackedUp = passkeyInfo.IsBackedUp; + passkey.Data.IsUserVerified = passkeyInfo.IsUserVerified; + } + + public UserPasskeyInfo ToUserPasskeyInfo() + => new( + passkey.CredentialId, + passkey.Data.PublicKey, + passkey.Data.CreatedAt, + passkey.Data.SignCount, + passkey.Data.Transports, + passkey.Data.IsUserVerified, + passkey.Data.IsBackupEligible, + passkey.Data.IsBackedUp, + passkey.Data.AttestationObject, + passkey.Data.ClientDataJson) + { + Name = passkey.Data.Name + }; + } +} diff --git a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs index 732e7ccee9fa..2e711f498eef 100644 --- a/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs +++ b/src/Identity/EntityFrameworkCore/src/UserOnlyStore.cs @@ -625,10 +625,7 @@ public virtual async Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo pa var userPasskey = await FindUserPasskeyByIdAsync(passkey.CredentialId, cancellationToken).ConfigureAwait(false); if (userPasskey != null) { - userPasskey.Data.Name = passkey.Name; - userPasskey.Data.SignCount = passkey.SignCount; - userPasskey.Data.IsBackedUp = passkey.IsBackedUp; - userPasskey.Data.IsUserVerified = passkey.IsUserVerified; + userPasskey.UpdateFromUserPasskeyInfo(passkey); UserPasskeys.Update(userPasskey); } else @@ -655,20 +652,7 @@ public virtual async Task> GetPasskeysAsync(TUser user, C var userId = user.Id; var passkeys = await UserPasskeys .Where(p => p.UserId.Equals(userId)) - .Select(p => new UserPasskeyInfo( - p.CredentialId, - p.Data.PublicKey, - p.Data.CreatedAt, - p.Data.SignCount, - p.Data.Transports, - p.Data.IsUserVerified, - p.Data.IsBackupEligible, - p.Data.IsBackedUp, - p.Data.AttestationObject, - p.Data.ClientDataJson) - { - Name = p.Data.Name, - }) + .Select(p => p.ToUserPasskeyInfo()) .ToListAsync(cancellationToken) .ConfigureAwait(false); @@ -708,26 +692,10 @@ public virtual async Task> GetPasskeysAsync(TUser user, C cancellationToken.ThrowIfCancellationRequested(); ThrowIfDisposed(); ArgumentNullException.ThrowIfNull(user); + ArgumentNullException.ThrowIfNull(credentialId); var passkey = await FindUserPasskeyAsync(user.Id, credentialId, cancellationToken).ConfigureAwait(false); - if (passkey != null) - { - return new UserPasskeyInfo( - passkey.CredentialId, - passkey.Data.PublicKey, - passkey.Data.CreatedAt, - passkey.Data.SignCount, - passkey.Data.Transports, - passkey.Data.IsUserVerified, - passkey.Data.IsBackupEligible, - passkey.Data.IsBackedUp, - passkey.Data.AttestationObject, - passkey.Data.ClientDataJson) - { - Name = passkey.Data.Name, - }; - } - return null; + return passkey?.ToUserPasskeyInfo(); } /// diff --git a/src/Identity/EntityFrameworkCore/src/UserStore.cs b/src/Identity/EntityFrameworkCore/src/UserStore.cs index f3347a97259f..50bf2f71b01b 100644 --- a/src/Identity/EntityFrameworkCore/src/UserStore.cs +++ b/src/Identity/EntityFrameworkCore/src/UserStore.cs @@ -770,9 +770,7 @@ public virtual async Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo pa var userPasskey = await FindUserPasskeyByIdAsync(passkey.CredentialId, cancellationToken).ConfigureAwait(false); if (userPasskey != null) { - userPasskey.Data.SignCount = passkey.SignCount; - userPasskey.Data.IsBackedUp = passkey.IsBackedUp; - userPasskey.Data.IsUserVerified = passkey.IsUserVerified; + userPasskey.UpdateFromUserPasskeyInfo(passkey); UserPasskeys.Update(userPasskey); } else @@ -799,20 +797,7 @@ public virtual async Task> GetPasskeysAsync(TUser user, C var userId = user.Id; var passkeys = await UserPasskeys .Where(p => p.UserId.Equals(userId)) - .Select(p => new UserPasskeyInfo( - p.CredentialId, - p.Data.PublicKey, - p.Data.CreatedAt, - p.Data.SignCount, - p.Data.Transports, - p.Data.IsUserVerified, - p.Data.IsBackupEligible, - p.Data.IsBackedUp, - p.Data.AttestationObject, - p.Data.ClientDataJson) - { - Name = p.Data.Name - }) + .Select(p => p.ToUserPasskeyInfo()) .ToListAsync(cancellationToken) .ConfigureAwait(false); @@ -851,27 +836,11 @@ public virtual async Task> GetPasskeysAsync(TUser user, C { cancellationToken.ThrowIfCancellationRequested(); ThrowIfDisposed(); + ArgumentNullException.ThrowIfNull(user); ArgumentNullException.ThrowIfNull(credentialId); var passkey = await FindUserPasskeyAsync(user.Id, credentialId, cancellationToken).ConfigureAwait(false); - if (passkey != null) - { - return new UserPasskeyInfo( - passkey.CredentialId, - passkey.Data.PublicKey, - passkey.Data.CreatedAt, - passkey.Data.SignCount, - passkey.Data.Transports, - passkey.Data.IsUserVerified, - passkey.Data.IsBackupEligible, - passkey.Data.IsBackedUp, - passkey.Data.AttestationObject, - passkey.Data.ClientDataJson) - { - Name = passkey.Data.Name - }; - } - return null; + return passkey?.ToUserPasskeyInfo(); } /// diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs index d5e292d7404f..37cb9ba7785f 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryContext.cs @@ -3,17 +3,31 @@ using System.Data.Common; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test; public class InMemoryContext : InMemoryContext { - private InMemoryContext(DbConnection connection) : base(connection) + private InMemoryContext(DbConnection connection, IServiceProvider serviceProvider) : base(connection, serviceProvider) { } - public static new InMemoryContext Create(DbConnection connection) - => Initialize(new InMemoryContext(connection)); + public static new InMemoryContext Create(DbConnection connection, IServiceCollection services = null) + { + services = ConfigureDbServices(services); + return Initialize(new InMemoryContext(connection, services.BuildServiceProvider())); + } + + public static IServiceCollection ConfigureDbServices(IServiceCollection services = null) + { + services ??= new ServiceCollection(); + services.Configure(options => + { + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; + }); + return services; + } public static TContext Initialize(TContext context) where TContext : DbContext { @@ -28,17 +42,25 @@ public class InMemoryContext : where TUser : IdentityUser { private readonly DbConnection _connection; + private readonly IServiceProvider _serviceProvider; - private InMemoryContext(DbConnection connection) + private InMemoryContext(DbConnection connection, IServiceProvider serviceProvider) { _connection = connection; + _serviceProvider = serviceProvider; } - public static InMemoryContext Create(DbConnection connection) - => InMemoryContext.Initialize(new InMemoryContext(connection)); + public static InMemoryContext Create(DbConnection connection, IServiceCollection services = null) + { + services = InMemoryContext.ConfigureDbServices(services); + return InMemoryContext.Initialize(new InMemoryContext(connection, services.BuildServiceProvider())); + } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - => optionsBuilder.UseSqlite(_connection); + { + optionsBuilder.UseSqlite(_connection); + optionsBuilder.UseApplicationServiceProvider(_serviceProvider); + } } public class InMemoryContext : IdentityDbContext @@ -47,17 +69,25 @@ public class InMemoryContext : IdentityDbContext { private readonly DbConnection _connection; + private readonly IServiceProvider _serviceProvider; - protected InMemoryContext(DbConnection connection) + protected InMemoryContext(DbConnection connection, IServiceProvider serviceProvider) { _connection = connection; + _serviceProvider = serviceProvider; } - public static InMemoryContext Create(DbConnection connection) - => InMemoryContext.Initialize(new InMemoryContext(connection)); + public static InMemoryContext Create(DbConnection connection, IServiceCollection services = null) + { + services = InMemoryContext.ConfigureDbServices(services); + return InMemoryContext.Initialize(new InMemoryContext(connection, services.BuildServiceProvider())); + } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - => optionsBuilder.UseSqlite(_connection); + { + optionsBuilder.UseSqlite(_connection); + optionsBuilder.UseApplicationServiceProvider(_serviceProvider); + } } public abstract class InMemoryContext : diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs index f85e2ea66e33..d4516b0b45b0 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/InMemoryStoreWithGenericsTest.cs @@ -24,6 +24,10 @@ public InMemoryEFUserStoreTestWithGenerics(InMemoryDatabaseFixture fixture) var services = new ServiceCollection(); services.AddHttpContextAccessor(); + services.Configure(options => + { + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; + }); services.AddDbContext( options => options .UseSqlite(_fixture.Connection) diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs index 4bfb6bb171e7..a17c48bff2a0 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/DbUtil.cs @@ -30,6 +30,11 @@ public static IServiceCollection ConfigureDbServices( .UseSqlite(connection); }); + services.Configure(options => + { + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; + }); + return services; } diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs index 3d30b28e6f99..6d1718c79ae2 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs @@ -37,6 +37,7 @@ protected virtual void SetupAddIdentity(IServiceCollection services) options.Password.RequireNonAlphanumeric = false; options.Password.RequireUppercase = false; options.User.AllowedUserNameCharacters = null; + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; }) .AddRoles() .AddDefaultTokenProviders() diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs index 9aedbeaf192a..5d143464c239 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreEncryptPersonalDataTest.cs @@ -25,6 +25,7 @@ protected override void SetupAddIdentity(IServiceCollection services) options.Password.RequireNonAlphanumeric = false; options.Password.RequireUppercase = false; options.User.AllowedUserNameCharacters = null; + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; }) .AddDefaultTokenProviders() .AddEntityFrameworkStores() diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs index fe7eb5ee9003..4cc3e43918c4 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs @@ -19,6 +19,12 @@ public UserStoreTest(ScratchDatabaseFixture fixture) _fixture = fixture; } + public class UserStoreTestDbContext : IdentityDbContext + { + public UserStoreTestDbContext(DbContextOptions options) : base(options) + { } + } + public class ApplicationDbContext : IdentityDbContext { public ApplicationDbContext(DbContextOptions options) : base(options) @@ -38,9 +44,9 @@ public void CanCreateUserUsingEF() } } - private IdentityDbContext CreateContext() + private UserStoreTestDbContext CreateContext() { - var db = DbUtil.Create(_fixture.Connection); + var db = DbUtil.Create(_fixture.Connection); db.Database.EnsureCreated(); return db; } @@ -52,18 +58,18 @@ protected override object CreateTestContext() protected override void AddUserStore(IServiceCollection services, object context = null) { - services.AddSingleton>(new UserStore((IdentityDbContext)context)); + services.AddSingleton>(new UserStore((UserStoreTestDbContext)context)); } protected override void AddRoleStore(IServiceCollection services, object context = null) { - services.AddSingleton>(new RoleStore((IdentityDbContext)context)); + services.AddSingleton>(new RoleStore((UserStoreTestDbContext)context)); } [Fact] public async Task SqlUserStoreMethodsThrowWhenDisposedTest() { - var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder().Options)); + var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder().Options)); store.Dispose(); await Assert.ThrowsAsync(async () => await store.AddClaimsAsync(null, null)); await Assert.ThrowsAsync(async () => await store.AddLoginAsync(null, null)); @@ -97,7 +103,7 @@ await Assert.ThrowsAsync( public async Task UserStorePublicNullCheckTest() { Assert.Throws("context", () => new UserStore(null)); - var store = new UserStore(new IdentityDbContext(new DbContextOptionsBuilder().Options)); + var store = new UserStore(new UserStoreTestDbContext(new DbContextOptionsBuilder().Options)); await Assert.ThrowsAsync("user", async () => await store.GetUserIdAsync(null)); await Assert.ThrowsAsync("user", async () => await store.GetUserNameAsync(null)); await Assert.ThrowsAsync("user", async () => await store.SetUserNameAsync(null, null)); @@ -195,7 +201,6 @@ public async Task FindByEmailThrowsWithTwoUsersWithSameEmail() userB.Email = "dupe@dupe.com"; IdentityResultAssert.IsSuccess(await manager.CreateAsync(userB, "password")); await Assert.ThrowsAsync(async () => await manager.FindByEmailAsync("dupe@dupe.com")); - } [ConditionalFact] @@ -211,17 +216,17 @@ await Assert.ThrowsAsync( [ConditionalFact] public async Task ConcurrentUpdatesWillFail() { - var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var user = CreateTestUser(); - using (var db = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) { db.Database.EnsureCreated(); var manager = CreateManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); } - using (var db = new IdentityDbContext(options)) - using (var db2 = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) + using (var db2 = new UserStoreTestDbContext(options)) { var manager1 = CreateManager(db); var manager2 = CreateManager(db2); @@ -242,17 +247,17 @@ public async Task ConcurrentUpdatesWillFail() [ConditionalFact] public async Task ConcurrentUpdatesWillFailWithDetachedUser() { - var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var user = CreateTestUser(); - using (var db = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) { db.Database.EnsureCreated(); var manager = CreateManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); } - using (var db = new IdentityDbContext(options)) - using (var db2 = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) + using (var db2 = new UserStoreTestDbContext(options)) { var manager1 = CreateManager(db); var manager2 = CreateManager(db2); @@ -271,17 +276,17 @@ public async Task ConcurrentUpdatesWillFailWithDetachedUser() [ConditionalFact] public async Task DeleteAModifiedUserWillFail() { - var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var user = CreateTestUser(); - using (var db = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) { db.Database.EnsureCreated(); var manager = CreateManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); } - using (var db = new IdentityDbContext(options)) - using (var db2 = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) + using (var db2 = new UserStoreTestDbContext(options)) { var manager1 = CreateManager(db); var manager2 = CreateManager(db2); @@ -301,17 +306,17 @@ public async Task DeleteAModifiedUserWillFail() [ConditionalFact] public async Task ConcurrentRoleUpdatesWillFail() { - var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var role = new IdentityRole(Guid.NewGuid().ToString()); - using (var db = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) { db.Database.EnsureCreated(); var manager = CreateRoleManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); } - using (var db = new IdentityDbContext(options)) - using (var db2 = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) + using (var db2 = new UserStoreTestDbContext(options)) { var manager1 = CreateRoleManager(db); var manager2 = CreateRoleManager(db2); @@ -332,17 +337,17 @@ public async Task ConcurrentRoleUpdatesWillFail() [ConditionalFact] public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole() { - var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var role = new IdentityRole(Guid.NewGuid().ToString()); - using (var db = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) { db.Database.EnsureCreated(); var manager = CreateRoleManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); } - using (var db = new IdentityDbContext(options)) - using (var db2 = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) + using (var db2 = new UserStoreTestDbContext(options)) { var manager1 = CreateRoleManager(db); var manager2 = CreateRoleManager(db2); @@ -362,17 +367,17 @@ public async Task ConcurrentRoleUpdatesWillFailWithDetachedRole() [ConditionalFact] public async Task DeleteAModifiedRoleWillFail() { - var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; + var options = new DbContextOptionsBuilder().UseSqlite($"Data Source=D{Guid.NewGuid()}.db").Options; var role = new IdentityRole(Guid.NewGuid().ToString()); - using (var db = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) { db.Database.EnsureCreated(); var manager = CreateRoleManager(db); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); } - using (var db = new IdentityDbContext(options)) - using (var db2 = new IdentityDbContext(options)) + using (var db = new UserStoreTestDbContext(options)) + using (var db2 = new UserStoreTestDbContext(options)) { var manager1 = CreateRoleManager(db); var manager2 = CreateRoleManager(db2); diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs index b29a046cff3f..80b88e97387b 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Utilities/ScratchDatabaseFixture.cs @@ -4,6 +4,7 @@ using System.Data.Common; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test; @@ -23,7 +24,14 @@ public ScratchDatabaseFixture() } private DbContext CreateEmptyContext() - => new DbContext(new DbContextOptionsBuilder().UseSqlite(_connection).Options); + { + var services = new ServiceCollection(); + services.Configure(options => options.Stores.SchemaVersion = IdentitySchemaVersions.Version3); + return new DbContext(new DbContextOptionsBuilder() + .UseSqlite(_connection) + .UseApplicationServiceProvider(services.BuildServiceProvider()) + .Options); + } public DbConnection Connection => _connection; diff --git a/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs index 2d0b0ccec438..7f587d5f87ee 100644 --- a/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs +++ b/src/Identity/Specification.Tests/src/IdentitySpecificationTestBase.cs @@ -48,6 +48,7 @@ protected override void SetupIdentityServices(IServiceCollection services, objec options.Password.RequireNonAlphanumeric = false; options.Password.RequireUppercase = false; options.User.AllowedUserNameCharacters = null; + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; }).AddDefaultTokenProviders(); AddUserStore(services, context); AddRoleStore(services, context); @@ -236,7 +237,7 @@ public async Task CanAddRemoveRoleClaim() var roleSafe = CreateTestRole("ClaimsAdd"); IdentityResultAssert.IsSuccess(await manager.CreateAsync(role)); IdentityResultAssert.IsSuccess(await manager.CreateAsync(roleSafe)); - Claim[] claims = { new Claim("c", "v"), new Claim("c2", "v2"), new Claim("c2", "v3") }; + Claim[] claims = [new Claim("c", "v"), new Claim("c2", "v2"), new Claim("c2", "v3")]; foreach (Claim c in claims) { IdentityResultAssert.IsSuccess(await manager.AddClaimAsync(role, c)); @@ -366,9 +367,9 @@ public async Task CanAddUsersToRole() var role = CreateTestRole(roleName, useRoleNamePrefixAsRoleName: true); IdentityResultAssert.IsSuccess(await roleManager.CreateAsync(role)); TUser[] users = - { + [ CreateTestUser("1"),CreateTestUser("2"),CreateTestUser("3"),CreateTestUser("4"), - }; + ]; foreach (var u in users) { IdentityResultAssert.IsSuccess(await manager.CreateAsync(u)); @@ -604,4 +605,219 @@ private List GenerateRoles(string namePrefix, int count) } return roles; } + + /// + /// Test. + /// + /// Task + [Fact] + public async Task CanAddAndRetrievePasskey() + { + var context = CreateTestContext(); + var manager = CreateManager(context); + Assert.True(manager.SupportsUserPasskey); + var user = CreateTestUser(); + IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); + + var credentialId = Guid.NewGuid().ToByteArray(); + var passkey = new UserPasskeyInfo( + credentialId, + publicKey: [1, 2, 3, 4], + DateTimeOffset.UtcNow, + signCount: 0, + transports: ["usb"], + isUserVerified: false, + isBackupEligible: true, + isBackedUp: false, + attestationObject: [5, 6, 7], + clientDataJson: [8, 9]) + { + Name = "InitialName" + }; + + IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey)); + + var fetchedPasskey = await manager.GetPasskeyAsync(user, credentialId); + AssertPasskeysEqual(passkey, fetchedPasskey); + + var fetchedPasskeys = await manager.GetPasskeysAsync(user); + Assert.Single(fetchedPasskeys); + AssertPasskeysEqual(passkey, fetchedPasskeys[0]); + } + + /// + /// Test. + /// + /// Task + [Fact] + public async Task CanRemovePasskey() + { + var context = CreateTestContext(); + var manager = CreateManager(context); + Assert.True(manager.SupportsUserPasskey); + var user = CreateTestUser(); + IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); + + var passkey = new UserPasskeyInfo( + credentialId: Guid.NewGuid().ToByteArray(), + publicKey: [1], + DateTimeOffset.UtcNow, + signCount: 0, + transports: null, + isUserVerified: false, + isBackupEligible: false, + isBackedUp: false, + attestationObject: [2], + clientDataJson: [3]) + { + Name = "ToRemove" + }; + + IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey)); + Assert.Single(await manager.GetPasskeysAsync(user)); + IdentityResultAssert.IsSuccess(await manager.RemovePasskeyAsync(user, passkey.CredentialId)); + Assert.Empty(await manager.GetPasskeysAsync(user)); + + // Second removal should not throw or change anything + IdentityResultAssert.IsSuccess(await manager.RemovePasskeyAsync(user, passkey.CredentialId)); + Assert.Empty(await manager.GetPasskeysAsync(user)); + } + + /// + /// Test. + /// + /// Task + [Fact] + public async Task CanAddMultiplePasskeys() + { + var context = CreateTestContext(); + var manager = CreateManager(context); + Assert.True(manager.SupportsUserPasskey); + var user = CreateTestUser(); + IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); + + var passkey1 = new UserPasskeyInfo( + credentialId: Guid.NewGuid().ToByteArray(), + publicKey: [1], + DateTimeOffset.UtcNow, + signCount: 0, + transports: ["usb"], + isUserVerified: false, + isBackupEligible: false, + isBackedUp: false, + attestationObject: [10], + clientDataJson: [11]) + { + Name = "One" + }; + var passkey2 = new UserPasskeyInfo( + credentialId: Guid.NewGuid().ToByteArray(), + publicKey: [2], + DateTimeOffset.UtcNow, + signCount: 5, + transports: ["nfc"], + isUserVerified: true, + isBackupEligible: false, + isBackedUp: false, + attestationObject: [12], + clientDataJson: [13]) + { + Name = "Two" + }; + + IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey1)); + IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, passkey2)); + + var all = await manager.GetPasskeysAsync(user); + Assert.Equal(2, all.Count); + Assert.Contains(all, p => p.Name == "One"); + Assert.Contains(all, p => p.Name == "Two"); + + var fetchedPasskey1 = await manager.GetPasskeyAsync(user, passkey1.CredentialId); + var fetchedPasskey2 = await manager.GetPasskeyAsync(user, passkey2.CredentialId); + AssertPasskeysEqual(passkey1, fetchedPasskey1); + AssertPasskeysEqual(passkey2, fetchedPasskey2); + } + + /// + /// Test. + /// + /// Task + [Fact] + public async Task UpdatingPasskeyChangesOnlyMutableFields() + { + var context = CreateTestContext(); + var manager = CreateManager(context); + var user = CreateTestUser(); + IdentityResultAssert.IsSuccess(await manager.CreateAsync(user)); + + var original = new UserPasskeyInfo( + credentialId: Guid.NewGuid().ToByteArray(), + publicKey: [9, 9], + createdAt: DateTimeOffset.UtcNow, + signCount: 1, + transports: ["usb", "nfc"], + isUserVerified: false, + isBackupEligible: true, + isBackedUp: false, + attestationObject: [5], + clientDataJson: [6]) + { + Name = "ImmutableTest" + }; + IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, original)); + + // Attempt to modify both mutable and immutable fields + var updated = new UserPasskeyInfo( + credentialId: original.CredentialId, + publicKey: [0xFF, 0xFF], + createdAt: original.CreatedAt.AddMinutes(5), + signCount: 3, + transports: ["ble"], + isUserVerified: true, + isBackupEligible: false, + isBackedUp: true, + attestationObject: [7], + clientDataJson: [8]) + { + Name = "Changed" + }; + + var expected = new UserPasskeyInfo( + credentialId: original.CredentialId, + publicKey: original.PublicKey, + createdAt: original.CreatedAt, + signCount: updated.SignCount, + transports: original.Transports, + isUserVerified: updated.IsUserVerified, + isBackupEligible: original.IsBackupEligible, + isBackedUp: updated.IsBackedUp, + attestationObject: original.AttestationObject, + clientDataJson: original.ClientDataJson) + { + Name = updated.Name, + }; + + IdentityResultAssert.IsSuccess(await manager.AddOrUpdatePasskeyAsync(user, updated)); + + var stored = await manager.GetPasskeyAsync(user, original.CredentialId); + AssertPasskeysEqual(expected, stored); + } + + private static void AssertPasskeysEqual(UserPasskeyInfo expected, UserPasskeyInfo actual) + { + Assert.NotNull(expected); + Assert.NotNull(actual); + + Assert.Equal(expected.Name, actual.Name); + Assert.Equal(expected.SignCount, actual.SignCount); + Assert.Equal(expected.IsBackedUp, actual.IsBackedUp); + Assert.Equal(expected.IsUserVerified, actual.IsUserVerified); + Assert.Equal(expected.PublicKey, actual.PublicKey); + Assert.Equal(expected.CreatedAt, actual.CreatedAt); + Assert.Equal(expected.IsBackupEligible, actual.IsBackupEligible); + Assert.Equal(expected.AttestationObject, actual.AttestationObject); + Assert.Equal(expected.ClientDataJson, actual.ClientDataJson); + Assert.Equal(expected.Transports, actual.Transports); + } } diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs index 933dad56f92c..5d58387bdfa7 100644 --- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs +++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs @@ -61,6 +61,7 @@ protected virtual IdentityBuilder SetupBuilder(IServiceCollection services, obje options.Password.RequireNonAlphanumeric = false; options.Password.RequireUppercase = false; options.User.AllowedUserNameCharacters = null; + options.Stores.SchemaVersion = IdentitySchemaVersions.Version3; }).AddDefaultTokenProviders(); AddUserStore(services, context); services.AddLogging(); diff --git a/src/Identity/test/InMemory.Test/InMemoryStore.cs b/src/Identity/test/InMemory.Test/InMemoryStore.cs index 23598c8b8ce8..c5860db84589 100644 --- a/src/Identity/test/InMemory.Test/InMemoryStore.cs +++ b/src/Identity/test/InMemory.Test/InMemoryStore.cs @@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Identity.InMemory; public class InMemoryStore : InMemoryUserStore, IUserRoleStore, + IUserPasskeyStore, IQueryableRoleStore, IRoleClaimStore where TRole : PocoRole @@ -158,6 +159,82 @@ Task IRoleStore.FindByNameAsync(string roleName, CancellationToken return Task.FromResult(0); } + public Task AddOrUpdatePasskeyAsync(TUser user, UserPasskeyInfo passkey, CancellationToken cancellationToken) + { + var passkeyEntity = user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(passkey.CredentialId)); + if (passkeyEntity is null) + { + user.Passkeys.Add(ToPocoUserPasskey(user, passkey)); + } + else + { + passkeyEntity.Name = passkey.Name; + passkeyEntity.SignCount = passkey.SignCount; + passkeyEntity.IsBackedUp = passkey.IsBackedUp; + passkeyEntity.IsUserVerified = passkey.IsUserVerified; + } + return Task.CompletedTask; + } + + public Task> GetPasskeysAsync(TUser user, CancellationToken cancellationToken) + { + return Task.FromResult>(user.Passkeys.Select(ToUserPasskeyInfo).ToList()!); + } + + public Task FindByPasskeyIdAsync(byte[] credentialId, CancellationToken cancellationToken) + { + return Task.FromResult(Users.FirstOrDefault(u => u.Passkeys.Any(p => p.CredentialId.SequenceEqual(credentialId)))); + } + + public Task FindPasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken) + { + return Task.FromResult(ToUserPasskeyInfo(user.Passkeys.FirstOrDefault(p => p.CredentialId.SequenceEqual(credentialId)))); + } + + public Task RemovePasskeyAsync(TUser user, byte[] credentialId, CancellationToken cancellationToken) + { + var passkey = user.Passkeys.SingleOrDefault(p => p.CredentialId.SequenceEqual(credentialId)); + if (passkey is not null) + { + user.Passkeys.Remove(passkey); + } + + return Task.CompletedTask; + } + + private static UserPasskeyInfo ToUserPasskeyInfo(PocoUserPasskey p) + => p is null ? null : new( + p.CredentialId, + p.PublicKey, + p.CreatedAt, + p.SignCount, + p.Transports, + p.IsUserVerified, + p.IsBackupEligible, + p.IsBackedUp, + p.AttestationObject, + p.ClientDataJson) + { + Name = p.Name + }; + + private static PocoUserPasskey ToPocoUserPasskey(TUser user, UserPasskeyInfo p) + => new() + { + UserId = user.Id, + CredentialId = p.CredentialId, + PublicKey = p.PublicKey, + Name = p.Name, + CreatedAt = p.CreatedAt, + Transports = p.Transports, + SignCount = p.SignCount, + IsUserVerified = p.IsUserVerified, + IsBackupEligible = p.IsBackupEligible, + IsBackedUp = p.IsBackedUp, + AttestationObject = p.AttestationObject, + ClientDataJson = p.ClientDataJson, + }; + public IQueryable Roles { get { return _roles.Values.AsQueryable(); } From c697d89744c309f4085856630213054242a13010 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 10:59:44 -0700 Subject: [PATCH 28/30] Update dependencies from https://github.com/dotnet/dotnet build 287070 (#64043) Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, 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.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.NETCore.App.Ref, 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-rtm.25513.102 -> 10.0.0) Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.Platforms (Version 10.0.0-rtm.25513.102 -> 10.0.0-rtm.25514.103) 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.25513.102 -> 10.0.0-beta.25514.103) Microsoft.Web.Xdt (Version 3.2.0-preview.25513.102 -> 3.2.0-preview.25514.103) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.1402 -> 7.0.0-rc.1503) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 + eng/Version.Details.props | 184 ++++++++-------- eng/Version.Details.xml | 370 ++++++++++++++++---------------- eng/common/SetupNugetSources.sh | 6 +- global.json | 6 +- 5 files changed, 287 insertions(+), 284 deletions(-) diff --git a/NuGet.config b/NuGet.config index c1a0e3ace904..bd0ec98d8c2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,6 +2,11 @@ + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 81c977cfdd0b..ad8179ee5d88 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.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 3.2.0-preview.25513.102 - 7.0.0-rc.1402 - 7.0.0-rc.1402 - 7.0.0-rc.1402 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0-beta.25514.103 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25514.103 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25514.103 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0-rtm.25514.103 + 10.0.0-rtm.25514.103 + 3.2.0-preview.25514.103 + 7.0.0-rc.1503 + 7.0.0-rc.1503 + 7.0.0-rc.1503 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 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 4135a2542e2f..40941a2bb504 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 - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 862de94f7792651640741a4651183e8bd5f64029 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/global.json b/global.json index 0b9c3374897e..274316a06a01 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25514.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25514.103", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25514.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From 32228b9fa8ef4ea0a7e68fc1ec69c32ffa791adb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 14:04:32 -0700 Subject: [PATCH 29/30] Update dependencies from https://github.com/dotnet/dotnet build 287340 (#64070) Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, 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.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.NETCore.App.Ref, 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 -> 10.0.0) Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.Platforms (Version 10.0.0-rtm.25514.103 -> 10.0.0-rtm.25515.107) 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.25514.103 -> 10.0.0-beta.25515.107) Microsoft.Web.Xdt (Version 3.2.0-preview.25514.103 -> 3.2.0-preview.25515.107) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.1503 -> 7.0.0-rc.1607) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 30 +++--- eng/Version.Details.xml | 216 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 127 insertions(+), 127 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd0ec98d8c2c..dfe2e15ea9b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ad8179ee5d88..a63391d8789b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -9,13 +9,13 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-beta.25514.103 - 10.0.0-beta.25514.103 - 10.0.0-beta.25514.103 - 10.0.0-beta.25514.103 - 10.0.0-beta.25514.103 - 10.0.0-beta.25514.103 - 10.0.0-beta.25514.103 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 10.0.0 10.0.0 10.0.0 @@ -44,7 +44,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25514.103 + 10.0.0-rtm.25515.107 10.0.0 10.0.0 10.0.0 @@ -60,16 +60,16 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25514.103 + 10.0.0-rtm.25515.107 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25514.103 - 10.0.0-rtm.25514.103 - 3.2.0-preview.25514.103 - 7.0.0-rc.1503 - 7.0.0-rc.1503 - 7.0.0-rc.1503 + 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.107 + 3.2.0-preview.25515.107 + 7.0.0-rc.1607 + 7.0.0-rc.1607 + 7.0.0-rc.1607 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40941a2bb504..c8f0f384b5e1 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 - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - 862de94f7792651640741a4651183e8bd5f64029 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e diff --git a/global.json b/global.json index 274316a06a01..8d97a7c5f084 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25514.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25514.103", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25514.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25515.107", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From 7387de91234d3ef751fa50b3d1bfede4130213ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 10:59:24 -0700 Subject: [PATCH 30/30] [release/10.0] Source code updates from dotnet/dotnet (#64080) * Backflow from https://github.com/dotnet/dotnet / 79c85d9 build 287426 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 287426 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, 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.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.NETCore.App.Ref, 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 -> 10.0.0) Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.Platforms (Version 10.0.0-rtm.25515.107 -> 10.0.0-rtm.25515.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 10.0.0-beta.25515.107 -> 10.0.0-beta.25515.111) Microsoft.Web.Xdt (Version 3.2.0-preview.25515.107 -> 3.2.0-preview.25515.111) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.0.0-rc.1607 -> 7.0.0-rc.1611) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.props | 30 ++-- eng/Version.Details.xml | 216 ++++++++++++++--------------- global.json | 8 +- src/Installers/Windows/Wix.targets | 9 ++ 5 files changed, 137 insertions(+), 128 deletions(-) diff --git a/NuGet.config b/NuGet.config index dfe2e15ea9b7..974c0d5109a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a63391d8789b..d52eba764667 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -9,13 +9,13 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 10.0.0 10.0.0 10.0.0 @@ -44,7 +44,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.111 10.0.0 10.0.0 10.0.0 @@ -60,16 +60,16 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.111 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25515.107 - 10.0.0-rtm.25515.107 - 3.2.0-preview.25515.107 - 7.0.0-rc.1607 - 7.0.0-rc.1607 - 7.0.0-rc.1607 + 10.0.0-rtm.25515.111 + 10.0.0-rtm.25515.111 + 3.2.0-preview.25515.111 + 7.0.0-rc.1611 + 7.0.0-rc.1611 + 7.0.0-rc.1611 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8f0f384b5e1..9e723335d9cf 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 - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 diff --git a/global.json b/global.json index 8d97a7c5f084..3aabfb8498f6 100644 --- a/global.json +++ b/global.json @@ -27,11 +27,11 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25515.111", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" + "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" } } diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index adb7dd2c416f..2d29fd599a7e 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -110,6 +110,14 @@ + + + + + $(CompilerAdditionalOptions) -bcgg + + + $(IntermediateOutputPath)wixpack @@ -117,6 +125,7 @@