From 6e1c1a376f48d78aa1f9438403b23ac781fb632d Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:43:07 -0800 Subject: [PATCH 01/24] Update branding to 8.0.14 (#60197) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 836a56d5ca03..ff917ec739d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 8 0 - 13 + 14 - true + false 7.1.2 7.* + + + + @@ -30,9 +34,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef77de844478..7aaedbb40fde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -189,9 +189,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://github.com/dotnet/source-build-externals - c7cb4da26e74ef645e3e98fcb4534a7d66247a82 + dc30cd1ec22f198d658e011c14525d4d65873991 diff --git a/eng/Versions.props b/eng/Versions.props index ff917ec739d4..63c2234555bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ 8.0.0-beta.25060.1 8.0.0-beta.25060.1 - 8.0.0-alpha.1.25060.2 + 8.0.0-alpha.1.25104.1 8.0.0-alpha.1.25060.2 From 167a22d1dd909ddfecad3480b15c71f6e752dc6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:47:09 -0800 Subject: [PATCH 05/24] [release/8.0] Update dependencies from dotnet/source-build-reference-packages (#59922) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250117.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25067.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250128.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25078.5 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250131.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25081.5 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7aaedbb40fde..8d7a36719bf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/source-build-reference-packages - f9542c50beaefc38dd9d7ec9ea38d54fd154f21a + d73fc552386797322e84fa9b2ef5eaa5369de83c diff --git a/eng/Versions.props b/eng/Versions.props index 63c2234555bd..9b9c5d2216e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ 8.0.0-alpha.1.25104.1 - 8.0.0-alpha.1.25060.2 + 8.0.0-alpha.1.25081.5 2.0.0-beta-23228-03 From 3c9d56ee79c369890e2b6f2a30262eb92e349301 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:28:28 -0800 Subject: [PATCH 06/24] [release/8.0] Readd DiagnosticSource to KestrelServerImpl (#60203) * Readd DiagnosticSource to KestrelServerImpl * null --------- Co-authored-by: Brennan --- .../Kestrel/Core/src/Internal/KestrelServerImpl.cs | 6 ++++-- src/Servers/Kestrel/Core/src/KestrelServer.cs | 1 + src/Servers/Kestrel/Core/test/KestrelServerTests.cs | 1 + .../Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs | 9 ++++++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs index b8af73a906dd..5cb38d2832c9 100644 --- a/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs +++ b/src/Servers/Kestrel/Core/src/Internal/KestrelServerImpl.cs @@ -39,8 +39,9 @@ public KestrelServerImpl( IEnumerable multiplexedFactories, IHttpsConfigurationService httpsConfigurationService, ILoggerFactory loggerFactory, + DiagnosticSource? diagnosticSource, KestrelMetrics metrics) - : this(transportFactories, multiplexedFactories, httpsConfigurationService, CreateServiceContext(options, loggerFactory, diagnosticSource: null, metrics)) + : this(transportFactories, multiplexedFactories, httpsConfigurationService, CreateServiceContext(options, loggerFactory, diagnosticSource, metrics)) { } @@ -111,7 +112,8 @@ private static ServiceContext CreateServiceContext(IOptions ServiceContext.ServerOptions; - private ServiceContext ServiceContext { get; } + // Internal for testing + internal ServiceContext ServiceContext { get; } private KestrelTrace Trace => ServiceContext.Log; diff --git a/src/Servers/Kestrel/Core/src/KestrelServer.cs b/src/Servers/Kestrel/Core/src/KestrelServer.cs index 75cec0130767..7f2909c77cf6 100644 --- a/src/Servers/Kestrel/Core/src/KestrelServer.cs +++ b/src/Servers/Kestrel/Core/src/KestrelServer.cs @@ -36,6 +36,7 @@ public KestrelServer(IOptions options, IConnectionListener Array.Empty(), new SimpleHttpsConfigurationService(), loggerFactory, + diagnosticSource: null, new KestrelMetrics(new DummyMeterFactory())); } diff --git a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs index f3f4e3a60afd..6837ae0218de 100644 --- a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs +++ b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs @@ -308,6 +308,7 @@ private static KestrelServerImpl CreateKestrelServer( multiplexedFactories, httpsConfigurationService, loggerFactory ?? new LoggerFactory(new[] { new KestrelTestLoggerProvider() }), + diagnosticSource: null, metrics ?? new KestrelMetrics(new TestMeterFactory())); } diff --git a/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs b/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs index 759d074a6d82..b24da893ab53 100644 --- a/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs +++ b/src/Servers/Kestrel/Kestrel/test/WebHostBuilderKestrelExtensionsTests.cs @@ -2,10 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections; +using System.IO.Pipelines; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes.Internal; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets; using Microsoft.Extensions.DependencyInjection; @@ -107,6 +109,11 @@ public void ServerIsKestrelServerImpl() .UseKestrel() .Configure(app => { }); - Assert.IsType(hostBuilder.Build().Services.GetService()); + var server = Assert.IsType(hostBuilder.Build().Services.GetService()); + + Assert.NotNull(server.ServiceContext.DiagnosticSource); + Assert.IsType(server.ServiceContext.Metrics); + Assert.Equal(PipeScheduler.ThreadPool, server.ServiceContext.Scheduler); + Assert.Equal(TimeProvider.System, server.ServiceContext.TimeProvider); } } From 67f3b04274d3acb607fe95796dcb35f4f11149bf Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 6 Feb 2025 19:31:09 +0000 Subject: [PATCH 07/24] Merged PR 47275: Prevent RefreshSignInAsync if it is called with wrong user Since this is a patch, instead of throwing an exception in cases where we wouldn't before like we do in the PR to `main`, we instead log an error and fail to refresh the cookie if RefreshSignInAsync is called with a TUser that does not have the same user ID as the currently authenticated user. While this does not make it *as* obvious to developers that something has gone wrong, error logs are still pretty visible, and stale cookies are something web developers have to account for regardless. The big upside to not throwing in the patch is that we do not have to react to it in the email change confirmation flow to account for the possibility of RefreshSignInAsync throwing. ---- #### AI description (iteration 1) #### PR Classification Bug fix #### PR Summary This pull request disables the `RefreshSignInAsync` method if it is called with the wrong user, ensuring proper user authentication handling. - `src/Identity/Core/src/SignInManager.cs`: Added checks to disable `RefreshSignInAsync` if the user is not authenticated or if the authenticated user ID does not match the provided user ID. - `src/Identity/test/Identity.Test/SignInManagerTest.cs`: Added tests to verify that `RefreshSignInAsync` logs errors and does not proceed if the user is not authenticated or if authenticated with a different user. --- src/Identity/Core/src/SignInManager.cs | 15 +++- .../test/Identity.Test/SignInManagerTest.cs | 80 +++++++++++++++---- 2 files changed, 80 insertions(+), 15 deletions(-) diff --git a/src/Identity/Core/src/SignInManager.cs b/src/Identity/Core/src/SignInManager.cs index b5659b329854..66f06c4d3465 100644 --- a/src/Identity/Core/src/SignInManager.cs +++ b/src/Identity/Core/src/SignInManager.cs @@ -162,8 +162,21 @@ public virtual async Task CanSignInAsync(TUser user) public virtual async Task RefreshSignInAsync(TUser user) { var auth = await Context.AuthenticateAsync(AuthenticationScheme); - IList claims = Array.Empty(); + if (!auth.Succeeded || auth.Principal?.Identity?.IsAuthenticated != true) + { + Logger.LogError("RefreshSignInAsync prevented because the user is not currently authenticated. Use SignInAsync instead for initial sign in."); + return; + } + var authenticatedUserId = UserManager.GetUserId(auth.Principal); + var newUserId = await UserManager.GetUserIdAsync(user); + if (authenticatedUserId == null || authenticatedUserId != newUserId) + { + Logger.LogError("RefreshSignInAsync prevented because currently authenticated user has a different UserId. Use SignInAsync instead to change users."); + return; + } + + IList claims = Array.Empty(); var authenticationMethod = auth?.Principal?.FindFirst(ClaimTypes.AuthenticationMethod); var amr = auth?.Principal?.FindFirst("amr"); diff --git a/src/Identity/test/Identity.Test/SignInManagerTest.cs b/src/Identity/test/Identity.Test/SignInManagerTest.cs index d1072676138a..73fe6d6be218 100644 --- a/src/Identity/test/Identity.Test/SignInManagerTest.cs +++ b/src/Identity/test/Identity.Test/SignInManagerTest.cs @@ -592,38 +592,38 @@ public async Task CanExternalSignIn(bool isPersistent, bool supportsLockout) [InlineData(true, false)] [InlineData(false, true)] [InlineData(false, false)] - public async Task CanResignIn( - // Suppress warning that says theory methods should use all of their parameters. - // See comments below about why this isn't used. -#pragma warning disable xUnit1026 - bool isPersistent, -#pragma warning restore xUnit1026 - bool externalLogin) + public async Task CanResignIn(bool isPersistent, bool externalLogin) { // Setup var user = new PocoUser { UserName = "Foo" }; var context = new DefaultHttpContext(); var auth = MockAuth(context); var loginProvider = "loginprovider"; - var id = new ClaimsIdentity(); + var id = new ClaimsIdentity("authscheme"); if (externalLogin) { id.AddClaim(new Claim(ClaimTypes.AuthenticationMethod, loginProvider)); } - // REVIEW: auth changes we lost the ability to mock is persistent - //var properties = new AuthenticationProperties { IsPersistent = isPersistent }; - var authResult = AuthenticateResult.NoResult(); + + var claimsPrincipal = new ClaimsPrincipal(id); + var properties = new AuthenticationProperties { IsPersistent = isPersistent }; + var authResult = AuthenticateResult.Success(new AuthenticationTicket(claimsPrincipal, properties, "authscheme")); auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.ApplicationScheme)) .Returns(Task.FromResult(authResult)).Verifiable(); var manager = SetupUserManager(user); + manager.Setup(m => m.GetUserId(claimsPrincipal)).Returns(user.Id.ToString()); var signInManager = new Mock>(manager.Object, new HttpContextAccessor { HttpContext = context }, new Mock>().Object, null, null, new Mock().Object, null) { CallBase = true }; - //signInManager.Setup(s => s.SignInAsync(user, It.Is(p => p.IsPersistent == isPersistent), - //externalLogin? loginProvider : null)).Returns(Task.FromResult(0)).Verifiable(); - signInManager.Setup(s => s.SignInWithClaimsAsync(user, It.IsAny(), It.IsAny>())).Returns(Task.FromResult(0)).Verifiable(); + + signInManager.Setup(s => s.SignInWithClaimsAsync(user, + It.Is(properties => properties.IsPersistent == isPersistent), + It.Is>(claims => !externalLogin || + claims.Any(claim => claim.Type == ClaimTypes.AuthenticationMethod && claim.Value == loginProvider)))) + .Returns(Task.FromResult(0)).Verifiable(); + signInManager.Object.Context = context; // Act @@ -634,6 +634,58 @@ public async Task CanResignIn( signInManager.Verify(); } + [Fact] + public async Task ResignInNoOpsAndLogsErrorIfNotAuthenticated() + { + var user = new PocoUser { UserName = "Foo" }; + var context = new DefaultHttpContext(); + var auth = MockAuth(context); + var manager = SetupUserManager(user); + var logger = new TestLogger>(); + var signInManager = new Mock>(manager.Object, + new HttpContextAccessor { HttpContext = context }, + new Mock>().Object, + null, logger, new Mock().Object, null) + { CallBase = true }; + auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.ApplicationScheme)) + .Returns(Task.FromResult(AuthenticateResult.NoResult())).Verifiable(); + + await signInManager.Object.RefreshSignInAsync(user); + + Assert.Contains("RefreshSignInAsync prevented because the user is not currently authenticated. Use SignInAsync instead for initial sign in.", logger.LogMessages); + auth.Verify(); + signInManager.Verify(s => s.SignInWithClaimsAsync(It.IsAny(), It.IsAny(), It.IsAny>()), + Times.Never()); + } + + [Fact] + public async Task ResignInNoOpsAndLogsErrorIfAuthenticatedWithDifferentUser() + { + var user = new PocoUser { UserName = "Foo" }; + var context = new DefaultHttpContext(); + var auth = MockAuth(context); + var manager = SetupUserManager(user); + var logger = new TestLogger>(); + var signInManager = new Mock>(manager.Object, + new HttpContextAccessor { HttpContext = context }, + new Mock>().Object, + null, logger, new Mock().Object, null) + { CallBase = true }; + var id = new ClaimsIdentity("authscheme"); + var claimsPrincipal = new ClaimsPrincipal(id); + var authResult = AuthenticateResult.Success(new AuthenticationTicket(claimsPrincipal, new AuthenticationProperties(), "authscheme")); + auth.Setup(a => a.AuthenticateAsync(context, IdentityConstants.ApplicationScheme)) + .Returns(Task.FromResult(authResult)).Verifiable(); + manager.Setup(m => m.GetUserId(claimsPrincipal)).Returns("different"); + + await signInManager.Object.RefreshSignInAsync(user); + + Assert.Contains("RefreshSignInAsync prevented because currently authenticated user has a different UserId. Use SignInAsync instead to change users.", logger.LogMessages); + auth.Verify(); + signInManager.Verify(s => s.SignInWithClaimsAsync(It.IsAny(), It.IsAny(), It.IsAny>()), + Times.Never()); + } + [Theory] [InlineData(true, true, true, true)] [InlineData(true, true, false, true)] From 9c156a3ba9cbbad567cca1dd10eb52971b42e298 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 13:15:26 -0800 Subject: [PATCH 08/24] Update to MacOS 15 in Helix (#60239) Co-authored-by: William Godbe --- eng/targets/Helix.Common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index ea3801bb8226..8a0fdf3481d3 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -29,7 +29,7 @@ - + From 0992bbcae69738b822b4dea29866919bd2c3f861 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 6 Feb 2025 14:07:31 -0800 Subject: [PATCH 09/24] [release/8.0] Use the latest available JDK (#60233) * Use the latest available JDK * Add newline at end of global.json file * Fix spacing * Update DelegateTests.cs --------- Co-authored-by: Viktor Hofer Co-authored-by: Korolev Dmitry --- eng/scripts/InstallJdk.ps1 | 3 +-- global.json | 2 +- src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs | 1 + src/SignalR/clients/java/signalr/build.gradle | 2 +- .../java/signalr/test/signalr.client.java.Tests.javaproj | 2 ++ .../main/java/com/microsoft/signalr/GsonHubProtocolTest.java | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1 index 0872f241a982..1ba711b5eaa4 100644 --- a/eng/scripts/InstallJdk.ps1 +++ b/eng/scripts/InstallJdk.ps1 @@ -22,8 +22,7 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\" $javacExe = "$installDir\bin\javac.exe" $tempDir = "$repoRoot\obj" if (-not $JdkVersion) { - $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json - $JdkVersion = $globalJson.'native-tools'.jdk + $JdkVersion = "11.0.24" } if (Test-Path $javacExe) { diff --git a/global.json b/global.json index 69227aa61ad7..f380caeeadc0 100644 --- a/global.json +++ b/global.json @@ -29,6 +29,6 @@ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1" }, "native-tools": { - "jdk": "11.0.24" + "jdk": "latest" } } diff --git a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs index 9b26dbe5ad7d..f5f54fa1dc8b 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs @@ -217,6 +217,7 @@ public async Task UpdateDelegationRuleTest() [ConditionalFact] [DelegateSupportedCondition(true)] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60141")] public async Task DelegateAfterReceiverRestart() { var queueName = Guid.NewGuid().ToString(); diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 895f8c4338d3..3e192445c97e 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -22,7 +22,7 @@ allprojects { version project.findProperty('packageVersion') ?: "99.99.99-dev" java { - sourceCompatibility = 1.8 + sourceCompatibility = 1.9 } repositories { diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index 823c53ae8a72..e4e95d1cb3f3 100644 --- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -6,6 +6,8 @@ true true + + OSX.13.Amd64.Open;$(SkipHelixQueues) $(OutputPath) true diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java index 53454be031b6..d696a74850eb 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java @@ -444,7 +444,7 @@ public void invocationBindingFailureWhenParsingLocalDateTimeWithoutAppropriateTy assertEquals(HubMessageType.INVOCATION_BINDING_FAILURE, message.getMessageType()); InvocationBindingFailureMessage failureMessage = (InvocationBindingFailureMessage) messages.get(0); - assertEquals("java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 41 path $.arguments[0]", failureMessage.getException().getMessage()); + assertEquals("com.google.gson.JsonSyntaxException", failureMessage.getException().getClass().getName()); } @Test From 5345c7857c1677df1a24c59a410c4f28b2a2b03e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 14:39:46 -0800 Subject: [PATCH 10/24] Fix skip condition for java tests (#60243) Co-authored-by: William Godbe --- .../java/signalr/test/signalr.client.java.Tests.javaproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index e4e95d1cb3f3..8068629f03b3 100644 --- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -7,7 +7,7 @@ true true - OSX.13.Amd64.Open;$(SkipHelixQueues) + OSX.15.Amd64.Open;$(SkipHelixQueues) $(OutputPath) true From 19e814ce3068aec7222d8c7603faff8e9dfc2e45 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 6 Feb 2025 15:30:17 -0800 Subject: [PATCH 11/24] Update list of helix queues to skip (#60231) --- eng/targets/Helix.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index f9d0cf5ef518..70e01877befa 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -17,7 +17,7 @@ $(HelixQueueAlmaLinux8); - $(HelixQueueAlpine316); + $(HelixQueueAlpine318); $(HelixQueueDebian12); $(HelixQueueFedora40); $(HelixQueueMariner); From fdeed3e47ada6ca3d4db0e90dafb88fdd860ecee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:48:13 -0800 Subject: [PATCH 12/24] [release/8.0] [Blazor] Allow cascading value subscribers to get added and removed during change notification (#57288) * Allow cascading value subscribers to change during notification * PR feedback * Use `[InlineArray]` * Suppress warning + add tests --------- Co-authored-by: Mackinnon Buck --- .../Components/src/CascadingValueSource.cs | 23 +++- .../Components/test/CascadingParameterTest.cs | 126 ++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletion(-) diff --git a/src/Components/Components/src/CascadingValueSource.cs b/src/Components/Components/src/CascadingValueSource.cs index dbf9a4662265..3645b17bed39 100644 --- a/src/Components/Components/src/CascadingValueSource.cs +++ b/src/Components/Components/src/CascadingValueSource.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Concurrent; +using System.Runtime.CompilerServices; using Microsoft.AspNetCore.Components.Rendering; namespace Microsoft.AspNetCore.Components; @@ -96,7 +97,16 @@ public Task NotifyChangedAsync() { tasks.Add(dispatcher.InvokeAsync(() => { - foreach (var subscriber in subscribers) + var subscribersBuffer = new ComponentStateBuffer(); + var subscribersCount = subscribers.Count; + var subscribersCopy = subscribersCount <= ComponentStateBuffer.Capacity + ? subscribersBuffer[..subscribersCount] + : new ComponentState[subscribersCount]; + subscribers.CopyTo(subscribersCopy); + + // We iterate over a copy of the list because new subscribers might get + // added or removed during change notification + foreach (var subscriber in subscribersCopy) { subscriber.NotifyCascadingValueChanged(ParameterViewLifetime.Unbound); } @@ -174,4 +184,15 @@ void ICascadingValueSupplier.Unsubscribe(ComponentState subscriber, in Cascading } } } + + [InlineArray(Capacity)] + internal struct ComponentStateBuffer + { + public const int Capacity = 64; +#pragma warning disable IDE0051 // Remove unused private members +#pragma warning disable IDE0044 // Add readonly modifier + private ComponentState _values; +#pragma warning restore IDE0044 // Add readonly modifier +#pragma warning restore IDE0051 // Remove unused private members + } } diff --git a/src/Components/Components/test/CascadingParameterTest.cs b/src/Components/Components/test/CascadingParameterTest.cs index a99baeb96833..411ed14a5e07 100644 --- a/src/Components/Components/test/CascadingParameterTest.cs +++ b/src/Components/Components/test/CascadingParameterTest.cs @@ -634,6 +634,61 @@ public async Task CanTriggerUpdatesOnCascadingValuesFromServiceProvider() await cascadingValueSource.NotifyChangedAsync(new MyParamType("Nobody is listening, but this shouldn't be an error")); } + [Fact] + public async Task CanAddSubscriberDuringChangeNotification() + { + // Arrange + var services = new ServiceCollection(); + var paramValue = new MyParamType("Initial value"); + var cascadingValueSource = new CascadingValueSource(paramValue, isFixed: false); + services.AddCascadingValue(_ => cascadingValueSource); + var renderer = new TestRenderer(services.BuildServiceProvider()); + var component = new ConditionallyRenderSubscriberComponent() + { + RenderWhenEqualTo = "Final value", + }; + + // Act/Assert: Initial render + var componentId = await renderer.Dispatcher.InvokeAsync(() => renderer.AssignRootComponentId(component)); + renderer.RenderRootComponent(componentId); + var firstBatch = renderer.Batches.Single(); + var diff = firstBatch.DiffsByComponentId[componentId].Single(); + Assert.Collection(diff.Edits, + edit => + { + Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type); + AssertFrame.Text( + firstBatch.ReferenceFrames[edit.ReferenceFrameIndex], + "CascadingParameter=Initial value"); + }); + Assert.Equal(1, component.NumRenders); + + // Act: Second render + paramValue.ChangeValue("Final value"); + await cascadingValueSource.NotifyChangedAsync(); + var secondBatch = renderer.Batches[1]; + var diff2 = secondBatch.DiffsByComponentId[componentId].Single(); + + // Assert: Subscriber can get added during change notification and receive the cascading value + AssertFrame.Text( + secondBatch.ReferenceFrames[diff2.Edits[0].ReferenceFrameIndex], + "CascadingParameter=Final value"); + Assert.Equal(2, component.NumRenders); + + // Assert: Subscriber can get added during change notification and receive the cascading value + var nestedComponent = FindComponent(secondBatch, out var nestedComponentId); + var nestedComponentDiff = secondBatch.DiffsByComponentId[nestedComponentId].Single(); + Assert.Collection(nestedComponentDiff.Edits, + edit => + { + Assert.Equal(RenderTreeEditType.PrependFrame, edit.Type); + AssertFrame.Text( + secondBatch.ReferenceFrames[edit.ReferenceFrameIndex], + "CascadingParameter=Final value"); + }); + Assert.Equal(1, nestedComponent.NumRenders); + } + [Fact] public async Task AfterSupplyingValueThroughNotifyChanged_InitialValueFactoryIsNotUsed() { @@ -772,6 +827,40 @@ public void CanUseTryAddPatternForCascadingValuesInServiceCollection_CascadingVa Assert.Equal(2, services.Count()); } + [Theory] + [InlineData(0)] + [InlineData(1)] + [InlineData(CascadingValueSource.ComponentStateBuffer.Capacity - 1)] + [InlineData(CascadingValueSource.ComponentStateBuffer.Capacity)] + [InlineData(CascadingValueSource.ComponentStateBuffer.Capacity + 1)] + [InlineData(CascadingValueSource.ComponentStateBuffer.Capacity * 2)] + public async Task CanHaveManySubscribers(int numSubscribers) + { + // Arrange + var services = new ServiceCollection(); + var paramValue = new MyParamType("Initial value"); + var cascadingValueSource = new CascadingValueSource(paramValue, isFixed: false); + services.AddCascadingValue(_ => cascadingValueSource); + var renderer = new TestRenderer(services.BuildServiceProvider()); + var components = Enumerable.Range(0, numSubscribers).Select(_ => new SimpleSubscriberComponent()).ToArray(); + + // Act/Assert: Initial render + foreach (var component in components) + { + await renderer.Dispatcher.InvokeAsync(() => renderer.AssignRootComponentId(component)); + component.TriggerRender(); + Assert.Equal(1, component.NumRenders); + } + + // Act/Assert: All components re-render when the cascading value changes + paramValue.ChangeValue("Final value"); + await cascadingValueSource.NotifyChangedAsync(); + foreach (var component in components) + { + Assert.Equal(2, component.NumRenders); + } + } + private class SingleDeliveryValue(string text) { public string Text => text; @@ -861,6 +950,43 @@ public void AttemptIllegalAccessToLastParameterView() } } + class ConditionallyRenderSubscriberComponent : AutoRenderComponent + { + public int NumRenders { get; private set; } + + public SimpleSubscriberComponent NestedSubscriber { get; private set; } + + [Parameter] public string RenderWhenEqualTo { get; set; } + + [CascadingParameter] MyParamType CascadingParameter { get; set; } + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + NumRenders++; + builder.AddContent(0, $"CascadingParameter={CascadingParameter}"); + + if (string.Equals(RenderWhenEqualTo, CascadingParameter.ToString(), StringComparison.OrdinalIgnoreCase)) + { + builder.OpenComponent(1); + builder.AddComponentReferenceCapture(2, component => NestedSubscriber = component as SimpleSubscriberComponent); + builder.CloseComponent(); + } + } + } + + class SimpleSubscriberComponent : AutoRenderComponent + { + public int NumRenders { get; private set; } + + [CascadingParameter] MyParamType CascadingParameter { get; set; } + + protected override void BuildRenderTree(RenderTreeBuilder builder) + { + NumRenders++; + builder.AddContent(0, $"CascadingParameter={CascadingParameter}"); + } + } + class SingleDeliveryParameterConsumerComponent : AutoRenderComponent { public int NumSetParametersCalls { get; private set; } From 6a6000af977e75fc93bc28a07bb38295669c1cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Mon, 10 Feb 2025 09:50:36 -0800 Subject: [PATCH 13/24] [release/8.0] Update remnants of azureedge.net (#60264) * [release/8.0] Update remnants of azureedge.net * Update storage domains --- .azure/pipelines/ci.yml | 4 ++-- eng/common/templates-official/steps/source-build.yml | 2 +- eng/common/templates/steps/source-build.yml | 2 +- eng/helix/helix.proj | 6 +++--- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +- src/Installers/Windows/WindowsHostingBundle/Product.targets | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 61d5c7a3657a..4325b15a780e 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -102,14 +102,14 @@ variables: - name: WindowsArm64InstallersLogArgs value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog - name: _InternalRuntimeDownloadArgs - value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal + value: -RuntimeSourceFeed https://ci.dot.net/internal -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)' # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically. - name: _InternalRuntimeDownloadCodeSignArgs value: $(_InternalRuntimeDownloadArgs) - /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNet-HelixApi-Access - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index 829f17c34d11..503164fa7f22 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -44,7 +44,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 41bbb915736a..9f4c600ac094 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -44,7 +44,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 99254551279f..9535e87a6042 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -57,13 +57,13 @@ runtime - - $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) - $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index b00505fabb53..0d3bfac60493 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -560,7 +560,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 3e805f35bb3a..c1dc097445d4 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -83,7 +83,7 @@ --> - + From d59894f08b789d29afaa25d7f4eb51757ad07329 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 10 Feb 2025 16:54:55 -0800 Subject: [PATCH 14/24] [release/8.0] Centralize on one docker container (#60299) * down to 8 * Fix name * Update Microsoft.AspNetCore.App.Runtime.csproj --- .azure/pipelines/ci-public.yml | 8 ++++---- .azure/pipelines/ci.yml | 14 +++++--------- .../src/Microsoft.AspNetCore.App.Runtime.csproj | 6 +++--- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index cb521dc97a9a..f7d33e8e4c09 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -414,7 +414,7 @@ stages: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 buildArgs: --arch x64 --os-name linux-musl @@ -449,7 +449,7 @@ stages: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 buildArgs: --arch arm --os-name linux-musl @@ -483,7 +483,7 @@ stages: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine + container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 buildArgs: --arch arm64 --os-name linux-musl @@ -612,7 +612,7 @@ stages: parameters: platform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64' buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true jobProperties: diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 4325b15a780e..5e4e2e533b16 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -143,12 +143,8 @@ extends: tsa: enabled: true containers: - alpine319WithNode: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode - mariner20CrossArmAlpine: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine - mariner20CrossArm64Alpine: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine + azureLinux30Net8BuildAmd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64 stages: - stage: build displayName: Build @@ -483,7 +479,7 @@ extends: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: alpine319WithNode + container: azureLinux30Net8BuildAmd64 buildArgs: --arch x64 --os-name linux-musl @@ -518,7 +514,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArmAlpine + container: azureLinux30Net8BuildAmd64 buildArgs: --arch arm --os-name linux-musl @@ -552,7 +548,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArm64Alpine + container: azureLinux30Net8BuildAmd64 buildArgs: --arch arm64 --os-name linux-musl diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index 0d3bfac60493..1f8527329959 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -98,12 +98,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_')) $(TargetOsName) - linux + linux $(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-')))) x64 $(BuildArchitecture) From cb1b8b96159035141b7d523895e0bda1746a9f7d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 11 Feb 2025 13:51:28 -0800 Subject: [PATCH 15/24] Update baseline, SDK, nuget.config --- NuGet.config | 2 - eng/Baseline.Designer.props | 474 ++++++++++++++++++------------------ eng/Baseline.xml | 212 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 +- 5 files changed, 346 insertions(+), 348 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc0223c67220..a58bd9272df2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,8 @@ - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 9db2ec00437b..af5cc98a0d47 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -120,138 +120,138 @@ - 8.0.12 + 8.0.13 - - + + - - + + - - + + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - - - + + + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + @@ -259,83 +259,83 @@ - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - + - + - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - - + + - + - - + + - + - - + + - + @@ -343,58 +343,58 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 @@ -403,7 +403,7 @@ - 8.0.12 + 8.0.13 @@ -411,71 +411,71 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - - + + - - + + - - + + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 - - + + - 8.0.12 + 8.0.13 @@ -491,27 +491,27 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 @@ -520,79 +520,79 @@ - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - + + - - + + - - + + - 8.0.12 + 8.0.13 - - + + - - + + - - + + - - + + @@ -600,83 +600,83 @@ - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - - - - + + + + - 8.0.12 + 8.0.13 @@ -685,64 +685,64 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -764,29 +764,29 @@ - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 @@ -802,48 +802,48 @@ - 8.0.12 + 8.0.13 - + - + - + - + - + - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - - - + + + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -853,7 +853,7 @@ - 8.0.12 + 8.0.13 @@ -862,79 +862,79 @@ - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - 8.0.12 + 8.0.13 - + - + - + - + - + - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + @@ -943,7 +943,7 @@ - + @@ -951,17 +951,17 @@ - + - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 @@ -979,18 +979,18 @@ - 8.0.12 + 8.0.13 - 8.0.12 + 8.0.13 - + - 8.0.12 + 8.0.13 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 7de065eab47a..9efbb290ef60 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 d85a8c86a629..f5d9b4c5daed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 14 - false + true 7.1.2 7.* - - From 125dbaeca7976b0058e9709becb62b1aa940c2ab Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 14:53:10 -0800 Subject: [PATCH 17/24] Update to mac 15 --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index fbe60b3e7964..124223ed17bf 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -106,7 +106,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-13 + vmImage: macOS-15 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: vmImage: ubuntu-20.04 @@ -320,7 +320,7 @@ jobs: pool: ${{ if eq(parameters.agentOs, 'macOS') }}: name: Azure Pipelines - image: macOS-13 + image: macOS-15 os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) From b7c2eef2e2caf5f021b814a3500c0a96cab7f0d3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 15:07:57 -0800 Subject: [PATCH 18/24] Update macOS build to use XCode 16.1.0 --- .azure/pipelines/jobs/default-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 124223ed17bf..e82181c651aa 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -164,8 +164,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer - displayName: Use XCode 15.2.0 + - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer + displayName: Use XCode 16.1.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -382,8 +382,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer - displayName: Use XCode 15.2.0 + - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer + displayName: Use XCode 16.1.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: From c6dbf8cb6a07923e2858b0220497721bd1a52a2d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 16:43:49 -0800 Subject: [PATCH 19/24] Update macOS image and XCode version --- .azure/pipelines/jobs/default-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index e82181c651aa..fbe60b3e7964 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -106,7 +106,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-15 + vmImage: macOS-13 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: vmImage: ubuntu-20.04 @@ -164,8 +164,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer - displayName: Use XCode 16.1.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: @@ -320,7 +320,7 @@ jobs: pool: ${{ if eq(parameters.agentOs, 'macOS') }}: name: Azure Pipelines - image: macOS-15 + image: macOS-13 os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) @@ -382,8 +382,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_16.1.0.app/Contents/Developer - displayName: Use XCode 16.1.0 + - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer + displayName: Use XCode 15.2.0 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}: From 75d548fd5076393b1a351c8f2415da183d68ea4d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 17:45:13 -0800 Subject: [PATCH 20/24] Revert "[release/8.0] Update remnants of azureedge.net" (#60324) * Revert "[release/8.0] Update remnants of azureedge.net (#60264)" This reverts commit 6a6000af977e75fc93bc28a07bb38295669c1cc5. * Update eng/common/templates/steps/source-build.yml --- .azure/pipelines/ci.yml | 4 ++-- eng/common/templates-official/steps/source-build.yml | 2 +- eng/helix/helix.proj | 6 +++--- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +- src/Installers/Windows/WindowsHostingBundle/Product.targets | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 5e4e2e533b16..107fcdef9ff3 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -102,14 +102,14 @@ variables: - name: WindowsArm64InstallersLogArgs value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog - name: _InternalRuntimeDownloadArgs - value: -RuntimeSourceFeed https://ci.dot.net/internal + value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)' # The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This # is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically. - name: _InternalRuntimeDownloadCodeSignArgs value: $(_InternalRuntimeDownloadArgs) - /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal + /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNet-HelixApi-Access - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index 503164fa7f22..829f17c34d11 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -44,7 +44,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 9535e87a6042..99254551279f 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -57,13 +57,13 @@ runtime - - $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) - $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj index 1f8527329959..fadf9de6547c 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -560,7 +560,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index c1dc097445d4..3e805f35bb3a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -83,7 +83,7 @@ --> - + From dad4732c325c1704b2ca9a5aa2e58cea052f8b55 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Feb 2025 05:01:39 +0000 Subject: [PATCH 21/24] Merged PR 47540: [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 - **Build**: 20250211.10 - **Date Produced**: February 12, 2025 3:38:00 AM UTC - **Commit**: d8ee7c837b53a52795d374c694ff2c72b62bcef0 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.3 to 8.0.3][1] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.13 to 8.0.14][1] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.13 to 8.0.14][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.13 to 8.0.14][1] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.13 to 8.0.14][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.13 to 8.0.14][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1] - **Microsoft.NETCore.Platforms**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.13-servicing.25066.9 to 8.0.14-servicing.25111.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&targetVersion=GCd8ee7c837b53a52795d374c694ff2c72b62bcef0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) --- NuGet.config | 20 ++++++++++++++++++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++++---------- 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc0223c67220..babcad2d96f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,17 @@ + + + + + + + + - + @@ -30,10 +38,18 @@ + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c65d291b0c2b..15c2da58c23f 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 - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -139,7 +139,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 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 - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 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 - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 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 - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eba546b0f0d448e0176a2222548fd7a2fbf464c0 + d8ee7c837b53a52795d374c694ff2c72b62bcef0 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index ed650e8af00c..9c0cd1f3da0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13-servicing.25066.9 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14-servicing.25111.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.13-servicing.25066.9 + 8.0.14-servicing.25111.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.13-servicing.25066.9 + 8.0.14-servicing.25111.10 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.13-servicing.25066.9 + 8.0.14-servicing.25111.10 - 8.0.13-servicing.25066.9 + 8.0.14-servicing.25111.10 8.0.0 8.0.1 From 07e11526a3337135c194ff4c372ff5e1d6cdde9f Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Feb 2025 17:13:18 +0000 Subject: [PATCH 22/24] Merged PR 47578: [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 - **Build**: 20250211.8 - **Date Produced**: February 12, 2025 6:00:43 AM UTC - **Commit**: 8e4c8005250a2a911b146c13c1e1cc9814397387 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore.Design**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 8.0.13 to 8.0.14][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 8.0.13 to 8.0.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC1bdfaaeddf567214d363aa2396fd4874abf204cc&targetVersion=GC8e4c8005250a2a911b146c13c1e1cc9814397387&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) --- NuGet.config | 20 ++------------------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index babcad2d96f5..cd6169be4738 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,15 +6,7 @@ - - - - - - - - - + @@ -38,15 +30,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15c2da58c23f..add7da8a4c9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1bdfaaeddf567214d363aa2396fd4874abf204cc + 8e4c8005250a2a911b146c13c1e1cc9814397387 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9c0cd1f3da0f..914c8fadd3b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,14 +143,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 - 8.0.13 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 + 8.0.14 4.8.0-7.24574.2 4.8.0-7.24574.2 From 5482367b34362a012e5147e4a980d26fd053c25e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 12 Feb 2025 23:21:49 +0000 Subject: [PATCH 23/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250211.18 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging.Abstractions , Microsoft.Internal.Runtime.AspNetCore.Transport , 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 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.14-servicing.25111.10 -> To Version 8.0.14-servicing.25111.18 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd6169be4738..096f49cfb1ad 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 3a497dee03ac..7c4f0ad4ea57 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 - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -139,7 +139,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 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 - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d8ee7c837b53a52795d374c694ff2c72b62bcef0 + 1584e493603cfc4e9b36b77d6d4afe97de6363f9 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index d5b31f88a4a2..a4361bbfd167 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.14 8.0.14 8.0.14 - 8.0.14-servicing.25111.10 + 8.0.14-servicing.25111.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.14-servicing.25111.10 + 8.0.14-servicing.25111.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.14-servicing.25111.10 + 8.0.14-servicing.25111.18 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.14-servicing.25111.10 + 8.0.14-servicing.25111.18 - 8.0.14-servicing.25111.10 + 8.0.14-servicing.25111.18 8.0.0 8.0.1 From 0f48ca58d81da96090bf532481c7ce9eaa6f1c57 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Feb 2025 02:31:55 +0000 Subject: [PATCH 24/24] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250212.6 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.14 -> To Version 8.0.14 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 096f49cfb1ad..d263ff7579a8 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 7c4f0ad4ea57..216f52bfdd7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8e4c8005250a2a911b146c13c1e1cc9814397387 + d00955545e8afc997726aead9b0e6103b1ceade6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime