From eda0f9c02b16245a584be6c224dce773ca72e6c7 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:43:40 -0800 Subject: [PATCH 01/22] Update branding to 9.0.3 (#60198) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1c84ba570b05..367732c4f3a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 2 + 3 - true + false 8.0.1 *-* true release - rtm - RTM + servicing + Servicing true false $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) From f71e283286d8470639486804053f28391f92fafc Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 6 Feb 2025 19:31:42 +0000 Subject: [PATCH 03/22] Merged PR 47274: 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 or if the user is not authenticated. - `src/Identity/Core/src/SignInManager.cs`: Added checks to log errors and return early 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 ab70b2667edfa0e21d24dc45f4189285dea6b77f 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:13:37 -0800 Subject: [PATCH 04/22] Update to MacOS 15 in Helix (#60238) 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 1f7f4dea2e56da407673e95b638666d4f8eb0604 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:34:57 -0800 Subject: [PATCH 05/22] [release/9.0] Revert "Revert "Use the latest available jdk"" (#60229) * Revert "Revert "Use the latest available jdk (#59788)" (#60143)" This reverts commit 83da5913a4d65743343b280b25c1d522ee7504c2. * 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 f0a083e23ce2..c3b06d904c6f 100644 --- a/global.json +++ b/global.json @@ -24,7 +24,7 @@ "xcopy-msbuild": "17.1.0" }, "native-tools": { - "jdk": "11.0.24" + "jdk": "latest" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", diff --git a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs index 79b77e32a93e..8cb6332a8f6d 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 1181cbfbec05876399caa6c91b2496e5ff9175a1 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:38:07 -0800 Subject: [PATCH 06/22] Fix `HtmlAttributePropertyHelper` hot reload (#59908) Co-authored-by: Mackinnon Buck --- src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs index c1ac26b46742..f04f8895bd9a 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/HtmlAttributePropertyHelper.cs @@ -25,8 +25,7 @@ public HtmlAttributePropertyHelper(PropertyHelper propertyHelper) /// /// Part of contract. /// - /// - public static void UpdateCache(Type _) + public static void ClearCache(Type[] _) { ReflectionCache.Clear(); } From baff3f006653742cf2fc7147fd6fb880e536cf69 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:40:29 -0800 Subject: [PATCH 07/22] Fix skip condition for java tests (#60242) 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 8b2b207b3e4d62a9f806a58a89f5873251bedda8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 14:48:37 -0800 Subject: [PATCH 08/22] [release/9.0] (deps): Bump src/submodules/googletest (#60151) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `7d76a23` to `e235eb3`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/7d76a231b0e29caf86e68d1df858308cd53b2a66...e235eb34c6c4fed790ccdad4b16394301360dcd4) --- updated-dependencies: - dependency-name: src/submodules/googletest 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 7d76a231b0e2..e235eb34c6c4 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 7d76a231b0e29caf86e68d1df858308cd53b2a66 +Subproject commit e235eb34c6c4fed790ccdad4b16394301360dcd4 From f67becaf2e46eafd3cf201347a2cec418974a366 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:54:10 -0800 Subject: [PATCH 09/22] [release/9.0] Readd DiagnosticSource to KestrelServerImpl (#60202) * 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 cefdd3d65282..6bcede93dbea 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 a0709d00ad19..e688812a6075 100644 --- a/src/Servers/Kestrel/Core/test/KestrelServerTests.cs +++ b/src/Servers/Kestrel/Core/test/KestrelServerTests.cs @@ -309,6 +309,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 00d293ba0ee71dc8534c8c9927eb8deca7d5337e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 15:03:52 -0800 Subject: [PATCH 10/22] Add HybridCache usage signal, similar to DC (#59886) Co-authored-by: Marc Gravell --- .../StackExchangeRedis/src/RedisCache.cs | 7 +++ .../StackExchangeRedis/src/RedisCacheImpl.cs | 13 +++++- .../test/CacheServiceExtensionsTests.cs | 43 +++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/src/Caching/StackExchangeRedis/src/RedisCache.cs b/src/Caching/StackExchangeRedis/src/RedisCache.cs index debec0237040..4ecbf3628222 100644 --- a/src/Caching/StackExchangeRedis/src/RedisCache.cs +++ b/src/Caching/StackExchangeRedis/src/RedisCache.cs @@ -53,6 +53,8 @@ private static RedisValue[] GetHashFields(bool getData) => getData private long _firstErrorTimeTicks; private long _previousErrorTimeTicks; + internal bool HybridCacheActive { get; set; } + // StackExchange.Redis will also be trying to reconnect internally, // so limit how often we recreate the ConnectionMultiplexer instance // in an attempt to reconnect @@ -375,6 +377,11 @@ private void TryAddSuffix(IConnectionMultiplexer connection) { connection.AddLibraryNameSuffix("aspnet"); connection.AddLibraryNameSuffix("DC"); + + if (HybridCacheActive) + { + connection.AddLibraryNameSuffix("HC"); + } } catch (Exception ex) { diff --git a/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs b/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs index dab5bfc8655b..67d262002eb3 100644 --- a/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs +++ b/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs @@ -1,6 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using Microsoft.Extensions.Caching.Hybrid; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -8,13 +11,19 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis; internal sealed class RedisCacheImpl : RedisCache { - public RedisCacheImpl(IOptions optionsAccessor, ILogger logger) + public RedisCacheImpl(IOptions optionsAccessor, ILogger logger, IServiceProvider services) : base(optionsAccessor, logger) { + HybridCacheActive = IsHybridCacheDefined(services); } - public RedisCacheImpl(IOptions optionsAccessor) + public RedisCacheImpl(IOptions optionsAccessor, IServiceProvider services) : base(optionsAccessor) { + HybridCacheActive = IsHybridCacheDefined(services); } + + // HybridCache optionally uses IDistributedCache; if we're here, then *we are* the DC + private static bool IsHybridCacheDefined(IServiceProvider services) + => services.GetService() is not null; } diff --git a/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs b/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs index 29a49a7cec70..1d8ce4c3fd40 100644 --- a/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs +++ b/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs @@ -1,9 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using System.Linq; +using System.Threading; +using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.Hybrid; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Moq; @@ -121,4 +127,41 @@ public void AddStackExchangeRedisCache_UsesLoggerFactoryAlreadyRegisteredWithSer loggerFactory.Verify(); } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public void AddStackExchangeRedisCache_HybridCacheDetected(bool hybridCacheActive) + { + // Arrange + var services = new ServiceCollection(); + + services.AddLogging(); + + // Act + services.AddStackExchangeRedisCache(options => { }); + if (hybridCacheActive) + { + services.TryAddSingleton(new DummyHybridCache()); + } + + using var provider = services.BuildServiceProvider(); + var cache = Assert.IsAssignableFrom(provider.GetRequiredService()); + Assert.Equal(hybridCacheActive, cache.HybridCacheActive); + } + + sealed class DummyHybridCache : HybridCache + { + public override ValueTask GetOrCreateAsync(string key, TState state, Func> factory, HybridCacheEntryOptions options = null, IEnumerable tags = null, CancellationToken cancellationToken = default) + => throw new NotSupportedException(); + + public override ValueTask RemoveAsync(string key, CancellationToken cancellationToken = default) + => throw new NotSupportedException(); + + public override ValueTask RemoveByTagAsync(string tag, CancellationToken cancellationToken = default) + => throw new NotSupportedException(); + + public override ValueTask SetAsync(string key, T value, HybridCacheEntryOptions options = null, IEnumerable tags = null, CancellationToken cancellationToken = default) + => throw new NotSupportedException(); + } } From 7db3d1090276e669078ae9b28481f71a05a774a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 16:47:46 -0800 Subject: [PATCH 11/22] [release/9.0] Update dependencies from dotnet/arcade (#59952) * Update dependencies from https://github.com/dotnet/arcade build 20250115.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25065.2 * Update dependencies from https://github.com/dotnet/arcade build 20250127.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25077.4 * Remove redundant package sources from NuGet.config --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- eng/common/internal/Tools.csproj | 10 ---------- eng/common/template-guidance.md | 2 +- global.json | 8 ++++---- 5 files changed, 21 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4207ebf11cf..675f7c135ef6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 70fd11875291..73e520092690 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 9.0.0-alpha.1.24575.1 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 32f79dfb3402..feaa6d20812d 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -15,16 +15,6 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 5ef6c30ba924..98bbc1ded0ba 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -57,7 +57,7 @@ extends: Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). -# Development notes +## Development notes **Folder / file structure** diff --git a/global.json b/global.json index c3b06d904c6f..5a9c3712cc63 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.101" + "version": "9.0.102" }, "tools": { - "dotnet": "9.0.101", + "dotnet": "9.0.102", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4" } } From 4e7a00ab5d6f3685ae03daec4f857fddfa154652 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 19:23:25 -0800 Subject: [PATCH 12/22] [release/9.0] Update dependencies from dotnet/extensions (#59951) * Update dependencies from https://github.com/dotnet/extensions build 20250117.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.25060.3 -> To Version 9.2.0-preview.1.25067.2 * Update dependencies from https://github.com/dotnet/extensions build 20250126.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.25060.3 -> To Version 9.2.0-preview.1.25076.1 * Update dependencies from https://github.com/dotnet/extensions build 20250130.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.25060.3 -> To Version 9.2.0-preview.1.25080.2 * Remove redundant package sources from NuGet.config --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 675f7c135ef6..807e43462672 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/extensions - 309f2b7f73a28ffd75dac15434d160e5bd765384 + cc2317e220509a75fe457fc73ac83091c2b531ce - + https://github.com/dotnet/extensions - 309f2b7f73a28ffd75dac15434d160e5bd765384 + cc2317e220509a75fe457fc73ac83091c2b531ce https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 73e520092690..db8b576cbf07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.1 9.0.1 - 9.1.0-preview.1.25060.3 - 9.1.0-preview.1.25060.3 + 9.2.0-preview.1.25080.2 + 9.2.0-preview.1.25080.2 9.0.1 9.0.1 From eafd73fbd8ea38179ad8af020d61b8647844ec7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Mon, 10 Feb 2025 09:49:45 -0800 Subject: [PATCH 13/22] [release/9.0] Update remnants of azureedge.net (#60263) * Update remnants of azureedge.net * Update storage domains --- .azure/pipelines/ci.yml | 4 ++-- eng/common/core-templates/steps/source-build.yml | 2 +- eng/helix/helix.proj | 4 ++-- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 6 +++--- src/Installers/Windows/WindowsHostingBundle/Product.targets | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index d9f2afd0e9b6..a090da1127ee 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -97,14 +97,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/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb7f6..29515fc23f64 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -37,7 +37,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 f31e201d516e..a772993a3592 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -58,12 +58,12 @@ 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 48725d72139d..db44b1bd8b84 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -560,9 +560,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - + + $(DotnetRuntimeSourceFeedKey) diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 3b1cf82c1076..c1dc097445d4 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -83,9 +83,9 @@ --> - - - + + $(DotnetRuntimeSourceFeedKey) From ef00efdc594af25054226a399f84a1f7e0503f4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:50:22 -0800 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/extensions build 20250207.9 (#60291) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.2.0-preview.1.25080.2 -> To Version 9.3.0-preview.1.25107.9 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 20 ++++++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fa908668f8f..4df3f3ee5d19 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,19 @@ + + + + + + + + + + @@ -30,9 +40,19 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 807e43462672..93174182c680 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/extensions - cc2317e220509a75fe457fc73ac83091c2b531ce + ca2fe808b3d6c55817467f46ca58657456b4a928 - + https://github.com/dotnet/extensions - cc2317e220509a75fe457fc73ac83091c2b531ce + ca2fe808b3d6c55817467f46ca58657456b4a928 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index db8b576cbf07..9a0d983eaec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.1 9.0.1 - 9.2.0-preview.1.25080.2 - 9.2.0-preview.1.25080.2 + 9.3.0-preview.1.25107.9 + 9.3.0-preview.1.25107.9 9.0.1 9.0.1 From d4bfd6a2e206050ddc81d37bb81db482bf50add8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 10 Feb 2025 16:54:47 -0800 Subject: [PATCH 15/22] [release/9.0] Centralize on one docker container (#60298) * Centralize on one container * Centralize on one docker container * Fix name * Update ci-public.yml * Update Microsoft.AspNetCore.App.Runtime.csproj * Remove '--bl' option from pipeline script --- .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 9bcb4699e93a..3d823e234dc6 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -446,7 +446,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-net9.0-build-amd64 buildArgs: --arch x64 --os-name linux-musl @@ -480,7 +480,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-net9.0-build-amd64 buildArgs: --arch arm --os-name linux-musl @@ -513,7 +513,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-net9.0-build-amd64 buildArgs: --arch arm64 --os-name linux-musl @@ -645,7 +645,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-net9.0-build-amd64' buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true jobProperties: diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a090da1127ee..08eab9052b12 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -149,12 +149,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 + azureLinux30Net9BuildAmd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64 stages: - stage: build displayName: Build @@ -515,7 +511,7 @@ extends: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: alpine319WithNode + container: azureLinux30Net9BuildAmd64 buildArgs: --arch x64 --os-name linux-musl @@ -549,7 +545,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArmAlpine + container: azureLinux30Net9BuildAmd64 buildArgs: --arch arm --os-name linux-musl @@ -582,7 +578,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArm64Alpine + container: azureLinux30Net9BuildAmd64 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 db44b1bd8b84..5f488e03a398 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -100,12 +100,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 1edafc4d9f6869d6cc259ff46b19ea678536bd07 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 11 Feb 2025 17:47:07 +0000 Subject: [PATCH 16/22] Merged PR 47512: [internal/release/9.0] Merge from public Fixes some merge conflicts ---- #### AI description (iteration 1) #### PR Classification Code cleanup and dependency updates. #### PR Summary This pull request updates dependencies and cleans up configuration files to align with the latest internal and public build sources. - Updated dependency versions in `/eng/Version.Details.xml` and `/eng/Versions.props`. - Changed container images in `.azure/pipelines/ci.yml` and `.azure/pipelines/ci-public.yml` to `azurelinux-3.0-net9.0-build-amd64`. - Updated runtime download URLs in `/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj`, `/eng/helix/helix.proj`, and `/src/Installers/Windows/WindowsHostingBundle/Product.targets`. - Modified `BuildOsName` condition in `/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj` for `linux-musl` builds. --- .azure/pipelines/ci-public.yml | 8 ++++---- .azure/pipelines/ci.yml | 18 +++++++----------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- .../core-templates/steps/source-build.yml | 2 +- eng/helix/helix.proj | 4 ++-- .../Microsoft.AspNetCore.App.Runtime.csproj | 12 ++++++------ .../WindowsHostingBundle/Product.targets | 6 +++--- 8 files changed, 29 insertions(+), 33 deletions(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index 9bcb4699e93a..3d823e234dc6 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -446,7 +446,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-net9.0-build-amd64 buildArgs: --arch x64 --os-name linux-musl @@ -480,7 +480,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-net9.0-build-amd64 buildArgs: --arch arm --os-name linux-musl @@ -513,7 +513,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-net9.0-build-amd64 buildArgs: --arch arm64 --os-name linux-musl @@ -645,7 +645,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-net9.0-build-amd64' buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)' skipPublishValidation: true jobProperties: diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index d9f2afd0e9b6..08eab9052b12 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -97,14 +97,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') }}: @@ -149,12 +149,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 + azureLinux30Net9BuildAmd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64 stages: - stage: build displayName: Build @@ -515,7 +511,7 @@ extends: jobName: Linux_musl_x64_build jobDisplayName: "Build: Linux Musl x64" agentOs: Linux - container: alpine319WithNode + container: azureLinux30Net9BuildAmd64 buildArgs: --arch x64 --os-name linux-musl @@ -549,7 +545,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArmAlpine + container: azureLinux30Net9BuildAmd64 buildArgs: --arch arm --os-name linux-musl @@ -582,7 +578,7 @@ extends: jobDisplayName: "Build: Linux Musl ARM64" agentOs: Linux useHostedUbuntu: false - container: mariner20CrossArm64Alpine + container: azureLinux30Net9BuildAmd64 buildArgs: --arch arm64 --os-name linux-musl diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60221fe45c3c..107557e7eb3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/extensions - cc2317e220509a75fe457fc73ac83091c2b531ce + ca2fe808b3d6c55817467f46ca58657456b4a928 - + https://github.com/dotnet/extensions - cc2317e220509a75fe457fc73ac83091c2b531ce + ca2fe808b3d6c55817467f46ca58657456b4a928 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 8ad59a55e262..64dce1a41bb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.2 9.0.2 - 9.2.0-preview.1.25080.2 - 9.2.0-preview.1.25080.2 + 9.3.0-preview.1.25107.9 + 9.3.0-preview.1.25107.9 9.0.2 9.0.2 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb7f6..29515fc23f64 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -37,7 +37,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 f31e201d516e..a772993a3592 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -58,12 +58,12 @@ 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 48725d72139d..5f488e03a398 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -100,12 +100,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) @@ -560,9 +560,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - + + $(DotnetRuntimeSourceFeedKey) diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index 3b1cf82c1076..c1dc097445d4 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -83,9 +83,9 @@ --> - - - + + $(DotnetRuntimeSourceFeedKey) From 09c70742b344f22c723448edff3c9d3b67054512 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 11 Feb 2025 13:57:50 -0800 Subject: [PATCH 17/22] Update baseline, SDK, nuget.config --- NuGet.config | 2 - eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 5 files changed, 497 insertions(+), 499 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1e647dd1771..190ae868aab9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index dfd9247704ed..038221fceef4 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - - + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 @@ -120,279 +120,279 @@ - 9.0.1 + 9.0.2 - - - + + + - - - + + + - - - + + + - 9.0.1 + 9.0.2 - - - + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - - - - - + + + + + - 9.0.1 + 9.0.2 - - - - - + + + + + - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - - - - - + + + + + + - 9.0.1 + 9.0.2 - - - + + + - 9.0.1 + 9.0.2 - - - + + + - + - - - + + + - - - + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - + - + - 9.0.1 + 9.0.2 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - - + + - - + + - - + + - 9.0.1 + 9.0.2 - + - + - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 @@ -401,83 +401,83 @@ - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.1 + 9.0.2 - - + + - + - - + + - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 @@ -493,510 +493,510 @@ - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - - - + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - + + - - + + - - + + - 9.0.1 + 9.0.2 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.1 + 9.0.2 - - + + - + - - + + - - - + + + - 9.0.1 + 9.0.2 - + - + - + - 9.0.1 + 9.0.2 - + - + - + - 9.0.1 + 9.0.2 - + - + - + - 9.0.1 + 9.0.2 - - - - + + + + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - + + - - + + - - + + - 9.0.1 + 9.0.2 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.1 + 9.0.2 - - + + - - + + - - + + - 9.0.1 + 9.0.2 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - - + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - + - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - - - + + + - - - + + + - - - + + + - 9.0.1 + 9.0.2 - - - + + + - - - + + + - - - + + + - 9.0.1 + 9.0.2 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - - - + + + - - + + - - - + + + - 9.0.1 + 9.0.2 - 9.0.1 + 9.0.2 - + - 9.0.1 + 9.0.2 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index b081a19bb966..d15a11b1f2fd 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. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 64dce1a41bb2..d943694a8527 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 3 - false + true 8.0.1 *-* - - From ea2a0ca36098121d959ac2c1c0d40af59e7667b5 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 Feb 2025 17:45:00 -0800 Subject: [PATCH 19/22] Revert "[release/9.0] Update remnants of azureedge.net" (#60323) * Revert "[release/9.0] Update remnants of azureedge.net (#60263)" This reverts commit eafd73fbd8ea38179ad8af020d61b8647844ec7b. * Update eng/common/core-templates/steps/source-build.yml --- .azure/pipelines/ci.yml | 4 ++-- eng/helix/helix.proj | 4 ++-- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 6 +++--- src/Installers/Windows/WindowsHostingBundle/Product.targets | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 08eab9052b12..c085e925a528 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -97,14 +97,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/helix/helix.proj b/eng/helix/helix.proj index a772993a3592..f31e201d516e 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -58,12 +58,12 @@ 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 5f488e03a398..512c53439ccc 100644 --- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -560,9 +560,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - + + $(DotnetRuntimeSourceFeedKey) diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index c1dc097445d4..3b1cf82c1076 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -83,9 +83,9 @@ --> - - - + + $(DotnetRuntimeSourceFeedKey) From a1d8afd1d97bd338d50bfb03a57fa064182f6ca5 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Feb 2025 05:01:39 +0000 Subject: [PATCH 20/22] Merged PR 47534: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:ff8719c2-a1bf-4aef-ad09-b38561e103bc) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: ff8719c2-a1bf-4aef-ad09-b38561e103bc - **Build**: 20250211.13 - **Date Produced**: February 12, 2025 3:59:19 AM UTC - **Commit**: 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Bcl.TimeProvider**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Caching.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Caching.Memory**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.Binder**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.CommandLine**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.Ini**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Configuration.Xml**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.DependencyModel**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Diagnostics**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Diagnostics.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.FileProviders.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.FileProviders.Composite**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.FileProviders.Physical**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.2-servicing.25066.10 to 9.0.3-servicing.25111.13][1] - **Microsoft.Extensions.Hosting**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Hosting.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Http**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.Configuration**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.Console**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.Debug**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.EventLog**: [from 9.0.2 to 9.0.3][1] - **Microsoft.Extensions.Logging.EventS... --- NuGet.config | 34 ++++- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 248 insertions(+), 218 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1e647dd1771..50547f3dcd29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,25 @@ - + + + + + + + + + + + + + + + + @@ -30,10 +45,25 @@ + + + + + + + + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 107557e7eb3c..a44a08dc5e51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 64dce1a41bb2..1f57dad549e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2-servicing.25066.10 - 9.0.2-servicing.25066.10 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3-servicing.25111.13 + 9.0.3-servicing.25111.13 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 - 9.0.2-servicing.25066.10 - 9.0.2 + 9.0.3-servicing.25111.13 + 9.0.3 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 9.3.0-preview.1.25107.9 9.3.0-preview.1.25107.9 From 1e53ca927010deb7c1e0c64a258775bdffc6b034 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Feb 2025 17:13:18 +0000 Subject: [PATCH 21/22] Merged PR 47575: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:67a6df8f-40a9-4218-839a-e336f1bd1d79) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 67a6df8f-40a9-4218-839a-e336f1bd1d79 - **Build**: 20250211.7 - **Date Produced**: February 12, 2025 7:25:19 AM UTC - **Commit**: 85856237290a59157865454c9e8337dd4d591f53 - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore.Design**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 9.0.2 to 9.0.3][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 9.0.2 to 9.0.3][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e&targetVersion=GC85856237290a59157865454c9e8337dd4d591f53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79) --- NuGet.config | 34 ++-------------------------------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 50547f3dcd29..c90f038e155c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,7 @@ - - - - - - - - - - - - - - - - + @@ -45,22 +30,7 @@ - - - - - - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a44a08dc5e51..355d0f7cef89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e + 85856237290a59157865454c9e8337dd4d591f53 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1f57dad549e8..a68cf6a82d8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.3.0-preview.1.25107.9 9.3.0-preview.1.25107.9 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 - 9.0.2 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 4.11.0-3.24554.2 4.11.0-3.24554.2 From d47e5f07c5ffdac90a90fe6f8247280a712cd127 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Feb 2025 02:34:04 +0000 Subject: [PATCH 22/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250212.2 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.3 -> To Version 9.0.3 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index c90f038e155c..f8b0b0f8f7db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 355d0f7cef89..ccae9cf9ba4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85856237290a59157865454c9e8337dd4d591f53 + 68c7e19496df80819410fc6de1682a194aad33d3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime