From 5a4f24c984a425c5fad2abd81d38023a03c6d5bd Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Tue, 15 Apr 2025 19:07:57 +0000 Subject: [PATCH 1/5] Merged PR 49096: [internal/release/8.0] Add empty string check for recovery code # Add empty string check for recovery code If an empty string gets passed as the recovery code to `UserStoreBase.RedeemCodeAsync(TUser user, string code, CancellationToken ct)`, the method returns `true`, incorrectly indicating a valid recovery code. This PR resolves the issue by validating that the `code` argument is not an empty string. ## Description The `RedeemCodeAsync()` method already validates that `code` is non-null. This PR: * Extends the logic in this method to handle the empty string (`""`) case * Adds tests validating that an exception gets thrown when `code` is `null` or `""` ---- #### AI description (iteration 1) #### PR Classification Bug fix #### PR Summary This pull request adds a check for empty strings in recovery codes to prevent null or empty values from being processed. - `src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs`: Added `ThrowIfNullOrEmpty` method to validate strings as non-null and non-empty. - `src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs`: Added tests to ensure `RedeemCodeAsync` throws exceptions for null or empty codes. - `src/Identity/Extensions.Stores/src/UserStoreBase.cs`: Updated `ThrowIfNull` to `ThrowIfNullOrEmpty` for code validation in `RedeemCodeAsync`. ---- #### AI description (iteration 1) #### PR Classification Bug fix #### PR Summary This pull request adds a check for empty strings in recovery codes to prevent potential issues. - `src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs`: Added `ThrowIfNullOrEmpty` method to throw an exception if a string is null or empty. - `src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs`: Added tests to validate the new empty string check for recovery codes. - `src/Identity/Extensions.Stores/src/UserStoreBase.cs`: Updated `RedeemCodeAsync` method to use `ThrowIfNullOrEmpty` for the `code` parameter. --- .../test/EF.Test/UserStoreTest.cs | 3 +++ .../Extensions.Stores/src/UserStoreBase.cs | 2 +- .../ThrowHelpers/ArgumentNullThrowHelper.cs | 23 +++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs index 22ab9e8be5f9..4f0e347ae937 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs @@ -144,6 +144,9 @@ await Assert.ThrowsAsync("user", await Assert.ThrowsAsync("user", async () => await store.GetTwoFactorEnabledAsync(null)); await Assert.ThrowsAsync("user", async () => await store.SetTwoFactorEnabledAsync(null, true)); + await Assert.ThrowsAsync("user", async () => await store.RedeemCodeAsync(user: null, code: "fake", default)); + await Assert.ThrowsAsync("code", async () => await store.RedeemCodeAsync(new IdentityUser("fake"), code: null, default)); + await Assert.ThrowsAsync("code", async () => await store.RedeemCodeAsync(new IdentityUser("fake"), code: "", default)); await Assert.ThrowsAsync("user", async () => await store.GetAccessFailedCountAsync(null)); await Assert.ThrowsAsync("user", async () => await store.GetLockoutEnabledAsync(null)); await Assert.ThrowsAsync("user", async () => await store.SetLockoutEnabledAsync(null, false)); diff --git a/src/Identity/Extensions.Stores/src/UserStoreBase.cs b/src/Identity/Extensions.Stores/src/UserStoreBase.cs index c45dd197e4a2..804ebcbad7dc 100644 --- a/src/Identity/Extensions.Stores/src/UserStoreBase.cs +++ b/src/Identity/Extensions.Stores/src/UserStoreBase.cs @@ -969,7 +969,7 @@ public virtual async Task RedeemCodeAsync(TUser user, string code, Cancell ThrowIfDisposed(); ArgumentNullThrowHelper.ThrowIfNull(user); - ArgumentNullThrowHelper.ThrowIfNull(code); + ArgumentNullThrowHelper.ThrowIfNullOrEmpty(code); var mergedCodes = await GetTokenAsync(user, InternalLoginProvider, RecoveryCodeTokenName, cancellationToken).ConfigureAwait(false) ?? ""; var splitCodes = mergedCodes.Split(';'); diff --git a/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs b/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs index fc1d5c847d74..e83e87423745 100644 --- a/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs +++ b/src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs @@ -30,6 +30,29 @@ public static void ThrowIfNull( #endif } + /// Throws an if is null or empty. + /// The argument to validate as non-null and non-empty. + /// The name of the parameter with which corresponds. + public static void ThrowIfNullOrEmpty( +#if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER + [NotNull] +#endif + string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null) + { +#if !NET7_0_OR_GREATER || NETSTANDARD || NETFRAMEWORK + if (argument is null) + { + Throw(paramName); + } + else if (argument.Length == 0) + { + throw new ArgumentException("Must not be null or empty", paramName); + } +#else + ArgumentException.ThrowIfNullOrEmpty(argument, paramName); +#endif + } + #if !NET7_0_OR_GREATER || NETSTANDARD || NETFRAMEWORK #if INTERNAL_NULLABLE_ATTRIBUTES || NETSTANDARD2_1_OR_GREATER || NET5_0_OR_GREATER [DoesNotReturn] From ffbf2f17c24a3ea2b23d5583024fc21bd0b60ced Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Apr 2025 00:12:05 +0000 Subject: [PATCH 2/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250415.6 Microsoft.Extensions.HostFactoryResolver.Sources , 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 , System.Net.Http.WinHttpHandler , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 8.0.15-servicing.25164.13 -> To Version 8.0.16-servicing.25215.6 --- NuGet.config | 14 ++----------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++++----------- 3 files changed, 35 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index e2087a016db2..114f68015117 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,14 +6,9 @@ - - - - - - + @@ -34,14 +29,9 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee11ee5e72e9..033c3fa436e2 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 - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 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 - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 https://github.com/dotnet/source-build-externals @@ -223,9 +223,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 05e0f2d2c881def48961d3b83fa11ae84df8e534 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -275,17 +275,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 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 - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + efd5742bb5dd1677fbbbeb277bcfb5c9025548e5 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index dbfe6df117bd..157b084e8cab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15-servicing.25164.13 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16-servicing.25215.6 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 8.0.1 8.0.1 8.0.2 @@ -117,7 +117,7 @@ 8.0.0-rtm.23520.14 8.0.0 8.0.1 - 8.0.2 + 8.0.3 8.0.1 8.0.0 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 8.0.0 8.0.1 From 040389330d6b058a8029d4829e85ebc63a940370 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Apr 2025 02:14:36 +0000 Subject: [PATCH 3/5] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250416.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.15 -> To Version 8.0.16 --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 114f68015117..aa5c279af136 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 033c3fa436e2..bfa82b7e83bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0118cb6810a48869bf7494aabd86ef44da5940a3 + c755c4a6f3df392ac86ce9985f27a8c3e851b3b3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 157b084e8cab..be43c831fee0 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.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 4.8.0-7.24574.2 4.8.0-7.24574.2 From 327b4f990da6a54912fa5d57c9d862c45c363ff0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 13 May 2025 15:42:23 -0700 Subject: [PATCH 4/5] Update baseline, SDK --- eng/Baseline.Designer.props | 426 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++++++--------- eng/Versions.props | 40 ++-- global.json | 4 +- 4 files changed, 341 insertions(+), 341 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index f1b0e807fea1..3769c18a21cb 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 @@ -120,138 +120,138 @@ - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - - - + + + - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - - + + @@ -259,7 +259,7 @@ - 8.0.15 + 8.0.16 @@ -268,51 +268,51 @@ - 8.0.15 + 8.0.16 - + - + - + - + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - - + + @@ -322,8 +322,8 @@ - - + + @@ -331,8 +331,8 @@ - - + + @@ -343,58 +343,58 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 @@ -403,7 +403,7 @@ - 8.0.15 + 8.0.16 @@ -411,71 +411,71 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 - - + + - 8.0.15 + 8.0.16 @@ -491,27 +491,27 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 @@ -520,23 +520,23 @@ - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 @@ -545,54 +545,54 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - - + + - - + + - - + + - 8.0.15 + 8.0.16 - - + + - - + + - - + + - - + + @@ -600,83 +600,83 @@ - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - - - - + + + + - 8.0.15 + 8.0.16 @@ -685,64 +685,64 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 @@ -764,7 +764,7 @@ - 8.0.15 + 8.0.16 @@ -786,7 +786,7 @@ - 8.0.15 + 8.0.16 @@ -802,23 +802,23 @@ - 8.0.15 + 8.0.16 - + - + - + @@ -826,24 +826,24 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - - - + + + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 @@ -853,7 +853,7 @@ - 8.0.15 + 8.0.16 @@ -862,73 +862,73 @@ - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - + - + - + - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 @@ -957,11 +957,11 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 @@ -979,18 +979,18 @@ - 8.0.15 + 8.0.16 - 8.0.15 + 8.0.16 - + - 8.0.15 + 8.0.16 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 9746528d4365..a1df454eacdf 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 390d644f09ee..61ccec8c755c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 17 - false + true 7.1.2 7.* 8.0.2 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16-servicing.25215.6 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15-servicing.25164.13 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.16-servicing.25215.6 + 8.0.15-servicing.25164.13 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.16-servicing.25215.6 + 8.0.15-servicing.25164.13 8.0.1 8.0.1 8.0.2 @@ -117,7 +117,7 @@ 8.0.0-rtm.23520.14 8.0.0 8.0.1 - 8.0.3 + 8.0.2 8.0.1 8.0.0 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.16-servicing.25215.6 + 8.0.15-servicing.25164.13 - 8.0.16-servicing.25215.6 + 8.0.15-servicing.25164.13 8.0.0 8.0.1 @@ -143,14 +143,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 - 8.0.16 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 + 8.0.15 4.8.0-7.24574.2 4.8.0-7.24574.2 diff --git a/global.json b/global.json index 2d7bd87b2e5f..c77c161a20d5 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "8.0.115" + "version": "8.0.116" }, "tools": { - "dotnet": "8.0.115", + "dotnet": "8.0.116", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From effd4bce38b162d38749df6cc015b38375ddef93 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 13 May 2025 16:02:40 -0700 Subject: [PATCH 5/5] Fix versions.props --- eng/Versions.props | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 61ccec8c755c..b863546ddc2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15-servicing.25164.13 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16-servicing.25215.6 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 8.0.1 8.0.1 8.0.2 @@ -117,7 +117,7 @@ 8.0.0-rtm.23520.14 8.0.0 8.0.1 - 8.0.2 + 8.0.3 8.0.1 8.0.0 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 - 8.0.15-servicing.25164.13 + 8.0.16-servicing.25215.6 8.0.0 8.0.1 @@ -143,14 +143,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 - 8.0.15 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 + 8.0.16 4.8.0-7.24574.2 4.8.0-7.24574.2 @@ -339,4 +339,4 @@ 1.10.93 1.2.3 - + \ No newline at end of file