From b5e67bbc8b9650d97a645a636edc382bf51e142d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:25:10 -0700 Subject: [PATCH 01/53] Update branding to 8.0.21 (#63509) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f229f2c31cc6..4707f60ed795 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 8 0 - 20 + 21 - true + false 7.1.2 7.* $(VersionPrefix) diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj index 5295906837c5..4ffc3aa85fe8 100644 --- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj +++ b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj @@ -38,6 +38,7 @@ $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(TargetArchitecture).deb + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-newkey-$(TargetArchitecture).deb $(TargetDir)$(TargetFileName) $(TargetingPackVersionPrefix) diff --git a/src/Installers/Rpm/Directory.Build.props b/src/Installers/Rpm/Directory.Build.props index b436fc469b10..390975f93156 100644 --- a/src/Installers/Rpm/Directory.Build.props +++ b/src/Installers/Rpm/Directory.Build.props @@ -11,6 +11,7 @@ -cm.1 -cm.2 + -newkey true diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 30d705abb1dc..e9800cf062eb 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -40,6 +40,7 @@ $(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension) $(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension) + $(InstallersOutputPath)$(NewKeyBaseName)$(NewKeyVersionSuffix)$(NewKeyExtension) @@ -103,5 +104,13 @@ UseHardlinksIfPossible="False" /> + + + + diff --git a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj index 5e0427aea7f8..26e74893aba8 100644 --- a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj +++ b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj @@ -16,5 +16,7 @@ $(InstallersOutputPath)$(TargetFileName) $(RuntimeInstallerBaseName)-$(SharedFxVersion) -$(RpmArch).rpm + $(RuntimeInstallerBaseName)-$(SharedFxVersion) + -$(RpmArch).rpm diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index a29db936bd79..7098eaea452c 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -33,6 +33,8 @@ $(InstallersOutputPath)$(TargetFileName) $(TargetingPackInstallerBaseName)-$(TargetingPackVersion) -$(RpmArch).rpm + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion) + -$(RpmArch).rpm $(TargetingPackVersionPrefix) From e36ec382720965b79440cfbda6f6cd7cb5980d5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:31:58 -0700 Subject: [PATCH 04/53] Extend Unofficial 1ES template in IdentityModel nightly tests job (#63466) Co-authored-by: William Godbe --- .azure/pipelines/identitymodel-helix-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/identitymodel-helix-matrix.yml b/.azure/pipelines/identitymodel-helix-matrix.yml index 91be7f22c42f..d0002c3b1f15 100644 --- a/.azure/pipelines/identitymodel-helix-matrix.yml +++ b/.azure/pipelines/identitymodel-helix-matrix.yml @@ -24,7 +24,7 @@ resources: ref: refs/tags/release extends: - template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: sdl: sourceAnalysisPool: From ce61ebc2aa6a3a602101c6a3ea00264b8219f65e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 14:39:55 -0700 Subject: [PATCH 05/53] Quarantine ResponseBody_WriteContentLength_PassedThrough (#63534) Co-authored-by: William Godbe --- src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs index 0f442b7fd36d..1c504efc57c0 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs @@ -206,6 +206,7 @@ public async Task ResponseBody_WriteChunked_ManuallyChunked() } [ConditionalFact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/63532")] public async Task ResponseBody_WriteContentLength_PassedThrough() { string address; From 748205cfc32be03eeb33dfa5bc5bb135f9a317a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 10:47:30 -0700 Subject: [PATCH 06/53] [release/8.0] Update dependencies from dotnet/source-build-reference-packages (#63261) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250814.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25316.2 -> To Version 8.0.0-alpha.1.25414.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250828.6 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25316.2 -> To Version 8.0.0-alpha.1.25428.6 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 ------------ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f1d6aeaf486..1c2f27eb90ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,14 +6,8 @@ - - - - - - @@ -34,14 +28,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6220e76abee8..a00f812b353c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/source-build-reference-packages - 3827e68e002064268d4be4b2d1d96048f9794808 + 0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f diff --git a/eng/Versions.props b/eng/Versions.props index 4707f60ed795..e6d11c6ed91f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 8.0.0-alpha.1.25202.2 - 8.0.0-alpha.1.25316.2 + 8.0.0-alpha.1.25428.6 2.0.0-beta-23228-03 From 3969687575971bfa3613ae00a6d712fdc6f00a57 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 8 Sep 2025 16:26:32 +0200 Subject: [PATCH 07/53] [release/8.0] Use wait assert in flaky tests (#63565) * Make the flaky test wait for the conditon to be true. * Improve `NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly` * Add quarantine to the failing test. --- .../EnhancedNavigationTest.cs | 16 ++++++++++++---- .../FormWithParentBindingContextTest.cs | 12 ++++++------ .../StackExchangeRedis/test/RedisEndToEnd.cs | 1 + 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index 158cc2d42c8d..8f47410c5fb1 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -526,13 +526,21 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWeb Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("LocationChanged/LocationChanging event (server-and-wasm)")).Click(); Browser.Equal("Page with location changed components", () => Browser.Exists(By.TagName("h1")).Text); - Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-server")).Text); - Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-wasm")).Text); + Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith( + "/nav/location-changed/server-and-wasm", + StringComparison.Ordinal)); + Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith( + "/nav/location-changed/server-and-wasm", + StringComparison.Ordinal)); Browser.Exists(By.Id($"update-query-string-{runtimeThatInvokedNavigation}")).Click(); - Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-server")).Text); - Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-wasm")).Text); + Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith( + "/nav/location-changed/server-and-wasm?query=1", + StringComparison.Ordinal)); + Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith( + "/nav/location-changed/server-and-wasm?query=1", + StringComparison.Ordinal)); } [Theory] diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index b8171c827e41..3b27216b5042 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1344,19 +1344,19 @@ public void RadioButtonGetsResetAfterSubmittingEnhancedForm() { GoTo("forms/form-with-checkbox-and-radio-button"); - Assert.False(Browser.Exists(By.Id("checkbox")).Selected); - Assert.False(Browser.Exists(By.Id("radio-button")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected); Browser.Exists(By.Id("checkbox")).Click(); Browser.Exists(By.Id("radio-button")).Click(); - Assert.True(Browser.Exists(By.Id("checkbox")).Selected); - Assert.True(Browser.Exists(By.Id("radio-button")).Selected); + WaitAssert.True(Browser, () => Browser.Exists(By.Id("checkbox")).Selected); + WaitAssert.True(Browser, () => Browser.Exists(By.Id("radio-button")).Selected); Browser.Exists(By.Id("submit-button")).Click(); - Assert.False(Browser.Exists(By.Id("checkbox")).Selected); - Assert.False(Browser.Exists(By.Id("radio-button")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected); } [Fact] diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs index c3173eb7b178..d60dadfb19fb 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs @@ -184,6 +184,7 @@ public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatter [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/63582")] public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLiteral(HttpTransportType transportType, string protocolName) { using (StartVerifiableLog()) From 011dccdff445c3ef74eea4b545df2693915c617d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 15:53:33 -0700 Subject: [PATCH 08/53] [release/8.0] Update Microsoft.Build versions (#62507) * Update Microsoft.Build versions * Update eng/Versions.props Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update SourceBuildPrebuiltBaseline.xml * Remove outdated PackageReference for security package * Remove CVE-2021-43877 update comment --------- Co-authored-by: William Godbe Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- eng/SourceBuildPrebuiltBaseline.xml | 7 +++++++ eng/Versions.props | 11 ++++------- eng/tools/RepoTasks/RepoTasks.csproj | 2 -- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index dda41055550d..f92cf6f96b1b 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -42,5 +42,12 @@ + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index e6d11c6ed91f..1eb0a45f095c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,8 +198,6 @@ 5.0.0-preview.3.20215.2 15.9.3032 - - 6.0.1 $(SystemTextJsonVersion) 4.7.0 @@ -223,13 +221,12 @@ 6.0.0 1.1.1 - 17.4.0 + 17.8.29 1.2.0 - 17.4.0 - 17.4.0 - 17.4.0 + 17.8.29 + 17.8.29 + 17.8.29 1.2.6 - 17.4.0 - From 61794b7f3aac0b6719f783db5b5c725fefc8b695 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Tue, 9 Sep 2025 17:11:53 +0000 Subject: [PATCH 09/53] Merged PR 52770: Fix chunked request parsing --- 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 68908731bf54..346b9c8631fe 100644 --- a/src/Servers/Kestrel/Core/src/CoreStrings.resx +++ b/src/Servers/Kestrel/Core/src/CoreStrings.resx @@ -737,4 +737,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 78416a213472..0762739223ee 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs @@ -15,6 +15,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; @@ -26,6 +27,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) { @@ -343,15 +346,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 @@ -359,9 +378,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); @@ -376,7 +396,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; @@ -385,13 +407,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 0194f09f16d6..3979d2ad7562 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, @@ -32,5 +33,5 @@ internal enum RequestRejectionReason MissingHostHeader, MultipleHostHeaders, InvalidHostHeader, - RequestBodyExceedsContentLength + RequestBodyExceedsContentLength, } 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 f0e9dd29ea77..926914975910 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 46a364c586de..34428961e022 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport; @@ -21,6 +22,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; @@ -1115,4 +1180,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 fa61ec8da4c9530ba0756b0885a37ffa65d244a3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Sep 2025 11:27:59 -0700 Subject: [PATCH 10/53] Update baseline, SDK --- eng/Baseline.Designer.props | 426 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++++++--------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 322 insertions(+), 322 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index af8b9b06b329..d622c72bd232 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 @@ -120,138 +120,138 @@ - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - - - + + + - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - - + + @@ -259,7 +259,7 @@ - 8.0.19 + 8.0.20 @@ -268,51 +268,51 @@ - 8.0.19 + 8.0.20 - + - + - + - + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - - + + @@ -322,8 +322,8 @@ - - + + @@ -331,8 +331,8 @@ - - + + @@ -343,58 +343,58 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 @@ -403,7 +403,7 @@ - 8.0.19 + 8.0.20 @@ -411,71 +411,71 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 - - + + - 8.0.19 + 8.0.20 @@ -491,27 +491,27 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 @@ -520,23 +520,23 @@ - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 @@ -545,54 +545,54 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - - + + - - + + - - + + - 8.0.19 + 8.0.20 - - + + - - + + - - + + - - + + @@ -600,83 +600,83 @@ - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - - - - + + + + - 8.0.19 + 8.0.20 @@ -685,64 +685,64 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 @@ -764,7 +764,7 @@ - 8.0.19 + 8.0.20 @@ -786,7 +786,7 @@ - 8.0.19 + 8.0.20 @@ -802,23 +802,23 @@ - 8.0.19 + 8.0.20 - + - + - + @@ -826,24 +826,24 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - - - + + + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 @@ -853,7 +853,7 @@ - 8.0.19 + 8.0.20 @@ -862,73 +862,73 @@ - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - + - + - + - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 @@ -957,11 +957,11 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 @@ -979,18 +979,18 @@ - 8.0.19 + 8.0.20 - 8.0.19 + 8.0.20 - + - 8.0.19 + 8.0.20 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 5e40f13f2eca..86b656657f27 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index da0cae05a716..1a21cf67e935 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 21 - false + true 7.1.2 7.* - - + @@ -30,10 +29,9 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 089a2fa64939..8fe9477b64d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://github.com/dotnet/source-build-externals @@ -275,17 +275,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -316,22 +316,22 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 574100b692e71fa3426931adf4c1ba42e4ee5213 + 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 1a21cf67e935..c28ff44237c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20-servicing.25419.14 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21-servicing.25468.19 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.20-servicing.25419.14 + 8.0.21-servicing.25468.19 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.20-servicing.25419.14 + 8.0.21-servicing.25468.19 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.20-servicing.25419.14 + 8.0.21-servicing.25468.19 - 8.0.20-servicing.25419.14 + 8.0.21-servicing.25468.19 8.0.0 8.0.1 From 9894c43a288ebb8a3d1367b3f45d5a97b49c11e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 10:12:44 +0000 Subject: [PATCH 12/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250919.1 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.20 -> To Version 8.0.21 --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e9072385128..248064f15a35 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fe9477b64d4..6dcd1c389286 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a947fe22902f3f0b921f5dafed9f059eaa4d18c6 + 4ed21003bb935590b17b051a235fd7073330d398 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c28ff44237c5..a14ae29ff635 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,14 +143,14 @@ 9.0.0-preview.9.24518.1 9.0.0-preview.9.24518.1 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 - 8.0.20 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 + 8.0.21 4.8.0-7.24574.2 4.8.0-7.24574.2 From f4da542c3071da9efd70151b758df20263c235d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 19:10:41 +0000 Subject: [PATCH 13/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250919.8 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25468.19 -> To Version 8.0.21-servicing.25469.8 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 248064f15a35..aed9e8f5f738 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dcd1c389286..706999ee68cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 718de65ca7a2c15d27ebc5ce8d3b9fbc97d5dfb8 + 2913e6f9d1553be07d0f82f05f617b52a77078e5 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index a14ae29ff635..c5bb77378d44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 - 8.0.21-servicing.25468.19 + 8.0.21-servicing.25469.8 8.0.0 8.0.1 From f6239da11fe605f4766d1eb6ee2704bdb74a0532 Mon Sep 17 00:00:00 2001 From: Korolev Dmitry Date: Fri, 19 Sep 2025 23:53:35 +0200 Subject: [PATCH 14/53] Fix runtime architecture detection logic in ANCM. (#63706) Co-authored-by: Aditya Mandaleeka --- .../CommonLib/Environment.cpp | 17 ++++ .../CommonLib/Environment.h | 3 + .../CommonLib/HostFxrResolver.cpp | 78 ++++++++++--------- .../CommonLib/HostFxrResolver.h | 4 +- .../CommonLib/ProcessorArchitecture.h | 28 +++++++ 5 files changed, 91 insertions(+), 39 deletions(-) create mode 100644 src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp index 7096cf85b808..f1f3fe7afcbf 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp @@ -133,6 +133,23 @@ std::wstring Environment::GetDllDirectoryValue() return expandedStr; } +ProcessorArchitecture Environment::GetCurrentProcessArchitecture() +{ + // Use compile-time detection - we know which architectures we support + // and this is the most reliable and efficient approach. IsWow64Process2 + // doesn't show the correct architecture when running under x64 emulation + // on ARM64. +#if defined(_M_ARM64) + return ProcessorArchitecture::ARM64; +#elif defined(_M_AMD64) + return ProcessorArchitecture::AMD64; +#elif defined(_M_IX86) + return ProcessorArchitecture::x86; +#else + static_assert(false, "Unknown target architecture"); +#endif +} + bool Environment::IsRunning64BitProcess() { // Check the bitness of the currently running process diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h index 9e3e1b1bf772..a9e6e85d9ecc 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h @@ -5,6 +5,7 @@ #include #include +#include "ProcessorArchitecture.h" class Environment { @@ -23,6 +24,8 @@ class Environment static bool IsRunning64BitProcess(); static + ProcessorArchitecture GetCurrentProcessArchitecture(); + static HRESULT CopyToDirectory(const std::wstring& source, const std::filesystem::path& destination, bool cleanDest, const std::filesystem::path& directoryToIgnore, int& copiedFileCount); static bool CheckUpToDate(const std::wstring& source, const std::filesystem::path& destination, const std::wstring& extension, const std::filesystem::path& directoryToIgnore); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp index 8fb960261590..8552852ce0e5 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp @@ -409,10 +409,9 @@ HostFxrResolver::InvokeWhereToFindDotnet() HandleWrapper hStdOutWritePipe; HandleWrapper hProcess; HandleWrapper hThread; - CComBSTR pwzDotnetName = NULL; - DWORD dwFilePointer; - BOOL fIsCurrentProcess64Bit; - DWORD dwExitCode; + CComBSTR pwzDotnetName = nullptr; + DWORD dwFilePointer = 0; + DWORD dwExitCode = 0; STRU struDotnetSubstring; STRU struDotnetLocationsString; DWORD dwNumBytesRead = 0; @@ -426,6 +425,7 @@ HostFxrResolver::InvokeWhereToFindDotnet() securityAttributes.bInheritHandle = TRUE; LOG_INFO(L"Invoking where.exe to find dotnet.exe"); + auto currentProcessArch = Environment::GetCurrentProcessArchitecture(); // Create a read/write pipe that will be used for reading the result of where.exe FINISHED_LAST_ERROR_IF(!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0)); @@ -499,13 +499,9 @@ HostFxrResolver::InvokeWhereToFindDotnet() } FINISHED_IF_FAILED(struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead)); - LOG_INFOF(L"where.exe invocation returned: '%ls'", struDotnetLocationsString.QueryStr()); - fIsCurrentProcess64Bit = Environment::IsRunning64BitProcess(); - - LOG_INFOF(L"Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); - + // Look for a dotnet.exe that matches the current process architecture while (TRUE) { index = struDotnetLocationsString.IndexOf(L"\r\n", prevIndex); @@ -518,28 +514,38 @@ HostFxrResolver::InvokeWhereToFindDotnet() // \r\n is two wchars, so add 2 here. prevIndex = index + 2; - LOG_INFOF(L"Processing entry '%ls'", struDotnetSubstring.QueryStr()); - - if (fIsCurrentProcess64Bit == IsX64(struDotnetSubstring.QueryStr())) + ProcessorArchitecture dotnetArch = GetFileProcessorArchitecture(struDotnetSubstring.QueryStr()); + if (dotnetArch == currentProcessArch) { - // The bitness of dotnet matched with the current worker process bitness. + LOG_INFOF(L"Found dotnet.exe matching current process architecture (%ls) '%ls'", + ProcessorArchitectureToString(dotnetArch), + struDotnetSubstring.QueryStr()); + return std::make_optional(struDotnetSubstring.QueryStr()); } + else + { + LOG_INFOF(L"Skipping dotnet.exe with non-matching architecture %ls (need %ls). '%ls'", + ProcessorArchitectureToString(dotnetArch), + ProcessorArchitectureToString(currentProcessArch), + struDotnetSubstring.QueryStr()); + } } Finished: return result; } -BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) +// Reads the PE header of the binary to determine its architecture. +ProcessorArchitecture HostFxrResolver::GetFileProcessorArchitecture(const WCHAR* binaryPath) { // Errors while reading from the file shouldn't throw unless // file.exception(bits) is set - std::ifstream file(dotnetPath, std::ios::binary); + std::ifstream file(binaryPath, std::ios::binary); if (!file.is_open()) { - LOG_TRACEF(L"Failed to open file %ls", dotnetPath); - return false; + LOG_TRACEF(L"Failed to open file %ls", binaryPath); + return ProcessorArchitecture::Unknown; } // Read the DOS header @@ -547,8 +553,8 @@ BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) file.read(reinterpret_cast(&dosHeader), sizeof(dosHeader)); if (dosHeader.e_magic != IMAGE_DOS_SIGNATURE) // 'MZ' { - LOG_TRACEF(L"%ls is not a valid executable file (missing MZ header).", dotnetPath); - return false; + LOG_TRACEF(L"%ls is not a valid executable file (missing MZ header).", binaryPath); + return ProcessorArchitecture::Unknown; } // Seek to the PE header @@ -559,32 +565,30 @@ BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) file.read(reinterpret_cast(&peSignature), sizeof(peSignature)); if (peSignature != IMAGE_NT_SIGNATURE) // 'PE\0\0' { - LOG_TRACEF(L"%ls is not a valid PE file (missing PE header).", dotnetPath); - return false; + LOG_TRACEF(L"%ls is not a valid PE file (missing PE header).", binaryPath); + return ProcessorArchitecture::Unknown; } // Read the file header IMAGE_FILE_HEADER fileHeader{}; file.read(reinterpret_cast(&fileHeader), sizeof(fileHeader)); - // Read the optional header magic field - WORD magic{}; - file.read(reinterpret_cast(&magic), sizeof(magic)); - - // Determine the architecture based on the magic value - if (magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + // Determine the architecture based on the machine type + switch (fileHeader.Machine) { - LOG_INFOF(L"%ls is 32-bit", dotnetPath); - return false; - } - else if (magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - LOG_INFOF(L"%ls is 64-bit", dotnetPath); - return true; + case IMAGE_FILE_MACHINE_I386: + LOG_INFOF(L"%ls is x86 (32-bit)", binaryPath); + return ProcessorArchitecture::x86; + case IMAGE_FILE_MACHINE_AMD64: + LOG_INFOF(L"%ls is AMD64 (x64)", binaryPath); + return ProcessorArchitecture::AMD64; + case IMAGE_FILE_MACHINE_ARM64: + LOG_INFOF(L"%ls is ARM64", binaryPath); + return ProcessorArchitecture::ARM64; + default: + LOG_INFOF(L"%ls has unknown architecture (machine type: 0x%X)", binaryPath, fileHeader.Machine); + return ProcessorArchitecture::Unknown; } - - LOG_INFOF(L"%ls is unknown architecture %i", dotnetPath, fileHeader.Machine); - return false; } std::optional diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h index 08ec650aec54..9065e2aecd2b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h @@ -8,8 +8,8 @@ #include #include #include - #include "ErrorContext.h" +#include "ProcessorArchitecture.h" #define READ_BUFFER_SIZE 4096 @@ -74,7 +74,7 @@ class HostFxrResolver const std::filesystem::path & requestedPath ); - static BOOL IsX64(const WCHAR* dotnetPath); + static ProcessorArchitecture GetFileProcessorArchitecture(const WCHAR* binaryPath); struct LocalFreeDeleter { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h new file mode 100644 index 000000000000..195feddcae7b --- /dev/null +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h @@ -0,0 +1,28 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +enum class ProcessorArchitecture +{ + Unknown, + x86, + AMD64, + ARM64 +}; + +inline const wchar_t* ProcessorArchitectureToString(ProcessorArchitecture arch) +{ + switch (arch) + { + case ProcessorArchitecture::x86: + return L"x86"; + case ProcessorArchitecture::AMD64: + return L"AMD64"; + case ProcessorArchitecture::ARM64: + return L"ARM64"; + case ProcessorArchitecture::Unknown: + default: + return L"Unknown"; + } +} \ No newline at end of file From 49994d722efb977e8636d7da38ef845aeea32407 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 21 Sep 2025 00:11:59 +0000 Subject: [PATCH 15/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250920.4 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25470.4 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index aed9e8f5f738..3e35c994a23f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 706999ee68cc..8f62bb372b1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2913e6f9d1553be07d0f82f05f617b52a77078e5 + b092349f1acd302db5dcd17a21e8ea15ae0588c9 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index c5bb77378d44..dd9c775cba45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 - 8.0.21-servicing.25469.8 + 8.0.21-servicing.25470.4 8.0.0 8.0.1 From d62f1b7ead4ee87fb378ca1bbc3b06d2d0608efb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Sep 2025 21:08:06 +0000 Subject: [PATCH 16/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250922.10 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25472.10 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3e35c994a23f..663cc5c67d67 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f62bb372b1c..54b7b5626a15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b092349f1acd302db5dcd17a21e8ea15ae0588c9 + 96f3e0a71fc6287bc3b0912675662dd94e427c83 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index dd9c775cba45..d772a0b9b378 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 - 8.0.21-servicing.25470.4 + 8.0.21-servicing.25472.10 8.0.0 8.0.1 From 47957363282dbc2594536efd9e21ad69b7487564 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Sep 2025 23:47:21 +0000 Subject: [PATCH 17/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250922.2 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 663cc5c67d67..3d3663f3728a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54b7b5626a15..e13da367823d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4ed21003bb935590b17b051a235fd7073330d398 + 38047d1bc01e97c609cf595088e3f73835b8e589 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 5f401cf0fda91d04ef9d2e2c51f1e0aca0fd5ac8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 06:43:55 +0000 Subject: [PATCH 18/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250922.33 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25469.8 -> To Version 8.0.21-servicing.25472.33 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d3663f3728a..c80cdbcb9897 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e13da367823d..e62b3c608880 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 96f3e0a71fc6287bc3b0912675662dd94e427c83 + cebe9450b034b8f9f2ea889c779728c820871089 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index d772a0b9b378..e26276ebe358 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 - 8.0.21-servicing.25472.10 + 8.0.21-servicing.25472.33 8.0.0 8.0.1 From e28da9c3fd3379cf2b0745ad818c708484d71f72 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 08:05:48 +0000 Subject: [PATCH 19/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250923.21 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25472.33 -> To Version 8.0.21-servicing.25473.21 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index c80cdbcb9897..e6dd52c29d01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e62b3c608880..a87a9e9a369d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cebe9450b034b8f9f2ea889c779728c820871089 + 1892887e28c6812653f864f30a621b190b83dd7c https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index e26276ebe358..0c8f79014f7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 - 8.0.21-servicing.25472.33 + 8.0.21-servicing.25473.21 8.0.0 8.0.1 From 793c218f75de4bb76c2d1145bcf8d35950211c1f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 20:36:33 +0000 Subject: [PATCH 20/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250924.5 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6dd52c29d01..a91b097f2b20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a87a9e9a369d..499d756dafa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 38047d1bc01e97c609cf595088e3f73835b8e589 + 44c7a67a6035b28357051fd33054e9a7e5191d2c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From dd73b6334412d183c56e6df916f169eccf693088 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 00:25:46 +0000 Subject: [PATCH 21/53] Merged PR 53795: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [83131e87-e80d-4d5b-f426-08dbd53b3319](https://maestro.dot.net/subscriptions?search=83131e87-e80d-4d5b-f426-08dbd53b3319) - **Build**: [20250925.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2801893) ([284753](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-runtime/build/284753)) - **Date Produced**: September 25, 2025 11:57:30 PM UTC - **Commit**: [362ab6669d55a75d51166f01b596c967c734ef4c](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC362ab6669d55a75d51166f01b596c967c734ef4c) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.21-servicing.25473.21 to 8.0.21-servicing.25475.13][1] - Microsoft.Extensions.HostFactoryResolver.Sources - Microsoft.Internal.Runtime.AspNetCore.Transport - Microsoft.NETCore.BrowserDebugHost.Transport - Microsoft.NETCore.Platforms - Microsoft.SourceBuild.Intermediate.runtime.linux-x64 - From [8.0.21 to 8.0.21][1] - Microsoft.NET.Runtime.MonoAOTCompiler.Task - Microsoft.NET.Runtime.WebAssembly.Sdk - Microsoft.NETCore.App.Ref - Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm - Microsoft.NETCore.App.Runtime.win-x64 [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1892887e28c6812653f864f30a621b190b83dd7c&targetVersion=GC362ab6669d55a75d51166f01b596c967c734ef4c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a91b097f2b20..eb9f6e49662b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 499d756dafa9..dcdd81b48d3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1892887e28c6812653f864f30a621b190b83dd7c + 362ab6669d55a75d51166f01b596c967c734ef4c https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 0c8f79014f7f..5168af8df055 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 - 8.0.21-servicing.25473.21 + 8.0.21-servicing.25475.13 8.0.0 8.0.1 From 6254f5ca64f85b90327592dff67ea6b2ec0262c6 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 01:49:06 +0000 Subject: [PATCH 22/53] Merged PR 53804: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: [e179a2a7-bc5d-4498-2467-08dbd53ba9ce](https://maestro.dot.net/subscriptions?search=e179a2a7-bc5d-4498-2467-08dbd53ba9ce) - **Build**: [20250925.12](https://dev.azure.com/dnceng/internal/_build/results?buildId=2802118) ([284774](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-efcore/build/284774)) - **Date Produced**: September 26, 2025 1:31:59 AM UTC - **Commit**: [bd381fa6af1f80b3b6a52739729596cd68b6f5c8](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?_a=history&version=GCbd381fa6af1f80b3b6a52739729596cd68b6f5c8) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.21 to 8.0.21][1] - dotnet-ef - Microsoft.EntityFrameworkCore - Microsoft.EntityFrameworkCore.Design - Microsoft.EntityFrameworkCore.InMemory - Microsoft.EntityFrameworkCore.Relational - Microsoft.EntityFrameworkCore.Sqlite - Microsoft.EntityFrameworkCore.SqlServer - Microsoft.EntityFrameworkCore.Tools [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC44c7a67a6035b28357051fd33054e9a7e5191d2c&targetVersion=GCbd381fa6af1f80b3b6a52739729596cd68b6f5c8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb9f6e49662b..6f6f3bfde211 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcdd81b48d3c..363bcf5399d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 44c7a67a6035b28357051fd33054e9a7e5191d2c + bd381fa6af1f80b3b6a52739729596cd68b6f5c8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 7ed20d1db8e5c66ff8a5437d1ede505698d49503 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 1 Oct 2025 02:05:38 +0000 Subject: [PATCH 23/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250930.10 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25475.13 -> To Version 8.0.21-servicing.25480.10 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f6f3bfde211..2b0fbd9020c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 363bcf5399d6..96c9c3150823 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 362ab6669d55a75d51166f01b596c967c734ef4c + b6bb124b6a5613d31c440729a76f4f0649c43c1f https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 5168af8df055..305167d40048 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.21 8.0.21 8.0.21 - 8.0.21-servicing.25475.13 + 8.0.21-servicing.25480.10 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25475.13 + 8.0.21-servicing.25480.10 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25475.13 + 8.0.21-servicing.25480.10 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25475.13 + 8.0.21-servicing.25480.10 - 8.0.21-servicing.25475.13 + 8.0.21-servicing.25480.10 8.0.0 8.0.1 From 574e841ae182021b583c9bc18acc028b63ec2a35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 4 Oct 2025 17:23:31 +0000 Subject: [PATCH 24/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251004.4 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2b0fbd9020c1..d99099fd80df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96c9c3150823..417472e8299a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bd381fa6af1f80b3b6a52739729596cd68b6f5c8 + 2c867628baaa08b026b15c5a9f64c14f92746feb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From eb959079804bcd391e37f87711bb52bbf07466fc Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Oct 2025 13:04:42 -0700 Subject: [PATCH 25/53] Update branding to 8.0.22 (#63949) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1a21cf67e935..a1b9e95ef797 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 8 0 - 21 + 22 - true + false 7.1.2 7.* - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 089a2fa64939..ccd47c663195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -376,26 +376,26 @@ https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - a5ec3fab69ac440afe6764b2e046af6e8fcafa74 + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index a1b9e95ef797..1f18820e14f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,9 +162,9 @@ 6.2.4 6.2.4 - 8.0.0-beta.25407.1 - 8.0.0-beta.25407.1 - 8.0.0-beta.25407.1 + 8.0.0-beta.25504.1 + 8.0.0-beta.25504.1 + 8.0.0-beta.25504.1 8.0.0-alpha.1.25202.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index efa2fd72bfaa..59b2d55e1a33 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -17,8 +17,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index d387c7eac95e..c0e7bbef21c4 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -18,8 +18,8 @@ # - task: Bash@3 # displayName: Setup Private Feeds Credentials # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config $Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token # condition: ne(variables['Agent.OS'], 'Windows_NT') # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index dab3534ab538..22b1c4dfe4a7 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -2,20 +2,13 @@ # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage param( - [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are - [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) try { . $PSScriptRoot\post-build-utils.ps1 - $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1' - - New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force - - Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 - - & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 000000000000..8467dbf8e7c2 --- /dev/null +++ b/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} \ No newline at end of file diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index b98f6a6505d3..4cca1114fcca 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -38,7 +38,7 @@ parameters: # Sbom related params enableSbom: true PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: @@ -167,7 +167,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -226,7 +226,7 @@ jobs: - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)' PublishLocation: Container ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} continueOnError: true @@ -238,7 +238,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -249,7 +249,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -265,7 +265,7 @@ jobs: - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - task: 1ES.PublishPipelineArtifact@1 inputs: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8d..68e7a65605c5 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -63,7 +63,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -106,7 +106,7 @@ jobs: - task: 1ES.PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index b2ccd9df6801..a99d79df863c 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -30,6 +30,10 @@ parameters: signingValidationAdditionalParameters: '' + repositoryAlias: self + + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -50,6 +54,11 @@ jobs: value: false - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates-official/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -65,6 +74,9 @@ jobs: os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - checkout: ${{ parameters.repositoryAlias }} + fetchDepth: 3 + clean: true - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: @@ -82,13 +94,13 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: > -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -115,7 +127,7 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -130,7 +142,7 @@ jobs: displayName: Publish SymbolPublishingExclusionsFile Artifact condition: eq(variables['SymbolExclusionFile'], 'true') inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs @@ -146,7 +158,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 4217d6d8b148..7b9c58a90c5e 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -73,3 +76,4 @@ jobs: - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index fb632b71a250..0579e692fc81 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -59,7 +59,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml index b68d3c2f3199..f6476912a861 100644 --- a/eng/common/templates-official/jobs/codeql-build.yml +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -23,7 +23,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 857a0f8ba43e..03aa64e1741f 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -40,6 +40,8 @@ parameters: enableSourceIndex: false sourceIndexParams: {} + repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -95,3 +97,5 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index b9247be1547b..21a346fbd6c7 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal nuget and blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -44,6 +47,7 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -51,4 +55,5 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index b81b8770b346..817e2d80dea1 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -133,9 +133,8 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation @@ -186,7 +185,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: ../steps/publish-logs.yml @@ -230,7 +229,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -278,7 +277,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml index da669030daf6..52df70774828 100644 --- a/eng/common/templates-official/post-build/trigger-subscription.yml +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Triggering subscriptions inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/trigger-subscriptions.ps1 arguments: -SourceRepo $(Build.Repository.Uri) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroAccessToken) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml index f67a210d62f3..5b6fec257ea7 100644 --- a/eng/common/templates-official/steps/add-build-to-channel.yml +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Add Build to Channel inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/add-build-to-channel.ps1 arguments: -BuildId $(BARBuildId) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroApiAccessToken) diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml index 301d5c591ebd..d9dcd1e1cdeb 100644 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -15,17 +15,17 @@ steps: - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian (Overridden) - ${{ if eq(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian @@ -38,7 +38,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -NugetPackageDirectory $(System.DefaultWorkingDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL @@ -73,7 +73,7 @@ steps: flattenFolders: true sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + targetFolder: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs condition: succeededOrFailed() # Use PublishBuildArtifacts because the SARIF extension only checks this case @@ -81,6 +81,6 @@ steps: - task: PublishBuildArtifacts@1 displayName: Publish SARIF files to CodeAnalysisLogs container inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + pathToPublish: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index daf0957b68d7..1536353566c7 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 8.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml index 04012fed182a..af5a40b64c4b 100644 --- a/eng/common/templates-official/steps/publish-logs.yml +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -8,15 +8,15 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PathtoPublish: '$(System.DefaultWorkingDirectory)/PostBuildLogs' PublishLocation: Container ArtifactName: PostBuildLogs continueOnError: true diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index 829f17c34d11..b63043da4b9f 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -12,6 +12,9 @@ parameters: # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + steps: # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | @@ -26,8 +29,8 @@ steps: internalRestoreArgs= if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh + $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh $(System.DefaultWorkingDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. @@ -101,7 +104,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,4 +129,7 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3..f1311bbb1b33 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 2856f7de1061..80454d5a5587 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -37,7 +37,7 @@ parameters: # Sbom related params enableSbom: true PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -163,7 +163,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -220,7 +220,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)' PublishLocation: Container ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} continueOnError: true @@ -232,7 +232,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -243,7 +243,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -257,7 +257,7 @@ jobs: IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration + - publish: $(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration artifact: BuildConfiguration displayName: Publish build retry configuration continueOnError: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 60ab00c4de3a..2cd3840c9927 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -60,7 +60,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish LocProject.json inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' PublishLocation: Container ArtifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index cc2b346ba8ba..1fcdcc9adc34 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -30,6 +30,10 @@ parameters: signingValidationAdditionalParameters: '' + repositoryAlias: self + + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -50,6 +54,11 @@ jobs: value: false - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -63,6 +72,9 @@ jobs: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - checkout: ${{ parameters.repositoryAlias }} + fetchDepth: 3 + clean: true - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: @@ -80,13 +92,13 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: > -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -111,7 +123,7 @@ jobs: inputs: targetType: inline script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if(Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -126,7 +138,7 @@ jobs: displayName: Publish SymbolPublishingExclusionsFile Artifact condition: eq(variables['SymbolExclusionFile'], 'true') inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container ArtifactName: ReleaseConfigs @@ -142,7 +154,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c48f95d93d91..97021335cfc4 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -72,3 +75,4 @@ jobs: - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 8538f44bab28..81606fd9a541 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -58,7 +58,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4aaa6..e8b43e3b4cba 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -23,7 +23,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 289bb2396ce8..7eafc256758f 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -40,6 +40,8 @@ parameters: enableSourceIndex: false sourceIndexParams: {} + repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -95,3 +97,5 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 3ec997108107..4dde599add97 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal nuget and blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -44,6 +47,7 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -51,4 +55,5 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c3b6a3012fee..ea1785a8aa26 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -130,9 +130,8 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -180,7 +179,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: ../steps/publish-logs.yml @@ -220,7 +219,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -274,7 +273,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 64b9abc68504..4347fa80b684 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -32,7 +32,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml index da669030daf6..52df70774828 100644 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ b/eng/common/templates/post-build/trigger-subscription.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Triggering subscriptions inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/trigger-subscriptions.ps1 arguments: -SourceRepo $(Build.Repository.Uri) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroAccessToken) diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml index f67a210d62f3..5b6fec257ea7 100644 --- a/eng/common/templates/steps/add-build-to-channel.yml +++ b/eng/common/templates/steps/add-build-to-channel.yml @@ -5,7 +5,7 @@ steps: - task: PowerShell@2 displayName: Add Build to Channel inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/add-build-to-channel.ps1 arguments: -BuildId $(BARBuildId) -ChannelId ${{ parameters.ChannelId }} -MaestroApiAccessToken $(MaestroApiAccessToken) diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index fe0ebf8c904e..047e8281ebc0 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -15,17 +15,17 @@ steps: - ${{ if ne(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian (Overridden) - ${{ if eq(parameters.overrideGuardianVersion, '') }}: - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + Set-Location -Path $(System.DefaultWorkingDirectory)\eng\common\sdl . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + $guardianCliLocation = Install-Gdn -Path $(System.DefaultWorkingDirectory)\.artifacts Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" displayName: Install Guardian @@ -40,7 +40,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -NugetPackageDirectory $(System.DefaultWorkingDirectory)\.packages ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} @@ -76,7 +76,7 @@ steps: flattenFolders: true sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + targetFolder: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs condition: succeededOrFailed() # Use PublishBuildArtifacts because the SARIF extension only checks this case @@ -84,6 +84,6 @@ steps: - task: PublishBuildArtifacts@1 displayName: Publish SARIF files to CodeAnalysisLogs container inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + pathToPublish: $(System.DefaultWorkingDirectory)/CodeAnalysisLogs artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 2b21eae42732..b1fe8b3944b3 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 8.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 88f238f36bfd..e2f8413d8e19 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -8,15 +8,15 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PathtoPublish: '$(System.DefaultWorkingDirectory)/PostBuildLogs' PublishLocation: Container ArtifactName: PostBuildLogs continueOnError: true diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 41bbb915736a..ae06b26ea373 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -12,6 +12,9 @@ parameters: # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + steps: # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | @@ -26,8 +29,8 @@ steps: internalRestoreArgs= if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh + $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh $(System.DefaultWorkingDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. @@ -101,7 +104,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,4 +129,7 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} diff --git a/eng/common/templates/variables/sdl-variables.yml b/eng/common/templates/variables/sdl-variables.yml index dbdd66d4a4b3..f1311bbb1b33 100644 --- a/eng/common/templates/variables/sdl-variables.yml +++ b/eng/common/templates/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 85dca8c801cd..b8461e46e871 100644 --- a/global.json +++ b/global.json @@ -25,8 +25,8 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25504.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25504.1" }, "native-tools": { "jdk": "latest" From 2dd0c9273b90f4ee1e91609d5391d803665a3fa2 Mon Sep 17 00:00:00 2001 From: Korolev Dmitry Date: Tue, 7 Oct 2025 22:17:44 +0200 Subject: [PATCH 27/53] Lower WINDOWS_UPDATE received on (half)closed stream to stream abortion --- .../Kestrel/Core/src/Internal/Http2/Http2Connection.cs | 8 ++++++-- .../Http2/Http2ConnectionTests.cs | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs index 5585c23ef377..58de076a029f 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs @@ -1059,8 +1059,12 @@ private Task ProcessWindowUpdateFrameAsync() { if (stream.RstStreamReceived) { - // Hard abort, do not allow any more frames on this stream. - throw new Http2ConnectionErrorException(CoreStrings.FormatHttp2ErrorStreamAborted(_incomingFrame.Type, stream.StreamId), Http2ErrorCode.STREAM_CLOSED); + // WINDOW_UPDATE received after we have already processed an inbound RST_STREAM for this stream. + // RFC 7540 (Sections 5.1, 6.9) / RFC 9113 do not explicitly define semantics for WINDOW_UPDATE on a + // stream in the "closed" state due to a reset by client. We surface it as a stream error (STREAM_CLOSED) + // rather than aborting the entire connection to keep behavior deterministic and consistent with other servers. + // https://github.com/dotnet/aspnetcore/issues/63726 + throw new Http2StreamErrorException(_incomingFrame.StreamId, CoreStrings.Http2StreamAborted, Http2ErrorCode.STREAM_CLOSED); } if (!stream.TryUpdateOutputWindow(_incomingFrame.WindowUpdateSizeIncrement)) diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs index 7e5cec61fa81..5b2fbaf46e62 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs @@ -3355,10 +3355,12 @@ public async Task RST_STREAM_IncompleteRequest_AdditionalWindowUpdateFrame_Conne await SendDataAsync(1, new byte[1], endStream: false); await SendRstStreamAsync(1); await SendWindowUpdateAsync(1, 1024); - tcs.TrySetResult(); - await WaitForConnectionErrorAsync(ignoreNonGoAwayFrames: false, expectedLastStreamId: 1, - Http2ErrorCode.STREAM_CLOSED, CoreStrings.FormatHttp2ErrorStreamAborted(Http2FrameType.WINDOW_UPDATE, 1)); + await WaitForStreamErrorAsync(expectedStreamId: 1, Http2ErrorCode.STREAM_CLOSED, CoreStrings.Http2StreamAborted); + + tcs.TrySetResult(); // Don't let the response start until after the abort + + await StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false); } [Fact] From bbbb699a25d6576d5d1aa73378be216b549083d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 13:49:47 -0700 Subject: [PATCH 28/53] [release/8.0] (deps): Bump src/submodules/googletest (#63893) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `eb2d85e` to `9706f75`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/eb2d85edd0bff7a712b6aff147cd9f789f0d7d0b...9706f75b8f91c52a3840cf5d878a7f37ea10ef00) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-version: 9706f75b8f91c52a3840cf5d878a7f37ea10ef00 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index eb2d85edd0bf..9706f75b8f91 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit eb2d85edd0bff7a712b6aff147cd9f789f0d7d0b +Subproject commit 9706f75b8f91c52a3840cf5d878a7f37ea10ef00 From beaad21b9ebf1a18c0d534879aa420028b0efcc0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 13:52:46 -0700 Subject: [PATCH 29/53] [release/8.0] Fixed devtools url used for debug with chrome and edge (#62080) * Fixed devtools url used for debug with chrome and edge Fixes #61559 * Simplify url normalization and added comments * Ignored leading slash * Used UriHelper to parse url and get query * typo * Backport blocking the failing test. --------- Co-authored-by: Davide Donadello Co-authored-by: Ilona Tomkowicz --- .../WebAssembly/Server/src/TargetPickerUi.cs | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs index 7ec8a74362e8..9f489ea9a161 100644 --- a/src/Components/WebAssembly/Server/src/TargetPickerUi.cs +++ b/src/Components/WebAssembly/Server/src/TargetPickerUi.cs @@ -10,6 +10,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Extensions; using System.Dynamic; namespace Microsoft.AspNetCore.Components.WebAssembly.Server; @@ -366,9 +367,31 @@ private string GetDevToolsUrlWithProxy(BrowserTab tabToDebug) { var underlyingV8Endpoint = new Uri(tabToDebug.WebSocketDebuggerUrl); var proxyEndpoint = new Uri(_debugProxyUrl); - var devToolsUrlAbsolute = new Uri(_browserHost + tabToDebug.DevtoolsFrontendUrl); + var devToolsUrlAbsolute = new Uri(new Uri(_browserHost), relativeUri: NormalizeDevtoolsFrontendUrl(tabToDebug.DevtoolsFrontendUrl)); var devToolsUrlWithProxy = $"{devToolsUrlAbsolute.Scheme}://{devToolsUrlAbsolute.Authority}{devToolsUrlAbsolute.AbsolutePath}?{underlyingV8Endpoint.Scheme}={proxyEndpoint.Authority}{underlyingV8Endpoint.PathAndQuery}"; return devToolsUrlWithProxy; + + static string NormalizeDevtoolsFrontendUrl(string devtoolsFrontendUrl) + { + // Currently frontend url can be: + // - absolute (since v135 of chrome and edge) + // chrome example: https://chrome-devtools-frontend.appspot.com/serve_rev/@031848bc6ad02b97854f3d6154d3aefd0434756a/inspector.html?ws=localhost:9222/devtools/page/719FE9D3B43570193235446E0AB36859 + // edge example: https://aka.ms/docs-landing-page/serve_rev/@4e2c41645f24197463afa2ab6aa999352ee8255c/inspector.html?ws=localhost:9222/devtools/page/3A4D56E09776321628432588FC9299F4 + // - relative (managed as fallback for brosers with prior version) + // example: /devtools/inspector.html?ws=localhost:9222/devtools/page/DAB7FB6187B554E10B0BD18821265734 + // The absolute url can't be used as-is because is not valid for debugging and cannot be made relative because of lack "devtools" segment + // before "inspector.html" but we can keep the query string and append to the default "devtools/inspector.html" browser devtools page + + const string DefaultBrowserDevToolsPagePath = "devtools/inspector.html"; + + if (devtoolsFrontendUrl.AsSpan().TrimStart('/').StartsWith(DefaultBrowserDevToolsPagePath)) + { + return devtoolsFrontendUrl; + } + + UriHelper.FromAbsolute(devtoolsFrontendUrl, out _, out _, out _, out var query, out _); + return $"{DefaultBrowserDevToolsPagePath}{query}"; + } } private string GetLaunchChromeInstructions(string targetApplicationUrl) From c23f5371129d39cbaf981c4ecfcd1fc919eda0ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 15:06:32 -0700 Subject: [PATCH 30/53] [release/8.0] Update dependencies from dotnet/source-build-reference-packages (#63665) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250912.3 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25428.6 -> To Version 8.0.0-alpha.1.25462.3 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250924.1 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25428.6 -> To Version 8.0.0-alpha.1.25474.1 * Add quarantine attribute to NavigationLock test --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- src/Components/test/E2ETest/Tests/RoutingTest.cs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccd47c663195..6f3b9cf17f31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/source-build-reference-packages - 0b4984f8ee945e02a39ef0f72dc9f7ceab65c14f + fcf0226bfea241d4e4f127600b6c3ae10d772e9a diff --git a/eng/Versions.props b/eng/Versions.props index 1f18820e14f8..59ebc4acc814 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 8.0.0-alpha.1.25202.2 - 8.0.0-alpha.1.25428.6 + 8.0.0-alpha.1.25474.1 2.0.0-beta-23228-03 diff --git a/src/Components/test/E2ETest/Tests/RoutingTest.cs b/src/Components/test/E2ETest/Tests/RoutingTest.cs index f02912b43d4d..887d8e283cc5 100644 --- a/src/Components/test/E2ETest/Tests/RoutingTest.cs +++ b/src/Components/test/E2ETest/Tests/RoutingTest.cs @@ -897,6 +897,7 @@ public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_PushS } [Fact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61080")] public void NavigationLock_OverlappingNavigationsCancelExistingNavigations_HistoryNavigation() { SetUrlViaPushState("/"); From f137b0b28d7bbdc7463e983af0559c3e42757a9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Oct 2025 04:38:19 +0000 Subject: [PATCH 31/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251007.14 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.21-servicing.25475.13 -> To Version 8.0.22-servicing.25507.14 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.21 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 20 ++++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index d99099fd80df..d52be5065228 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 417472e8299a..ced2d17a049d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f https://github.com/dotnet/source-build-externals @@ -275,17 +275,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -316,22 +316,22 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b6bb124b6a5613d31c440729a76f4f0649c43c1f + f8f07a0ad92f9efe58458892b4316bdd857d6b3f https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 305167d40048..fef57f3209c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21-servicing.25480.10 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22-servicing.25507.14 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25480.10 + 8.0.22-servicing.25507.14 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.21-servicing.25480.10 + 8.0.22-servicing.25507.14 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.21-servicing.25480.10 + 8.0.22-servicing.25507.14 - 8.0.21-servicing.25480.10 + 8.0.22-servicing.25507.14 8.0.0 8.0.1 From 066e272db1522826e79de688b708eee843c4f6aa Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Wed, 8 Oct 2025 19:51:06 +0000 Subject: [PATCH 32/53] Merged PR 54042: Fix Http3 Encoder/Decoder stream exit condition --- .../src/Internal/Http3/Http3ControlStream.cs | 26 +++------- .../shared/test/Http3/Http3InMemory.cs | 18 ++++++- .../Http3/Http3ConnectionTests.cs | 51 +++++++++++++++++++ 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs index 5bb9452a5da1..1b071ce7c40d 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs @@ -65,6 +65,12 @@ public Http3ControlStream(Http3StreamContext context, long? headerType) context.ClientPeerSettings, this); _frameWriter.Reset(context.Transport.Output, context.ConnectionId); + + _streamClosedFeature.OnClosed(static state => + { + var stream = (Http3ControlStream)state!; + stream.OnStreamClosed(); + }, this); } private void OnStreamClosed() @@ -135,12 +141,6 @@ private bool TryClose() internal async ValueTask ProcessOutboundSendsAsync(long id) { - _streamClosedFeature.OnClosed(static state => - { - var stream = (Http3ControlStream)state!; - stream.OnStreamClosed(); - }, this); - await _frameWriter.WriteStreamIdAsync(id); await _frameWriter.WriteSettingsAsync(_serverPeerSettings.GetNonProtocolDefaults()); } @@ -311,18 +311,13 @@ private async Task HandleControlStream() } } - private async ValueTask HandleEncodingDecodingTask() + private Task HandleEncodingDecodingTask() { // Noop encoding and decoding task. Settings make it so we don't need to read content of encoder and decoder. // An endpoint MUST allow its peer to create an encoder stream and a // decoder stream even if the connection's settings prevent their use. - while (_isClosed == 0) - { - var result = await Input.ReadAsync(); - var readableBuffer = result.Buffer; - Input.AdvanceTo(readableBuffer.End); - } + return Input.CopyToAsync(Stream.Null); } private ValueTask ProcessHttp3ControlStream(Http3RawFrame incomingFrame, bool isContinuedFrame, in ReadOnlySequence payload, out SequencePosition consumed) @@ -372,11 +367,6 @@ private ValueTask ProcessSettingsFrameAsync(bool isContinuedFrame, ReadOnlySeque } _haveReceivedSettingsFrame = true; - _streamClosedFeature.OnClosed(static state => - { - var stream = (Http3ControlStream)state!; - stream.OnStreamClosed(); - }, this); } while (true) diff --git a/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs b/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs index 544b338ee38f..7a3ac2e05efe 100644 --- a/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs +++ b/src/Servers/Kestrel/shared/test/Http3/Http3InMemory.cs @@ -294,12 +294,22 @@ public void OnInboundControlStreamSetting(Http3SettingType type, long value) public bool OnInboundDecoderStream(Server.Kestrel.Core.Internal.Http3.Http3ControlStream stream) { - return _inner.OnInboundDecoderStream(stream); + var res = _inner.OnInboundDecoderStream(stream); + if (_http3TestBase._runningStreams.TryGetValue(stream.StreamId, out var testStream)) + { + testStream.OnDecoderStreamCreatedTcs.TrySetResult(); + } + return res; } public bool OnInboundEncoderStream(Server.Kestrel.Core.Internal.Http3.Http3ControlStream stream) { - return _inner.OnInboundEncoderStream(stream); + var res = _inner.OnInboundEncoderStream(stream); + if (_http3TestBase._runningStreams.TryGetValue(stream.StreamId, out var testStream)) + { + testStream.OnEncoderStreamCreatedTcs.TrySetResult(); + } + return res; } public void OnStreamCompleted(IHttp3Stream stream) @@ -473,6 +483,8 @@ internal class Http3StreamBase internal TaskCompletionSource OnStreamCreatedTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); internal TaskCompletionSource OnStreamCompletedTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); internal TaskCompletionSource OnHeaderReceivedTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + internal TaskCompletionSource OnDecoderStreamCreatedTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + internal TaskCompletionSource OnEncoderStreamCreatedTcs { get; } = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); internal TestStreamContext StreamContext { get; } internal DuplexPipe.DuplexPipePair Pair { get; } @@ -489,6 +501,8 @@ public long Error public Task OnStreamCreatedTask => OnStreamCreatedTcs.Task; public Task OnStreamCompletedTask => OnStreamCompletedTcs.Task; public Task OnHeaderReceivedTask => OnHeaderReceivedTcs.Task; + public Task OnDecoderStreamCreatedTask => OnDecoderStreamCreatedTcs.Task; + public Task OnEncoderStreamCreatedTask => OnEncoderStreamCreatedTcs.Task; public ConnectionAbortedException AbortReadException => StreamContext.AbortReadException; public ConnectionAbortedException AbortWriteException => StreamContext.AbortWriteException; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs index 054577365d7d..858e964b6ce1 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs @@ -617,6 +617,57 @@ await Http3Api.InitializeConnectionAsync(context => Assert.NotSame(trailersFirst, trailersLast); } + [Theory] + [InlineData(2)] // encoder + [InlineData(3)] // decoder + public async Task IgnoredControlStreams_CloseConnectionOnEndStream(int streamType) + { + await Http3Api.InitializeConnectionAsync(_noopApplication); + + var stream = await Http3Api.CreateControlStream(streamType); + + // PipeWriter will be completed when end of stream is received. Should exit read loop and close stream + // which will cause the connection to close with an error. + await stream.SendFrameAsync(Http3FrameType.Data, Memory.Empty, endStream: true); + + await stream.OnStreamCompletedTask.DefaultTimeout(); + + Http3Api.TriggerTick(); + Http3Api.TriggerTick(TimeSpan.FromSeconds(1)); + + await Http3Api.WaitForConnectionErrorAsync( + ignoreNonGoAwayFrames: true, + expectedLastStreamId: 0, + expectedErrorCode: Http3ErrorCode.ClosedCriticalStream, + matchExpectedErrorMessage: AssertExpectedErrorMessages, + expectedErrorMessage: CoreStrings.Http3ErrorControlStreamClosed); + } + + [Theory] + [InlineData(2)] // encoder + [InlineData(3)] // decoder + public async Task IgnoredControlStreams_CloseConnectionOnStreamClose(int streamType) + { + await Http3Api.InitializeConnectionAsync(_noopApplication); + + var stream = await Http3Api.CreateControlStream(streamType); + + await (streamType == 2 ? stream.OnEncoderStreamCreatedTask : stream.OnDecoderStreamCreatedTask).DefaultTimeout(); + + // Simulate quic layer closing the stream + stream.StreamContext.Close(); + + Http3Api.TriggerTick(); + Http3Api.TriggerTick(TimeSpan.FromSeconds(1)); + + await Http3Api.WaitForConnectionErrorAsync( + ignoreNonGoAwayFrames: true, + expectedLastStreamId: 0, + expectedErrorCode: Http3ErrorCode.ClosedCriticalStream, + matchExpectedErrorMessage: AssertExpectedErrorMessages, + expectedErrorMessage: CoreStrings.Http3ErrorControlStreamClosed); + } + private async Task MakeRequestAsync(int index, KeyValuePair[] headers, bool sendData, bool waitForServerDispose) { var requestStream = await Http3Api.CreateRequestStream(headers, endStream: !sendData); From 106044d7f4fd591d79f10fd5861cc024b265b119 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 13:27:32 -0700 Subject: [PATCH 33/53] [release/8.0] Update dependencies from dotnet/source-build-reference-packages (#63957) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20251007.1 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25474.1 -> To Version 8.0.0-alpha.1.25507.1 * Fix nginx --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- .azure/pipelines/ci-public.yml | 4 ++-- .azure/pipelines/ci.yml | 4 ++-- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- eng/scripts/install-nginx-mac.sh | 5 ----- eng/scripts/{install-nginx-linux.sh => install-nginx.sh} | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) delete mode 100755 eng/scripts/install-nginx-mac.sh rename eng/scripts/{install-nginx-linux.sh => install-nginx.sh} (75%) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index f7d33e8e4c09..34c5e44593cf 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -545,7 +545,7 @@ stages: isAzDOTestingJob: true buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs) beforeBuild: - - bash: "./eng/scripts/install-nginx-mac.sh" + - bash: "./eng/scripts/install-nginx.sh" displayName: Installing Nginx artifacts: - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt) @@ -566,7 +566,7 @@ stages: useHostedUbuntu: false buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs) beforeBuild: - - bash: "./eng/scripts/install-nginx-linux.sh" + - bash: "./eng/scripts/install-nginx.sh" displayName: Installing Nginx - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p" displayName: Increase inotify limit diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 5e4e2e533b16..d236fef0212a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -610,7 +610,7 @@ extends: isAzDOTestingJob: true buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs) beforeBuild: - - bash: "./eng/scripts/install-nginx-mac.sh" + - bash: "./eng/scripts/install-nginx.sh" displayName: Installing Nginx artifacts: - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt) @@ -631,7 +631,7 @@ extends: useHostedUbuntu: false buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs) beforeBuild: - - bash: "./eng/scripts/install-nginx-linux.sh" + - bash: "./eng/scripts/install-nginx.sh" displayName: Installing Nginx - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p" displayName: Increase inotify limit diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f3b9cf17f31..284cb879b985 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/source-build-reference-packages - fcf0226bfea241d4e4f127600b6c3ae10d772e9a + 7a3266db9e2b7422e8277f04932eff9b7064b66e diff --git a/eng/Versions.props b/eng/Versions.props index 59ebc4acc814..f43ced5accd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 8.0.0-alpha.1.25202.2 - 8.0.0-alpha.1.25474.1 + 8.0.0-alpha.1.25507.1 2.0.0-beta-23228-03 diff --git a/eng/scripts/install-nginx-mac.sh b/eng/scripts/install-nginx-mac.sh deleted file mode 100755 index e7df86f57c0a..000000000000 --- a/eng/scripts/install-nginx-mac.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -brew update -brew list openssl || brew install openssl -brew list nginx || brew install nginx diff --git a/eng/scripts/install-nginx-linux.sh b/eng/scripts/install-nginx.sh similarity index 75% rename from eng/scripts/install-nginx-linux.sh rename to eng/scripts/install-nginx.sh index f075a899d1cf..23d71043ed19 100755 --- a/eng/scripts/install-nginx-linux.sh +++ b/eng/scripts/install-nginx.sh @@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" reporoot="$(dirname "$(dirname "$scriptroot")")" nginxinstall="$reporoot/.tools/nginx" -curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/ +curl -sSL http://nginx.org/download/nginx-1.29.1.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.29.1/ ./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module make make install From ce5879e18706907eb3aedaf742213c1c1edee51a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 8 Oct 2025 22:08:36 +0000 Subject: [PATCH 34/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251008.2 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.21 -> To Version 8.0.21 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d52be5065228..5cfcd675d7af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ced2d17a049d..c69619ec0d20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 2c867628baaa08b026b15c5a9f64c14f92746feb + e7a8f5a51b2036c57081cdb68b7f9401813884fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From d771e30d889f54ce98125f657275c5298920118b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 10 Oct 2025 00:39:02 +0000 Subject: [PATCH 35/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251009.9 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.21 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5cfcd675d7af..166aac83ead2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c69619ec0d20..868fa08990b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7a8f5a51b2036c57081cdb68b7f9401813884fe + 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fef57f3209c6..2af3f1ffb17d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,14 +143,14 @@ 9.0.0-preview.9.24518.1 9.0.0-preview.9.24518.1 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 4.8.0-7.24574.2 4.8.0-7.24574.2 From 989f05aef4536c61dc8ede9b7ae8ba660a05ba95 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 10 Oct 2025 09:59:42 +0000 Subject: [PATCH 36/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251010.2 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.21 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 166aac83ead2..bb299356a94a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 868fa08990b4..bba8469229b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 591eed9bfb5a4d2e564bc83ea5a635f624d66e23 + 1c4e1b56387670ea2b592f15196f01fe59c45139 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From a85ca8f8fbea370153735ea258b00dd9038a034a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 11 Oct 2025 00:10:09 +0000 Subject: [PATCH 37/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251010.8 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.22-servicing.25507.14 -> To Version 8.0.22-servicing.25510.8 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb299356a94a..595a1d776ff4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bba8469229b8..561d03f329e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f8f07a0ad92f9efe58458892b4316bdd857d6b3f + 6ec19f7d7394f7151e952b5b8866a729dd2a0676 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 2af3f1ffb17d..81e9b163c0ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25507.14 + 8.0.22-servicing.25510.8 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25507.14 + 8.0.22-servicing.25510.8 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25507.14 + 8.0.22-servicing.25510.8 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25507.14 + 8.0.22-servicing.25510.8 - 8.0.22-servicing.25507.14 + 8.0.22-servicing.25510.8 8.0.0 8.0.1 From fd362a54259ac2f306d57eb13c1bdad04aa83e65 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Oct 2025 05:41:22 +0000 Subject: [PATCH 38/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251013.14 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.22-servicing.25507.14 -> To Version 8.0.22-servicing.25513.14 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 595a1d776ff4..0c3b18d75771 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 561d03f329e2..f67a937df100 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6ec19f7d7394f7151e952b5b8866a729dd2a0676 + bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 81e9b163c0ba..097e488075ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25510.8 + 8.0.22-servicing.25513.14 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25510.8 + 8.0.22-servicing.25513.14 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25510.8 + 8.0.22-servicing.25513.14 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25510.8 + 8.0.22-servicing.25513.14 - 8.0.22-servicing.25510.8 + 8.0.22-servicing.25513.14 8.0.0 8.0.1 From d3aab888487d73ab8541c461b6886c7ca9e53a73 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 14 Oct 2025 11:24:04 +0000 Subject: [PATCH 39/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251014.2 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0c3b18d75771..cd24254de4f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f67a937df100..c3a25f16ee03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c4e1b56387670ea2b592f15196f01fe59c45139 + 0045e36383ec54a62f0072bfb5964389a323b0ae https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 10cf8ccbbc8ab979fca5ef96e55431781bcb6712 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 14 Oct 2025 13:07:25 -0700 Subject: [PATCH 40/53] Update baseline, SDK --- eng/Baseline.Designer.props | 426 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++++++--------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 322 insertions(+), 322 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index d622c72bd232..b4be5b0617cc 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 @@ -120,138 +120,138 @@ - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - - - + + + - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - - + + @@ -259,7 +259,7 @@ - 8.0.20 + 8.0.21 @@ -268,51 +268,51 @@ - 8.0.20 + 8.0.21 - + - + - + - + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - - + + @@ -322,8 +322,8 @@ - - + + @@ -331,8 +331,8 @@ - - + + @@ -343,58 +343,58 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 @@ -403,7 +403,7 @@ - 8.0.20 + 8.0.21 @@ -411,71 +411,71 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 - - + + - 8.0.20 + 8.0.21 @@ -491,27 +491,27 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 @@ -520,23 +520,23 @@ - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 @@ -545,54 +545,54 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - - + + - - + + - - + + - 8.0.20 + 8.0.21 - - + + - - + + - - + + - - + + @@ -600,83 +600,83 @@ - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - - - - + + + + - 8.0.20 + 8.0.21 @@ -685,64 +685,64 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 @@ -764,7 +764,7 @@ - 8.0.20 + 8.0.21 @@ -786,7 +786,7 @@ - 8.0.20 + 8.0.21 @@ -802,23 +802,23 @@ - 8.0.20 + 8.0.21 - + - + - + @@ -826,24 +826,24 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - - - + + + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 @@ -853,7 +853,7 @@ - 8.0.20 + 8.0.21 @@ -862,73 +862,73 @@ - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - + - + - + - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 @@ -957,11 +957,11 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 @@ -979,18 +979,18 @@ - 8.0.20 + 8.0.21 - 8.0.20 + 8.0.21 - + - 8.0.20 + 8.0.21 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 86b656657f27..6e8226d92653 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 55247e80549e..0cfb03b4e3b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 22 - false + true 7.1.2 7.* - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49561e9300c5..f3915f0bd7d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf170a7fb8be5e094a798dd6c09f9b8e32dfd92a + d5074a2d0ef5250241f9d7493ae02f424777f3aa https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index c9a32ec8a6ff..9631df0f4396 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25513.14 + 8.0.22-servicing.25514.13 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25513.14 + 8.0.22-servicing.25514.13 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25513.14 + 8.0.22-servicing.25514.13 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25513.14 + 8.0.22-servicing.25514.13 - 8.0.22-servicing.25513.14 + 8.0.22-servicing.25514.13 8.0.0 8.0.1 From a2d383aa5890b6896ac467d60b1f17674eb63e88 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Oct 2025 06:57:19 +0000 Subject: [PATCH 42/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251014.12 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c3dd5b4642a..2cb6b3034975 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3915f0bd7d7..1ce89b086277 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0045e36383ec54a62f0072bfb5964389a323b0ae + 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 34b6f97b85bee32203e81529fa4b5c9e7d738bd5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Oct 2025 13:20:46 +0000 Subject: [PATCH 43/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251015.4 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cb6b3034975..6cdcd13028b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ce89b086277..24cbd8525ffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 33d27bdddf037b0d5eb89da1cef9bd2e4ddd3481 + 16929fc399344a0ded033dd0efd7bb113c0a1686 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 7fd3ca0b81a8291077dde9cdac747daa1f924833 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Oct 2025 22:10:37 +0000 Subject: [PATCH 44/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251015.8 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cdcd13028b4..e6a97c7245b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24cbd8525ffe..a69b7640c378 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 16929fc399344a0ded033dd0efd7bb113c0a1686 + ec62059fc7de30da976e0e9ca947c00795cf1dfe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 46a1d0f96df523173a9cf222a139deaf871f9dda Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Oct 2025 23:58:04 +0000 Subject: [PATCH 45/53] Mark productVersion.txt as shipping artifact in 8.0 (#64067) * Initial plan * Mark productVersion.txt as shipping artifact Co-authored-by: mmitche <8725170+mmitche@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mmitche <8725170+mmitche@users.noreply.github.com> --- eng/Publishing.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 8765a8714c20..a096f3055aff 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -85,13 +85,13 @@ - NonShipping=true + NonShipping=false true $(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(ProductVersionFileName) - NonShipping=true + NonShipping=false true $(_UploadPathRoot)/Runtime/$(_PackageVersion)/$(RepoProductVersionFileName) From d37e581588cf34003cf3037a6286786bd16ab1ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 Oct 2025 23:17:19 +0000 Subject: [PATCH 46/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251016.7 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.22-servicing.25514.13 -> To Version 8.0.22-servicing.25516.7 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6a97c7245b9..4870574860e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a69b7640c378..0d5939569cfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d5074a2d0ef5250241f9d7493ae02f424777f3aa + f7ba9931b3a9e0089af5784efd975bf7fff01a6d https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 30b994b25bae..1746bb40083c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25514.13 + 8.0.22-servicing.25516.7 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25514.13 + 8.0.22-servicing.25516.7 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25514.13 + 8.0.22-servicing.25516.7 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25514.13 + 8.0.22-servicing.25516.7 - 8.0.22-servicing.25514.13 + 8.0.22-servicing.25516.7 8.0.0 8.0.1 From 26283eb30654a539ab89913bfc32e072c906fba1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Oct 2025 04:57:56 +0000 Subject: [PATCH 47/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251016.18 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.22-servicing.25514.13 -> To Version 8.0.22-servicing.25516.18 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4870574860e5..bca1aeee7100 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d5939569cfb..b383d1c247e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f7ba9931b3a9e0089af5784efd975bf7fff01a6d + 60ede8fcf6a8c3015f3079d04e4997434a575709 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 1746bb40083c..6ea069230359 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25516.7 + 8.0.22-servicing.25516.18 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25516.7 + 8.0.22-servicing.25516.18 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25516.7 + 8.0.22-servicing.25516.18 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25516.7 + 8.0.22-servicing.25516.18 - 8.0.22-servicing.25516.7 + 8.0.22-servicing.25516.18 8.0.0 8.0.1 From 37304a55ac2dcf1810301c6b1ec7b97ad7ad3806 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Oct 2025 17:14:18 +0000 Subject: [PATCH 48/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251017.4 On relative base path root Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.22-servicing.25514.13 -> To Version 8.0.22-servicing.25517.4 Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index bca1aeee7100..2be15f8004ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b383d1c247e9..7886aad4c264 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 60ede8fcf6a8c3015f3079d04e4997434a575709 + f41eed7a945cb632ec834e5b1a36f4489232c978 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 6ea069230359..e0e2407b72aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25516.18 + 8.0.22-servicing.25517.4 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25516.18 + 8.0.22-servicing.25517.4 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25516.18 + 8.0.22-servicing.25517.4 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25516.18 + 8.0.22-servicing.25517.4 - 8.0.22-servicing.25516.18 + 8.0.22-servicing.25517.4 8.0.0 8.0.1 From 875d67d2acb26aff6cef8efee48518eae5357d66 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Oct 2025 19:35:19 +0000 Subject: [PATCH 49/53] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20251017.2 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.22 -> To Version 8.0.22 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2be15f8004ed..60ce00ae99a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7886aad4c264..d604bead2182 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec62059fc7de30da976e0e9ca947c00795cf1dfe + b450a5753fc17ba3c249628ca293c10cafaade16 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 487160985831f4b501a54f217219710ce96166e5 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 17 Oct 2025 13:31:37 -0700 Subject: [PATCH 50/53] Revert log level severity for unknown proxy in ForwardedHeadersMiddleware (#64090) --- .../HttpOverrides/src/ForwardedHeadersMiddleware.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs index be5e4da152bd..9e39e9c78918 100644 --- a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs +++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs @@ -249,9 +249,9 @@ public void ApplyForwarders(HttpContext context) if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address)) { // Stop at the first unknown remote IP, but still apply changes processed so far. - if (_logger.IsEnabled(LogLevel.Warning)) + if (_logger.IsEnabled(LogLevel.Debug)) { - _logger.LogWarning(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort); + _logger.LogDebug(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort); } break; } From 4ef9409446c6d0968b4119a3b9351319e11c88cf Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Tue, 28 Oct 2025 07:46:36 +0000 Subject: [PATCH 51/53] Merged PR 54671: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [83131e87-e80d-4d5b-f426-08dbd53b3319](https://maestro.dot.net/subscriptions?search=83131e87-e80d-4d5b-f426-08dbd53b3319) - **Build**: [20251027.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=2825786) ([288799](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-runtime/build/288799)) - **Date Produced**: October 28, 2025 7:03:51 AM UTC - **Commit**: [a2266c728f63a494ccb6786d794da2df135030be](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCa2266c728f63a494ccb6786d794da2df135030be) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.22-servicing.25517.4 to 8.0.22-servicing.25527.7][1] - Microsoft.Extensions.HostFactoryResolver.Sources - Microsoft.Internal.Runtime.AspNetCore.Transport - Microsoft.NETCore.BrowserDebugHost.Transport - Microsoft.NETCore.Platforms - Microsoft.SourceBuild.Intermediate.runtime.linux-x64 - From [8.0.22 to 8.0.22][1] - Microsoft.NET.Runtime.MonoAOTCompiler.Task - Microsoft.NET.Runtime.WebAssembly.Sdk - Microsoft.NETCore.App.Ref - Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm - Microsoft.NETCore.App.Runtime.win-x64 [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf41eed7a945cb632ec834e5b1a36f4489232c978&targetVersion=GCa2266c728f63a494ccb6786d794da2df135030be&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60ce00ae99a6..0e558a267e5a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d604bead2182..3dbb98bf33f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f41eed7a945cb632ec834e5b1a36f4489232c978 + a2266c728f63a494ccb6786d794da2df135030be https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index e0e2407b72aa..a8bbadd13ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.22 8.0.22 8.0.22 - 8.0.22-servicing.25517.4 + 8.0.22-servicing.25527.7 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25517.4 + 8.0.22-servicing.25527.7 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.22-servicing.25517.4 + 8.0.22-servicing.25527.7 8.0.1 8.0.1 8.0.2 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.22-servicing.25517.4 + 8.0.22-servicing.25527.7 - 8.0.22-servicing.25517.4 + 8.0.22-servicing.25527.7 8.0.0 8.0.1 From 8b3ade4a19d053372f689364a4007ea0c8a1e89a Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa Date: Tue, 28 Oct 2025 08:14:06 +0000 Subject: [PATCH 52/53] Merged PR 54673: Disable NuGet audit # {PR title} https://github.com/dotnet/aspnetcore/issues/64177 Summary of the changes (Less than 80 chars) ## Description {Detail} Fixes #{bug number} (in this specific format) ## Customer Impact {Justification} ## Regression? - [ ] Yes - [ ] No [If yes, specify the version the behavior has regressed from] ## Risk - [ ] High - [ ] Medium - [ ] Low [Justify the selection above] ## Verification - [ ] Manual (required) - [ ] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A ---- ## When servicing release/2.3 - [ ] Make necessary changes in eng/PatchConfig.props Disable NuGet audit --- Directory.Build.props | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index d080a9e0fb8e..a295d60cf0a5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -234,6 +234,11 @@ $(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets + + + false + + From ee417479933278bb5aadc5944706a96b5ef74a5d Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Tue, 28 Oct 2025 09:38:01 +0000 Subject: [PATCH 53/53] Merged PR 54675: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: [e179a2a7-bc5d-4498-2467-08dbd53ba9ce](https://maestro.dot.net/subscriptions?search=e179a2a7-bc5d-4498-2467-08dbd53ba9ce) - **Build**: [20251028.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2826139) ([288804](https://maestro.dot.net/channel/3880/azdo:dnceng:internal:dotnet-efcore/build/288804)) - **Date Produced**: October 28, 2025 9:22:21 AM UTC - **Commit**: [489d66cd0a20b7ed776a904051729e3b4d3cba13](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?_a=history&version=GC489d66cd0a20b7ed776a904051729e3b4d3cba13) - **Branch**: [refs/heads/internal/release/8.0](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?version=GBrefs/heads/internal/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.22 to 8.0.22][1] - dotnet-ef - Microsoft.EntityFrameworkCore - Microsoft.EntityFrameworkCore.Design - Microsoft.EntityFrameworkCore.InMemory - Microsoft.EntityFrameworkCore.Relational - Microsoft.EntityFrameworkCore.Sqlite - Microsoft.EntityFrameworkCore.SqlServer - Microsoft.EntityFrameworkCore.Tools [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GCb450a5753fc17ba3c249628ca293c10cafaade16&targetVersion=GC489d66cd0a20b7ed776a904051729e3b4d3cba13&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e558a267e5a..4fdd9795b401 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dbb98bf33f2..86067cfaf8e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b450a5753fc17ba3c249628ca293c10cafaade16 + 489d66cd0a20b7ed776a904051729e3b4d3cba13 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime