From 5ab5755dfc4e90e2bf980ffafa804122cc8ce5f5 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:12:29 -0800 Subject: [PATCH 001/181] Update branding to 9.0.2 (#59757) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a83f1f630ad4..79bc3a9d63b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 1 + 2 - true + false 8.0.1 *-* - + https://github.com/dotnet/source-build-externals - c65b1c1affed1f4847f9c3f81623dfa929d21e1a + ab469606a3e6b026dcac301e2dab96117c94faeb diff --git a/eng/Versions.props b/eng/Versions.props index 79bc3a9d63b8..f24b6747a95d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,7 +171,7 @@ 9.0.0-beta.24572.2 9.0.0-beta.24572.2 - 9.0.0-alpha.1.24568.2 + 9.0.0-alpha.1.24575.1 9.0.0-alpha.1.24413.1 From 56652335db4431487e635dd91481398b4e620c5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:26:50 -0800 Subject: [PATCH 003/181] [release/9.0] Update dependencies from dotnet/extensions (#59266) * Update dependencies from https://github.com/dotnet/extensions build 20241127.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.24575.1 -> To Version 9.1.0-preview.1.24577.1 * Update dependencies from https://github.com/dotnet/extensions build 20241209.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.24575.1 -> To Version 9.1.0-preview.1.24609.1 * Update dependencies from https://github.com/dotnet/extensions build 20241211.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.24575.1 -> To Version 9.1.0-preview.1.24611.2 --------- Co-authored-by: dotnet-maestro[bot] --- 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 c5574fb8d6bc..b1a1bb10cefc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/extensions - cfed375f3161f2e553e946b4f968b818e8e858f1 + 7d9d58969e56b84beb35b05ce29d22b26f8c97ce - + https://github.com/dotnet/extensions - cfed375f3161f2e553e946b4f968b818e8e858f1 + 7d9d58969e56b84beb35b05ce29d22b26f8c97ce https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index f24b6747a95d..fa5a24d9991f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.0 9.0.0 - 9.1.0-preview.1.24575.1 - 9.1.0-preview.1.24575.1 + 9.1.0-preview.1.24611.2 + 9.1.0-preview.1.24611.2 9.0.0 9.0.0 From 46ad18072c920382885d66583c2fee081e09abbf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:27:03 -0800 Subject: [PATCH 004/181] Update OSX helix queue (#59743) Co-authored-by: Mackinnon Buck --- 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 cedd59cd34ad..a6d7b8a81f44 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -49,7 +49,7 @@ - + From 7e247f6126b181700554046e5a7f852be6442a1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:27:34 -0800 Subject: [PATCH 005/181] Update dependencies from https://github.com/dotnet/arcade build 20241223.3 (#59728) 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.24572.2 -> To Version 9.0.0-beta.24623.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++------ eng/Versions.props | 8 ++-- eng/common/cross/toolchain.cmake | 67 +++++++++++++++----------------- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 4 +- 6 files changed, 51 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1a1bb10cefc..a2926f3676d6 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 - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - b41381d5cd633471265e9cd72e933a7048e03062 + e0e05154656254a735ebf19ffa5a37a8b915039b https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index fa5a24d9991f..f75037c82b05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 - 9.0.0-beta.24572.2 + 9.0.0-beta.24623.3 + 9.0.0-beta.24623.3 + 9.0.0-beta.24623.3 + 9.0.0-beta.24623.3 9.0.0-alpha.1.24575.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a4e285a5ae3..9a7ecfbd42c5 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -81,7 +81,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") else() set(TOOLCHAIN "riscv64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu") endif() endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -127,30 +127,25 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "riscv64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() if(ANDROID) @@ -272,21 +267,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -297,10 +292,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa94fb174596..a46b6deb7598 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -320,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 00473c9f918d..1159726a10fd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -232,7 +232,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then diff --git a/global.json b/global.json index e4674ed713f8..1a62e6a0e420 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24623.3" } } From 3c5f863566ae36d1b274622f1c1626818c7bef47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:27:46 -0800 Subject: [PATCH 006/181] [release/9.0] (deps): Bump src/submodules/googletest (#59679) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `d144031` to `7d76a23`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/d144031940543e15423a25ae5a8a74141044862f...7d76a231b0e29caf86e68d1df858308cd53b2a66) --- 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 d14403194054..7d76a231b0e2 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit d144031940543e15423a25ae5a8a74141044862f +Subproject commit 7d76a231b0e29caf86e68d1df858308cd53b2a66 From f6d7536a4e890edf077fe01f01ee57e314c7c38b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:30:19 -0800 Subject: [PATCH 007/181] [release/9.0] Skip tests on internal queues too (#59578) * Skip tests on internal too * StringComparison --------- Co-authored-by: wtgodbe --- src/Testing/src/xunit/SkipOnHelixAttribute.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Testing/src/xunit/SkipOnHelixAttribute.cs b/src/Testing/src/xunit/SkipOnHelixAttribute.cs index 38b376cb6808..2c7b66f75a67 100644 --- a/src/Testing/src/xunit/SkipOnHelixAttribute.cs +++ b/src/Testing/src/xunit/SkipOnHelixAttribute.cs @@ -66,7 +66,10 @@ private bool ShouldSkip() return true; } - return Queues.ToLowerInvariant().Split(';').Contains(targetQueue); + // We have "QueueName" and "QueueName.Open" queues for internal and public builds + // If we want to skip the test in the public queue, we want to skip it in the internal queue, and vice versa + return Queues.ToLowerInvariant().Split(';').Any(q => q.Equals(targetQueue, StringComparison.Ordinal) || q.StartsWith(targetQueue, StringComparison.Ordinal) || + targetQueue.StartsWith(q, StringComparison.Ordinal)); } public static bool OnHelix() => HelixHelper.OnHelix(); From c7de78c9e4063fb33e2df9c161b74d99487d1e64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:30:31 -0800 Subject: [PATCH 008/181] Fix loading dotnet user-jwts config (#59473) Co-authored-by: Stephen Halter --- .../src/JwtBearerConfigureOptions.cs | 2 +- .../test/JwtBearerTests_Handler.cs | 8 ++++ src/Tools/Tools.slnf | 5 ++- .../dotnet-user-jwts/test/UserJwtsTests.cs | 45 +++++++++++++++++-- .../test/dotnet-user-jwts.Tests.csproj | 6 +++ 5 files changed, 59 insertions(+), 7 deletions(-) diff --git a/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs index 6ce4d6014bbb..1ec03cca626c 100644 --- a/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs +++ b/src/Security/Authentication/JwtBearer/src/JwtBearerConfigureOptions.cs @@ -72,7 +72,7 @@ public void Configure(string? name, JwtBearerOptions options) ValidAudiences = audiences, ValidAudience = audience, ValidateIssuerSigningKey = true, - IssuerSigningKeys = GetIssuerSigningKeys(configSection, issuers), + IssuerSigningKeys = GetIssuerSigningKeys(configSection, [issuer, ..issuers]), }; } diff --git a/src/Security/Authentication/test/JwtBearerTests_Handler.cs b/src/Security/Authentication/test/JwtBearerTests_Handler.cs index 1c24afe93cc0..dc5eb760a270 100644 --- a/src/Security/Authentication/test/JwtBearerTests_Handler.cs +++ b/src/Security/Authentication/test/JwtBearerTests_Handler.cs @@ -957,6 +957,7 @@ public async Task ExpirationAndIssuedWhenMinOrMaxValue() public void CanReadJwtBearerOptionsFromConfig() { var services = new ServiceCollection(); + var key = "qPG6tDtfxFYZifHW3sEueQ=="; var config = new ConfigurationBuilder().AddInMemoryCollection([ new("Authentication:Schemes:Bearer:ValidIssuer", "dotnet-user-jwts"), new("Authentication:Schemes:Bearer:ValidIssuers:0", "dotnet-user-jwts-2"), @@ -965,6 +966,9 @@ public void CanReadJwtBearerOptionsFromConfig() new("Authentication:Schemes:Bearer:BackchannelTimeout", "00:01:00"), new("Authentication:Schemes:Bearer:RequireHttpsMetadata", "false"), new("Authentication:Schemes:Bearer:SaveToken", "True"), + new("Authentication:Schemes:Bearer:SigningKeys:0:Issuer", "dotnet-user-jwts"), + new("Authentication:Schemes:Bearer:SigningKeys:0:Value", key), + new("Authentication:Schemes:Bearer:SigningKeys:0:Length", "32"), ]).Build(); services.AddSingleton(config); @@ -987,6 +991,10 @@ public void CanReadJwtBearerOptionsFromConfig() Assert.True(jwtBearerOptions.MapInboundClaims); Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateIssuer); Assert.True(jwtBearerOptions.TokenValidationParameters.ValidateAudience); + + var securityKey = Assert.Single(jwtBearerOptions.TokenValidationParameters.IssuerSigningKeys); + var symmetricKey = Assert.IsType(securityKey); + Assert.Equal(key, Convert.ToBase64String(symmetricKey.Key)); } [Fact] diff --git a/src/Tools/Tools.slnf b/src/Tools/Tools.slnf index 484313af8712..38dbc4a65ae9 100644 --- a/src/Tools/Tools.slnf +++ b/src/Tools/Tools.slnf @@ -29,6 +29,7 @@ "src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj", "src\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", + "src\\Hosting\\TestHost\\src\\Microsoft.AspNetCore.TestHost.csproj", "src\\Html.Abstractions\\src\\Microsoft.AspNetCore.Html.Abstractions.csproj", "src\\Http\\Authentication.Abstractions\\src\\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj", @@ -109,9 +110,9 @@ "src\\Tools\\Extensions.ApiDescription.Server\\src\\Microsoft.Extensions.ApiDescription.Server.csproj", "src\\Tools\\FirstRunCertGenerator\\src\\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj", "src\\Tools\\FirstRunCertGenerator\\test\\Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj", + "src\\Tools\\GetDocumentInsider\\sample\\GetDocumentSample.csproj", "src\\Tools\\GetDocumentInsider\\src\\GetDocument.Insider.csproj", "src\\Tools\\GetDocumentInsider\\tests\\GetDocumentInsider.Tests.csproj", - "src\\Tools\\GetDocumentInsider\\sample\\GetDocumentSample.csproj", "src\\Tools\\LinkabilityChecker\\LinkabilityChecker.csproj", "src\\Tools\\Microsoft.dotnet-openapi\\src\\Microsoft.dotnet-openapi.csproj", "src\\Tools\\Microsoft.dotnet-openapi\\test\\dotnet-microsoft.openapi.Tests.csproj", @@ -125,4 +126,4 @@ "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj" ] } -} +} \ No newline at end of file diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs index 71cc2cdb7d10..801e414fe95e 100644 --- a/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs +++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTests.cs @@ -1,14 +1,19 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text.Json; +using System.Text.Json.Nodes; +using System.Text.RegularExpressions; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.InternalTesting; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.UserSecrets; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Tools.Internal; using Xunit.Abstractions; -using System.Text.RegularExpressions; -using System.Text.Json; -using System.Text.Json.Nodes; -using System.IdentityModel.Tokens.Jwt; namespace Microsoft.AspNetCore.Authentication.JwtBearer.Tools.Tests; @@ -62,6 +67,38 @@ public void Create_WritesGeneratedTokenToDisk() Assert.Contains("dotnet-user-jwts", File.ReadAllText(appsettings)); } + [Fact] + public async Task Create_TokenAcceptedByJwtBearerHandler() + { + var project = Path.Combine(fixture.CreateProject(), "TestProject.csproj"); + var appsettings = Path.Combine(Path.GetDirectoryName(project), "appsettings.Development.json"); + var secrets = PathHelper.GetSecretsPathFromSecretsId(fixture.TestSecretsId); + var app = new Program(_console); + + app.Run(["create", "--project", project, "-o", "token"]); + var token = _console.GetOutput().Trim(); + + var builder = WebApplication.CreateEmptyBuilder(new()); + builder.WebHost.UseTestServer(); + + builder.Configuration.AddJsonFile(appsettings); + builder.Configuration.AddJsonFile(secrets); + + builder.Services.AddRouting(); + builder.Services.AddAuthentication().AddJwtBearer(); + builder.Services.AddAuthorization(); + + using var webApp = builder.Build(); + webApp.MapGet("/secret", (ClaimsPrincipal user) => $"Hello {user.Identity?.Name}!") + .RequireAuthorization(); + + await webApp.StartAsync(); + + var client = webApp.GetTestClient(); + client.DefaultRequestHeaders.Add("Authorization", $"Bearer {token}"); + Assert.Equal($"Hello {Environment.UserName}!", await client.GetStringAsync("/secret")); + } + [Fact] public void Create_CanModifyExistingScheme() { diff --git a/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj b/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj index 5ad17868a98a..b362c30d0611 100644 --- a/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj +++ b/src/Tools/dotnet-user-jwts/test/dotnet-user-jwts.Tests.csproj @@ -14,4 +14,10 @@ + + + + + + From 1d1d5a759ce0b5ca2c8edfe3494ef6d772441136 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:30:56 -0800 Subject: [PATCH 009/181] Fix MultipartReaderStream synchronous read when using buffer offset (#59422) Co-authored-by: Brennan --- .../WebUtilities/src/MultipartReaderStream.cs | 2 +- .../WebUtilities/test/MultipartReaderTests.cs | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/Http/WebUtilities/src/MultipartReaderStream.cs b/src/Http/WebUtilities/src/MultipartReaderStream.cs index 208d1b38f0e0..9dd5ce6a76f8 100644 --- a/src/Http/WebUtilities/src/MultipartReaderStream.cs +++ b/src/Http/WebUtilities/src/MultipartReaderStream.cs @@ -174,7 +174,7 @@ public override int Read(byte[] buffer, int offset, int count) if (index != 0) { // Sync, it's already buffered - var slice = buffer.AsSpan(0, Math.Min(buffer.Length, index)); + var slice = buffer.AsSpan(offset, Math.Min(count, index)); var readAmount = _innerStream.Read(slice); return UpdatePosition(readAmount); diff --git a/src/Http/WebUtilities/test/MultipartReaderTests.cs b/src/Http/WebUtilities/test/MultipartReaderTests.cs index 8231ec472bc0..bc442b567dc0 100644 --- a/src/Http/WebUtilities/test/MultipartReaderTests.cs +++ b/src/Http/WebUtilities/test/MultipartReaderTests.cs @@ -389,4 +389,28 @@ public async Task MultipartReader_StripQuotesFromBoundary() var section = await reader.ReadNextSectionAsync(); Assert.NotNull(section); } + + [Fact] + public async Task SyncReadWithOffsetWorks() + { + var stream = MakeStream(OnePartBody); + var reader = new MultipartReader(Boundary, stream); + var buffer = new byte[5]; + + var section = await reader.ReadNextSectionAsync(); + Assert.NotNull(section); + Assert.Single(section.Headers); + Assert.Equal("form-data; name=\"text\"", section.Headers["Content-Disposition"][0]); + + var read = section.Body.Read(buffer, 2, buffer.Length - 2); + Assert.Equal("\0\0tex", GetString(buffer, read + 2)); + + read = section.Body.Read(buffer, 1, buffer.Length - 1); + Assert.Equal("\0t de", GetString(buffer, read + 1)); + + read = section.Body.Read(buffer, 0, buffer.Length); + Assert.Equal("fault", GetString(buffer, read)); + + Assert.Null(await reader.ReadNextSectionAsync()); + } } From 645fcac2fe920e297dfa95e07e42c816ac0ef167 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:31:11 -0800 Subject: [PATCH 010/181] Update dependencies from https://github.com/dotnet/xdt build 20241209.2 (#59419) Microsoft.SourceBuild.Intermediate.xdt , Microsoft.Web.Xdt From Version 9.0.0-preview.24522.2 -> To Version 10.0.0-preview.24609.2 Co-authored-by: dotnet-maestro[bot] --- 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 a2926f3676d6..413ac42d9a63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -329,14 +329,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/xdt - 1a54480f52703fb45fac2a6b955247d33758383e + 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/xdt - 1a54480f52703fb45fac2a6b955247d33758383e + 63ae81154c50a1cf9287cc47d8351d55b4289e6d diff --git a/eng/Versions.props b/eng/Versions.props index f75037c82b05..148beee957a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -179,8 +179,8 @@ 9.0.0-rtm.24512.2 - 9.0.0-preview.24522.2 - 9.0.0-preview.24522.2 + 10.0.0-preview.24609.2 + 10.0.0-preview.24609.2 - 9.1.0-preview.1.24611.2 - 9.1.0-preview.1.24611.2 + 9.1.0-preview.1.25056.1 + 9.1.0-preview.1.25056.1 9.0.0 9.0.0 From c7529f929107a9a3209a6b7bca1a11c157870379 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:01:13 -0800 Subject: [PATCH 012/181] [release/9.0] Fix Kestrel host header mismatch handling when port in Url (#59362) * Fix Kestrel host header mismatch handling when port in Url * avoid some allocs --------- Co-authored-by: Brennan --- .../Core/src/Internal/Http/Http1Connection.cs | 15 +++++++++++---- .../Kestrel/shared/test/HttpParsingData.cs | 7 ++++++- .../BadHttpRequestTests.cs | 13 ++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs index b8714d601f9c..178007ec06ac 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs @@ -3,7 +3,6 @@ using System.Buffers; using System.Diagnostics; -using System.Globalization; using System.IO.Pipelines; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; @@ -644,16 +643,24 @@ private void ValidateNonOriginHostHeader(string hostText) // authority component, excluding any userinfo subcomponent and its "@" // delimiter. + // Accessing authority always allocates, store it in a local to only allocate once + var authority = _absoluteRequestTarget!.Authority; + // System.Uri doesn't not tell us if the port was in the original string or not. // When IsDefaultPort = true, we will allow Host: with or without the default port - if (hostText != _absoluteRequestTarget!.Authority) + if (hostText != authority) { if (!_absoluteRequestTarget.IsDefaultPort - || hostText != _absoluteRequestTarget.Authority + ":" + _absoluteRequestTarget.Port.ToString(CultureInfo.InvariantCulture)) + || hostText != $"{authority}:{_absoluteRequestTarget.Port}") { if (_context.ServiceContext.ServerOptions.AllowHostHeaderOverride) { - hostText = _absoluteRequestTarget.Authority + ":" + _absoluteRequestTarget.Port.ToString(CultureInfo.InvariantCulture); + // No need to include the port here, it's either already in the Authority + // or it's the default port + // see: https://datatracker.ietf.org/doc/html/rfc2616/#section-14.23 + // A "host" without any trailing port information implies the default + // port for the service requested (e.g., "80" for an HTTP URL). + hostText = authority; HttpRequestHeaders.HeaderHost = hostText; } else diff --git a/src/Servers/Kestrel/shared/test/HttpParsingData.cs b/src/Servers/Kestrel/shared/test/HttpParsingData.cs index 6b240e18b5c8..a301e27e3877 100644 --- a/src/Servers/Kestrel/shared/test/HttpParsingData.cs +++ b/src/Servers/Kestrel/shared/test/HttpParsingData.cs @@ -497,8 +497,10 @@ public static TheoryData HostHeaderData { "GET /pub/WWW/", "www.example.org" }, { "GET http://localhost/", "localhost" }, { "GET http://localhost:80/", "localhost:80" }, + { "GET http://localhost:80/", "localhost" }, { "GET https://localhost/", "localhost" }, { "GET https://localhost:443/", "localhost:443" }, + { "GET https://localhost:443/", "localhost" }, { "CONNECT asp.net:80", "asp.net:80" }, { "CONNECT asp.net:443", "asp.net:443" }, { "CONNECT user-images.githubusercontent.com:443", "user-images.githubusercontent.com:443" }, @@ -534,10 +536,13 @@ public static TheoryData HostHeaderInvalidData data.Add("CONNECT contoso.com", host); } - // port mismatch when target contains port + // port mismatch when target contains default https port data.Add("GET https://contoso.com:443/", "contoso.com:5000"); data.Add("CONNECT contoso.com:443", "contoso.com:5000"); + // port mismatch when target contains default http port + data.Add("GET http://contoso.com:80/", "contoso.com:5000"); + return data; } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs index d7076dacfd4c..af9d93aea3d6 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/BadHttpRequestTests.cs @@ -153,9 +153,12 @@ public Task BadRequestIfHostHeaderDoesNotMatchRequestTarget(string requestTarget } [Theory] - [InlineData("Host: www.foo.comConnection: keep-alive")] // Corrupted - missing line-break - [InlineData("Host: www.notfoo.com")] // Syntactically correct but not matching - public async Task CanOptOutOfBadRequestIfHostHeaderDoesNotMatchRequestTarget(string hostHeader) + [InlineData("http://www.foo.com", "Host: www.foo.comConnection: keep-alive", "www.foo.com")] // Corrupted - missing line-break + [InlineData("http://www.foo.com/", "Host: www.notfoo.com", "www.foo.com")] // Syntactically correct but not matching + [InlineData("http://www.foo.com:80", "Host: www.notfoo.com", "www.foo.com")] // Explicit default port in request string + [InlineData("http://www.foo.com:5129", "Host: www.foo.com", "www.foo.com:5129")] // Non-default port in request string + [InlineData("http://www.foo.com:5129", "Host: www.foo.com:5128", "www.foo.com:5129")] // Different port in host header + public async Task CanOptOutOfBadRequestIfHostHeaderDoesNotMatchRequestTarget(string requestString, string hostHeader, string expectedHost) { var testMeterFactory = new TestMeterFactory(); using var connectionDuration = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.Server.Kestrel", "kestrel.connection.duration"); @@ -175,13 +178,13 @@ public async Task CanOptOutOfBadRequestIfHostHeaderDoesNotMatchRequestTarget(str { using (var client = server.CreateConnection()) { - await client.SendAll($"GET http://www.foo.com/api/data HTTP/1.1\r\n{hostHeader}\r\n\r\n"); + await client.SendAll($"GET {requestString} HTTP/1.1\r\n{hostHeader}\r\n\r\n"); await client.Receive("HTTP/1.1 200 OK"); } } - Assert.Equal("www.foo.com:80", receivedHost); + Assert.Equal(expectedHost, receivedHost); Assert.Collection(connectionDuration.GetMeasurementSnapshot(), m => MetricsAssert.NoError(m.Tags)); } From c1578028f712c65b694df7d372404646ad71fef5 Mon Sep 17 00:00:00 2001 From: v-firzha <44628218+v-firzha@users.noreply.github.com> Date: Wed, 8 Jan 2025 09:44:29 +0800 Subject: [PATCH 013/181] Migrate off of Fedora 38 (#59613) * Remove redundant SourceBuildTrimNetFrameworkTargets property * Remove redundant SourceBuildTrimNetFrameworkTargets property --- eng/targets/Helix.Common.props | 4 ++-- eng/targets/Helix.targets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index a6d7b8a81f44..326cbab27103 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -4,7 +4,7 @@ (AlmaLinux.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64 (Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64 (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 - (Fedora.38.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix + (Fedora.40.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40-helix (Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64 (Debian.12.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8 @@ -44,7 +44,7 @@ - + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 43bf0cb7f7f1..70e01877befa 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -19,7 +19,7 @@ $(HelixQueueAlmaLinux8); $(HelixQueueAlpine318); $(HelixQueueDebian12); - $(HelixQueueFedora38); + $(HelixQueueFedora40); $(HelixQueueMariner); Ubuntu.2004.Amd64.Open; From 0df936630460a42f45c30e06fbbb9b52b73383b9 Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Thu, 9 Jan 2025 15:51:10 -0800 Subject: [PATCH 014/181] Don't cache index.html during development (#59340) (#59348) --- .../WebAssembly/DevServer/src/Server/Startup.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Components/WebAssembly/DevServer/src/Server/Startup.cs b/src/Components/WebAssembly/DevServer/src/Server/Startup.cs index 046031a29f79..a9870bf688fb 100644 --- a/src/Components/WebAssembly/DevServer/src/Server/Startup.cs +++ b/src/Components/WebAssembly/DevServer/src/Server/Startup.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Components.WebAssembly.DevServer.Server; @@ -69,6 +70,14 @@ public static void Configure(IApplicationBuilder app, IConfiguration configurati { OnPrepareResponse = fileContext => { + // Avoid caching index.html during development. + // When hot reload is enabled, a middleware injects a hot reload script into the response HTML. + // We don't want the browser to bypass this injection by using a cached response that doesn't + // contain the injected script. In the future, if script injection is removed in favor of a + // different mechanism, we can delete this comment and the line below it. + // See also: https://github.com/dotnet/aspnetcore/issues/45213 + fileContext.Context.Response.Headers[HeaderNames.CacheControl] = "no-store"; + if (applyCopHeaders) { // Browser multi-threaded runtime requires cross-origin policy headers to enable SharedArrayBuffer. From 05c5f81fde895f8c81d7cb2a5a57a377218dd493 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 12:02:46 -0800 Subject: [PATCH 015/181] Update to Fedora 41 (#59816) Supposedly Fedora 40 images never existed for helix... Co-authored-by: Brennan --- eng/targets/Helix.Common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 326cbab27103..ea3801bb8226 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -4,7 +4,7 @@ (AlmaLinux.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64 (Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64 (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 - (Fedora.40.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40-helix + (Fedora.41.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41-helix (Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64 (Debian.12.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm64v8 @@ -44,7 +44,7 @@ - + From 8e6dbc63bc12eb8e53c377ebf65a580f9a7f5202 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:23:52 -0800 Subject: [PATCH 016/181] [release/9.0] Don't throw exception for parameters with custom binding source (#59533) * Don't through exception for parameters with custom binding source * Default to ParameterLocation.Query for ambiguous source --------- Co-authored-by: Safia Abdalla --- .../src/Services/OpenApiDocumentService.cs | 2 +- .../OpenApiDocumentServiceTests.Parameters.cs | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/OpenApi/src/Services/OpenApiDocumentService.cs b/src/OpenApi/src/Services/OpenApiDocumentService.cs index a9a7ecf6a1a6..5d678e67c8c7 100644 --- a/src/OpenApi/src/Services/OpenApiDocumentService.cs +++ b/src/OpenApi/src/Services/OpenApiDocumentService.cs @@ -411,7 +411,7 @@ private async Task GetResponseAsync( "Query" => ParameterLocation.Query, "Header" => ParameterLocation.Header, "Path" => ParameterLocation.Path, - _ => throw new InvalidOperationException($"Unsupported parameter source: {parameter.Source.Id}") + _ => ParameterLocation.Query }, Required = IsRequired(parameter), Schema = await _componentService.GetOrCreateSchemaAsync(GetTargetType(description, parameter), scopedServiceProvider, schemaTransformers, parameter, cancellationToken: cancellationToken), diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs index 10c65ae2787f..999283022706 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Parameters.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.OpenApi.Models; public partial class OpenApiDocumentServiceTests : OpenApiDocumentServiceTestBase @@ -190,4 +191,29 @@ await VerifyOpenApiDocument(builder, document => Assert.Null(document.Paths["/api/content-type-lower"].Operations[OperationType.Get].Parameters); }); } + + [Fact] + public async Task GetOpenApiParameters_ToleratesCustomBindingSource() + { + var action = CreateActionDescriptor(nameof(ActionWithCustomBinder)); + + await VerifyOpenApiDocument(action, document => + { + var operation = document.Paths["/custom-binding"].Operations[OperationType.Get]; + var parameter = Assert.Single(operation.Parameters); + Assert.Equal("model", parameter.Name); + Assert.Equal(ParameterLocation.Query, parameter.In); + }); + } + + [Route("/custom-binding")] + private void ActionWithCustomBinder([ModelBinder(BinderType = typeof(CustomBinder))] Todo model) { } + + public class CustomBinder : IModelBinder + { + public Task BindModelAsync(ModelBindingContext bindingContext) + { + return Task.CompletedTask; + } + } } From 6238e5d6f9d75992ccc95a220fd6d293c3f19187 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:24:04 -0800 Subject: [PATCH 017/181] Apply schema transformer to AdditionalProperties (#59730) Co-authored-by: Jelle Teeuwissen --- src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs | 8 +++++++- .../Transformers/SchemaTransformerTests.cs | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs index d7ea158b919a..90d818bc38d9 100644 --- a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs +++ b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs @@ -212,7 +212,13 @@ private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema, } } } - } + + if (schema is { AdditionalPropertiesAllowed: true, AdditionalProperties: not null } && jsonTypeInfo.ElementType is not null) + { + var elementTypeInfo = _jsonSerializerOptions.GetTypeInfo(jsonTypeInfo.ElementType); + await InnerApplySchemaTransformersAsync(schema.AdditionalProperties, elementTypeInfo, null, context, transformer, cancellationToken); + } + } private JsonNode CreateSchema(OpenApiSchemaKey key) => JsonSchemaExporter.GetJsonSchemaAsNode(_jsonSerializerOptions, key.Type, _configuration); diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs index 5d20c810d6fa..565c3a2b48b1 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/SchemaTransformerTests.cs @@ -444,6 +444,7 @@ public async Task SchemaTransformer_CanModifyItemTypesInADocument() builder.MapGet("/list", () => new List { 1, 2, 3, 4 }); builder.MapGet("/single", () => 1); + builder.MapGet("/dictionary", () => new Dictionary {{ "key", 1 }}); var options = new OpenApiOptions(); options.AddSchemaTransformer((schema, context, cancellationToken) => @@ -469,7 +470,13 @@ await VerifyOpenApiDocument(builder, options, document => getOperation = path.Operations[OperationType.Get]; responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document); Assert.Equal("modified-number-format", responseSchema.Format); - }); + + // Assert that the schema represent dictionary values has been modified + path = document.Paths["/dictionary"]; + getOperation = path.Operations[OperationType.Get]; + responseSchema = getOperation.Responses["200"].Content["application/json"].Schema.GetEffective(document); + Assert.Equal("modified-number-format", responseSchema.AdditionalProperties.Format); + }); } [Fact] From b439f9bd782f2889978471480da21de1bcaabbf1 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Fri, 10 Jan 2025 13:24:18 -0800 Subject: [PATCH 018/181] [release/9.0] Harden schema reference transformer for relative references (#59779) * Harden schema reference transformer for relative references (#59763) * Harden schema reference transformer for relative references * Apply suggestions from code review Co-authored-by: Brennan * Remove uneeded setting * One more cleanup * Check for top-level schemas in tests --------- Co-authored-by: Brennan * Update src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs --------- Co-authored-by: Brennan --- .../src/Comparers/OpenApiSchemaComparer.cs | 9 ++ .../Services/Schemas/OpenApiSchemaService.cs | 4 +- .../OpenApiSchemaReferenceTransformerTests.cs | 122 ++++++++++++++++++ 3 files changed, 133 insertions(+), 2 deletions(-) diff --git a/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs b/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs index 0591035d2f47..2e69b10f213f 100644 --- a/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs +++ b/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs @@ -24,6 +24,15 @@ public bool Equals(OpenApiSchema? x, OpenApiSchema? y) return true; } + // If a local reference is present, we can't compare the schema directly + // and should instead use the schema ID as a type-check to assert if the schemas are + // equivalent. + if ((x.Reference != null && y.Reference == null) + || (x.Reference == null && y.Reference != null)) + { + return SchemaIdEquals(x, y); + } + // Compare property equality in an order that should help us find inequality faster return x.Type == y.Type && diff --git a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs index 90d818bc38d9..537eb5d5db72 100644 --- a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs +++ b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs @@ -32,7 +32,7 @@ internal sealed class OpenApiSchemaService( IOptionsMonitor optionsMonitor) { private readonly OpenApiSchemaStore _schemaStore = serviceProvider.GetRequiredKeyedService(documentName); - private readonly OpenApiJsonSchemaContext _jsonSchemaContext = new OpenApiJsonSchemaContext(new(jsonOptions.Value.SerializerOptions)); + private readonly OpenApiJsonSchemaContext _jsonSchemaContext = new(new(jsonOptions.Value.SerializerOptions)); private readonly JsonSerializerOptions _jsonSerializerOptions = new(jsonOptions.Value.SerializerOptions) { // In order to properly handle the `RequiredAttribute` on type properties, add a modifier to support @@ -102,7 +102,7 @@ internal sealed class OpenApiSchemaService( // "nested": "#/properties/nested" becomes "nested": "#/components/schemas/NestedType" if (jsonPropertyInfo.PropertyType == jsonPropertyInfo.DeclaringType) { - return new JsonObject { [OpenApiSchemaKeywords.RefKeyword] = context.TypeInfo.GetSchemaReferenceId() }; + return new JsonObject { [OpenApiSchemaKeywords.RefKeyword] = createSchemaReferenceId(context.TypeInfo) }; } schema.ApplyNullabilityContextInfo(jsonPropertyInfo); } diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs index 4d16ff51d4e7..7209715e3516 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs @@ -477,4 +477,126 @@ await VerifyOpenApiDocument(builder, options, document => Assert.Equal(ReferenceType.Link, responseSchema.Reference.Type); }); } + + [Fact] + public async Task SupportsNestedSchemasWithSelfReference() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/", (LocationContainer item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var operation = document.Paths["/"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("LocationContainer", requestSchema.Reference.Id); + + // Assert that $ref is used for nested LocationDto + var locationContainerSchema = requestSchema.GetEffective(document); + Assert.Equal("LocationDto", locationContainerSchema.Properties["location"].Reference.Id); + + // Assert that $ref is used for nested AddressDto + var locationSchema = locationContainerSchema.Properties["location"].GetEffective(document); + Assert.Equal("AddressDto", locationSchema.Properties["address"].Reference.Id); + + // Assert that $ref is used for related LocationDto + var addressSchema = locationSchema.Properties["address"].GetEffective(document); + Assert.Equal("LocationDto", addressSchema.Properties["relatedLocation"].Reference.Id); + }); + } + + [Fact] + public async Task SupportsListNestedSchemasWithSelfReference() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/", (ParentObject item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var operation = document.Paths["/"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("ParentObject", requestSchema.Reference.Id); + + // Assert that $ref is used for nested Children + var parentSchema = requestSchema.GetEffective(document); + Assert.Equal("ChildObject", parentSchema.Properties["children"].Items.Reference.Id); + + // Assert that $ref is used for nested Parent + var childSchema = parentSchema.Properties["children"].Items.GetEffective(document); + Assert.Equal("ParentObject", childSchema.Properties["parent"].Reference.Id); + }); + } + + [Fact] + public async Task SupportsMultiplePropertiesWithSameType() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/", (Root item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var operation = document.Paths["/"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("Root", requestSchema.Reference.Id); + + // Assert that $ref is used for nested Item1 + var rootSchema = requestSchema.GetEffective(document); + Assert.Equal("Item", rootSchema.Properties["item1"].Reference.Id); + + // Assert that $ref is used for nested Item2 + Assert.Equal("Item", rootSchema.Properties["item2"].Reference.Id); + }); + } + + private class Root + { + public Item Item1 { get; set; } = null!; + public Item Item2 { get; set; } = null!; + } + + private class Item + { + public string[] Name { get; set; } = null!; + public int value { get; set; } + } + + private class LocationContainer + { + public LocationDto Location { get; set; } + } + + private class LocationDto + { + public AddressDto Address { get; set; } + } + + private class AddressDto + { + public LocationDto RelatedLocation { get; set; } + } + +#nullable enable + private class ParentObject + { + public int Id { get; set; } + public List Children { get; set; } = []; + } + + private class ChildObject + { + public int Id { get; set; } + public required ParentObject Parent { get; set; } + } } +#nullable restore From 7d10ee96928d1169c1f2035baefa5666496b82b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 09:04:08 -0800 Subject: [PATCH 019/181] Update dependencies from https://github.com/dotnet/extensions build 20250110.3 (#59847) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.1.0-preview.1.25056.1 -> To Version 9.1.0-preview.1.25060.3 Co-authored-by: dotnet-maestro[bot] --- 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 fa38320fd64c..1715a024c5c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/extensions - dbb12c368fab1914e847c6b07f020c1c116dc429 + 309f2b7f73a28ffd75dac15434d160e5bd765384 - + https://github.com/dotnet/extensions - dbb12c368fab1914e847c6b07f020c1c116dc429 + 309f2b7f73a28ffd75dac15434d160e5bd765384 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9a3eb69bd0cb..036e9a483f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.0 9.0.0 - 9.1.0-preview.1.25056.1 - 9.1.0-preview.1.25056.1 + 9.1.0-preview.1.25060.3 + 9.1.0-preview.1.25060.3 9.0.0 9.0.0 From 74fecc30f27aa79191ab7cfa417b422397f6ad23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:39:30 -0800 Subject: [PATCH 020/181] Update dependencies from https://github.com/dotnet/arcade build 20250108.5 (#59848) 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.24623.3 -> To Version 9.0.0-beta.25058.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1715a024c5c7..e3087524c0e7 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 - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 036e9a483f5a..7b2360e59faa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.24623.3 - 9.0.0-beta.24623.3 - 9.0.0-beta.24623.3 - 9.0.0-beta.24623.3 + 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-alpha.1.24575.1 diff --git a/global.json b/global.json index 1a62e6a0e420..bc7551bdac36 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24623.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5" } } From 7128f3eb89703752b89b7852b1b426fbb73cf225 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:04:41 -0800 Subject: [PATCH 021/181] [release/9.0] Return 206 Partial Content on Valid Range for Static Assets (#59325) * Return 206 Partial Content on Valid Range for Static Assets * Assert content length is correct --------- Co-authored-by: Justin Perez --- src/StaticAssets/src/StaticAssetsInvoker.cs | 2 +- .../test/StaticAssetsIntegrationTests.cs | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/StaticAssets/src/StaticAssetsInvoker.cs b/src/StaticAssets/src/StaticAssetsInvoker.cs index 1d21cc2929ec..c7555c901b93 100644 --- a/src/StaticAssets/src/StaticAssetsInvoker.cs +++ b/src/StaticAssets/src/StaticAssetsInvoker.cs @@ -223,7 +223,7 @@ private async Task SendRangeAsync(StaticAssetInvocationContext requestContext, R if (requestContext.Response.StatusCode == StatusCodes.Status200OK) { - requestContext.Response.StatusCode = StatusCodes.Status416RangeNotSatisfiable; + requestContext.Response.StatusCode = StatusCodes.Status206PartialContent; } await ApplyResponseHeadersAsync(requestContext, StatusCodes.Status206PartialContent); diff --git a/src/StaticAssets/test/StaticAssetsIntegrationTests.cs b/src/StaticAssets/test/StaticAssetsIntegrationTests.cs index 541a468a15a2..fda161ea055a 100644 --- a/src/StaticAssets/test/StaticAssetsIntegrationTests.cs +++ b/src/StaticAssets/test/StaticAssetsIntegrationTests.cs @@ -989,6 +989,33 @@ public async Task IfUnmodifiedSinceDateLessThanLastModifiedShouldReturn412(HttpM Assert.Equal(HttpStatusCode.PreconditionFailed, res2.StatusCode); } + // 14.35.2 Range Retrieval Requests + // The presence of a Range header in an unconditional GET modifies + // what is returned if the GET is otherwise successful. In other + // words, the response carries a status code of 206 (Partial + // Content) instead of 200 (OK). + [Fact] + public async Task RangeGivesMatchingRange() + { + var client = await CreateClient(); + + var req1 = new HttpRequestMessage(HttpMethod.Get, "http://localhost/sample.txt"); + req1.Headers.Range = new RangeHeaderValue(0, 4); + var res1 = await client.SendAsync(req1); + + var req2 = new HttpRequestMessage(HttpMethod.Get, "http://localhost/sample.txt"); + req2.Headers.Range = new RangeHeaderValue(7, 11); + var res2 = await client.SendAsync(req2); + + Assert.Equal(HttpStatusCode.PartialContent, res1.StatusCode); + Assert.Equal("Hello", await res1.Content.ReadAsStringAsync()); + Assert.Equal(5, res1.Content.Headers.ContentLength); + + Assert.Equal(HttpStatusCode.PartialContent, res2.StatusCode); + Assert.Equal("World", await res2.Content.ReadAsStringAsync()); + Assert.Equal(5, res2.Content.Headers.ContentLength); + } + public static IEnumerable SupportedMethods => new[] { new [] { HttpMethod.Get }, From 212d3666dd838287cabb7c02e022d589aeb5bc80 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 14 Jan 2025 14:13:14 -0800 Subject: [PATCH 022/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index f566358b9acb..dfd9247704ed 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - - + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 @@ -120,279 +120,279 @@ - 9.0.0 + 9.0.1 - - - + + + - - - + + + - - - + + + - 9.0.0 + 9.0.1 - - - + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - - - - - + + + + + - 9.0.0 + 9.0.1 - - - - - + + + + + - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - - - - - + + + + + + - 9.0.0 + 9.0.1 - - - + + + - 9.0.0 + 9.0.1 - - - + + + - + - - - + + + - - - + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - + - + - 9.0.0 + 9.0.1 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - - + + - - + + - - + + - 9.0.0 + 9.0.1 - + - + - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 @@ -401,83 +401,83 @@ - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.0 + 9.0.1 - - + + - + - - + + - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 @@ -493,510 +493,510 @@ - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - - - + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - + + - - + + - - + + - 9.0.0 + 9.0.1 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.0 + 9.0.1 - - + + - + - - + + - - - + + + - 9.0.0 + 9.0.1 - + - + - + - 9.0.0 + 9.0.1 - + - + - + - 9.0.0 + 9.0.1 - + - + - + - 9.0.0 + 9.0.1 - - - - + + + + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - + + - - + + - - + + - 9.0.0 + 9.0.1 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.0 + 9.0.1 - - + + - - + + - - + + - 9.0.0 + 9.0.1 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - - + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - + - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - - - + + + - - - + + + - - - + + + - 9.0.0 + 9.0.1 - - - + + + - - - + + + - - - + + + - 9.0.0 + 9.0.1 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - - - + + + - - + + - - - + + + - 9.0.0 + 9.0.1 - 9.0.0 + 9.0.1 - + - 9.0.0 + 9.0.1 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 1b4ce55e8e33..b081a19bb966 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 fec4c276ee39..1c84ba570b05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 2 - false + true 8.0.1 *-* - + + + + + + + + + @@ -30,10 +38,18 @@ + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4207ebf11cf..b538dbf11298 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 1c84ba570b05..185f76392187 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1-servicing.24610.10 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1-servicing.24610.10 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1-servicing.24610.10 - 9.0.1-servicing.24610.10 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 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.1-servicing.24610.10 - 9.0.1 + 9.0.2-servicing.25066.10 + 9.0.2 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 9.1.0-preview.1.25060.3 9.1.0-preview.1.25060.3 From 704f7cb1d2cea33afb00c2097731216f121c2c73 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 19:44:10 +0000 Subject: [PATCH 024/181] Merged PR 46855: [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**: 20250117.1 - **Date Produced**: January 17, 2025 7:11:23 PM UTC - **Commit**: 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore.Design**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 9.0.1 to 9.0.2][1] - **Microsoft.EntityFrameworkCore.Tools**: [from 9.0.1 to 9.0.2][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC480480b57cd6e43fe5cab1b552ac0ef917bf3fe8&targetVersion=GC7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79) --- NuGet.config | 20 ++------------------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 73f2d28f46ab..e1e647dd1771 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,7 @@ - - - - - - - - - + @@ -38,15 +30,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b538dbf11298..206dc89ef3ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 480480b57cd6e43fe5cab1b552ac0ef917bf3fe8 + 7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 185f76392187..796893bce1e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.1.0-preview.1.25060.3 9.1.0-preview.1.25060.3 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 4.11.0-3.24554.2 4.11.0-3.24554.2 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 025/181] 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 027/181] 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 028/181] 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 029/181] [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 030/181] 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 031/181] 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 032/181] [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 033/181] [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 034/181] 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 035/181] [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 036/181] [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 037/181] [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 038/181] 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 039/181] [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 040/181] 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 041/181] 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 043/181] 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 044/181] 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 045/181] 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 046/181] 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 From 4e3b363d6d1af3dd8d6b1428beade76390deed1c Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:00:49 -0800 Subject: [PATCH 047/181] Update branding to 9.0.4 (#60785) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d943694a8527..d5666e157c0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 3 + 4 - true + false 8.0.1 *-* - 9.3.0-preview.1.25107.9 - 9.3.0-preview.1.25107.9 + 9.3.0-preview.1.25156.1 + 9.3.0-preview.1.25156.1 9.0.2 9.0.2 From 444cd97741958f3bda0acfacb3541a40f687c2ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:18:56 -0700 Subject: [PATCH 050/181] [release/9.0] (deps): Bump src/submodules/googletest from `e235eb3` to `24a9e94` (#60678) * [release/9.0] (deps): Bump src/submodules/googletest Bumps [src/submodules/googletest](https://github.com/google/googletest) from `e235eb3` to `24a9e94`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/e235eb34c6c4fed790ccdad4b16394301360dcd4...24a9e940d481f992ba852599c78bb2217362847b) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Fix cpp test --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: wtgodbe --- src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp | 2 +- src/submodules/googletest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp index 86c764df8533..3e1bbc1add95 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/main.cpp @@ -8,5 +8,5 @@ DECLARE_DEBUG_PRINT_OBJECT2("tests", ASPNETCORE_DEBUG_FLAG_INFO | ASPNETCORE_DEB int wmain(int argc, wchar_t* argv[]) { ::testing::InitGoogleTest(&argc, argv); - RUN_ALL_TESTS(); + return RUN_ALL_TESTS(); } diff --git a/src/submodules/googletest b/src/submodules/googletest index e235eb34c6c4..24a9e940d481 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit e235eb34c6c4fed790ccdad4b16394301360dcd4 +Subproject commit 24a9e940d481f992ba852599c78bb2217362847b From 1de0bf15d1aeb92b5a5542ff4247ba41d154f218 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:19:16 -0700 Subject: [PATCH 051/181] [release/9.0] Update dependencies from dotnet/arcade (#60356) * Update dependencies from https://github.com/dotnet/arcade build 20250211.5 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.25077.4 -> To Version 9.0.0-beta.25111.5 * Remove obsolete 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 +++---- .../core-templates/steps/source-build.yml | 2 +- global.json | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8f6a3d5eae3..acf8364911b3 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 - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 380dbc4215be..de9306c59d2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 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-beta.25111.5 + 9.0.0-beta.25111.5 + 9.0.0-beta.25111.5 + 9.0.0-beta.25111.5 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 29515fc23f64..2915d29bb7f6 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://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 97b2439c9343..e52525e2ebde 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5" } } From 561e31af4400939a138937b1ba0f21e988e0cb82 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 10 Mar 2025 13:01:18 -0700 Subject: [PATCH 052/181] Fix OpenAPI server URLs for Aspire scenarios (#60673) * Support resolving OpenAPI server URLs from HttpRequest (#60617) * Support resolving OpenAPI server URLs from HttpRequest * Try passing optional params everywhere * Fix up handling for forwarded headers * Revert "Fix up handling for forwarded headers" This reverts commit bf991f64c789c0c7e4cbb650b44ff561afc6cbef. --- .../OpenApiEndpointRouteBuilderExtensions.cs | 2 +- .../src/Services/OpenApiDocumentService.cs | 23 +++++++++-- .../OpenApiDocumentServiceTests.Servers.cs | 40 +++++++++++++++++++ .../OpenApiDocumentServiceTestsBase.cs | 6 +-- 4 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs b/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs index c5bed38669e4..de74fd8d1257 100644 --- a/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs +++ b/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs @@ -43,7 +43,7 @@ public static IEndpointConventionBuilder MapOpenApi(this IEndpointRouteBuilder e } else { - var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.RequestAborted); + var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.Request, context.RequestAborted); var documentOptions = options.Get(documentName); using var output = MemoryBufferWriter.Get(); using var writer = Utf8BufferTextWriter.Get(output); diff --git a/src/OpenApi/src/Services/OpenApiDocumentService.cs b/src/OpenApi/src/Services/OpenApiDocumentService.cs index 5d678e67c8c7..b907cc6ecb20 100644 --- a/src/OpenApi/src/Services/OpenApiDocumentService.cs +++ b/src/OpenApi/src/Services/OpenApiDocumentService.cs @@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Http.Metadata; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ApiExplorer; @@ -55,7 +56,7 @@ internal sealed class OpenApiDocumentService( internal bool TryGetCachedOperationTransformerContext(string descriptionId, [NotNullWhen(true)] out OpenApiOperationTransformerContext? context) => _operationTransformerContextCache.TryGetValue(descriptionId, out context); - public async Task GetOpenApiDocumentAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken = default) + public async Task GetOpenApiDocumentAsync(IServiceProvider scopedServiceProvider, HttpRequest? httpRequest = null, CancellationToken cancellationToken = default) { // For good hygiene, operation-level tags must also appear in the document-level // tags collection. This set captures all tags that have been seen so far. @@ -74,7 +75,7 @@ public async Task GetOpenApiDocumentAsync(IServiceProvider scop { Info = GetOpenApiInfo(), Paths = await GetOpenApiPathsAsync(capturedTags, scopedServiceProvider, operationTransformers, schemaTransformers, cancellationToken), - Servers = GetOpenApiServers(), + Servers = GetOpenApiServers(httpRequest), Tags = [.. capturedTags] }; try @@ -192,12 +193,26 @@ internal OpenApiInfo GetOpenApiInfo() }; } - internal List GetOpenApiServers() + // Resolve server URL from the request to handle reverse proxies. + // If there is active request object, assume a development environment and use the server addresses. + internal List GetOpenApiServers(HttpRequest? httpRequest = null) + { + if (httpRequest is not null) + { + var serverUrl = UriHelper.BuildAbsolute(httpRequest.Scheme, httpRequest.Host, httpRequest.PathBase); + return [new OpenApiServer { Url = serverUrl }]; + } + else + { + return GetDevelopmentOpenApiServers(); + } + } + private List GetDevelopmentOpenApiServers() { if (hostEnvironment.IsDevelopment() && server?.Features.Get()?.Addresses is { Count: > 0 } addresses) { - return addresses.Select(address => new OpenApiServer { Url = address }).ToList(); + return [.. addresses.Select(address => new OpenApiServer { Url = address })]; } return []; } diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs index c84c7e258510..1bc247c95ad4 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentService/OpenApiDocumentServiceTests.Servers.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.OpenApi; using Microsoft.Extensions.DependencyInjection; @@ -10,6 +11,45 @@ public partial class OpenApiDocumentServiceTests { + [Theory] + [InlineData("Development", "localhost:5001", "", "http", "http://localhost:5001/")] + [InlineData("Development", "example.com", "/api", "https", "https://example.com/api")] + [InlineData("Staging", "localhost:5002", "/v1", "http", "http://localhost:5002/v1")] + [InlineData("Staging", "api.example.com", "/base/path", "https", "https://api.example.com/base/path")] + [InlineData("Development", "localhost", "/", "http", "http://localhost/")] + public void GetOpenApiServers_FavorsHttpContextRequestOverServerAddress(string environment, string host, string pathBase, string scheme, string expectedUri) + { + // Arrange + var hostEnvironment = new HostingEnvironment + { + ApplicationName = "TestApplication", + EnvironmentName = environment + }; + var docService = new OpenApiDocumentService( + "v1", + new Mock().Object, + hostEnvironment, + GetMockOptionsMonitor(), + new Mock().Object, + new OpenApiTestServer(["http://localhost:5000"])); + var httpContext = new DefaultHttpContext() + { + Request = + { + Host = new HostString(host), + PathBase = pathBase, + Scheme = scheme + + } + }; + + // Act + var servers = docService.GetOpenApiServers(httpContext.Request); + + // Assert + Assert.Contains(expectedUri, servers.Select(s => s.Url)); + } + [Fact] public void GetOpenApiServers_HandlesServerAddressFeatureWithValues() { diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs index e773ebf5ff89..b33eb153de4c 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiDocumentServiceTestsBase.cs @@ -35,16 +35,16 @@ public static async Task VerifyOpenApiDocument(IEndpointRouteBuilder builder, Op { var documentService = CreateDocumentService(builder, openApiOptions); var scopedService = ((TestServiceProvider)builder.ServiceProvider).CreateScope(); - var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider, cancellationToken); + var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider, null, cancellationToken); verifyOpenApiDocument(document); } - public static async Task VerifyOpenApiDocument(ActionDescriptor action, Action verifyOpenApiDocument) + public static async Task VerifyOpenApiDocument(ActionDescriptor action, Action verifyOpenApiDocument, CancellationToken cancellationToken = default) { var builder = CreateBuilder(); var documentService = CreateDocumentService(builder, action); var scopedService = ((TestServiceProvider)builder.ServiceProvider).CreateScope(); - var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider); + var document = await documentService.GetOpenApiDocumentAsync(scopedService.ServiceProvider, null); verifyOpenApiDocument(document); } From 792b6a9773d7718fc12ca6a9641908c91de26d44 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Mon, 10 Mar 2025 17:33:56 -0700 Subject: [PATCH 053/181] Fix self-referential schema handling in collection schemas (#60410) * Fix self-referential schema handling in collection schemas * Resolve relative references and add more tests * Add snapshot tests and prune more refs * Perf for comparer and resolution * Use span comparison for reference path --- .../sample/EndpointRouteBuilderExtensions.cs | 88 ++++++ src/OpenApi/sample/Program.cs | 1 + .../src/Comparers/OpenApiSchemaComparer.cs | 27 +- .../Services/Schemas/OpenApiSchemaService.cs | 115 +++++++- .../OpenApiSchemaReferenceTransformer.cs | 7 + ...t_documentName=schemas-by-ref.verified.txt | 276 ++++++++++++++++++ .../OpenApiSchemaReferenceTransformerTests.cs | 210 +++++++++++++ 7 files changed, 716 insertions(+), 8 deletions(-) diff --git a/src/OpenApi/sample/EndpointRouteBuilderExtensions.cs b/src/OpenApi/sample/EndpointRouteBuilderExtensions.cs index fd196d7fc101..acf7ae1bd41d 100644 --- a/src/OpenApi/sample/EndpointRouteBuilderExtensions.cs +++ b/src/OpenApi/sample/EndpointRouteBuilderExtensions.cs @@ -43,4 +43,92 @@ public static IEndpointConventionBuilder MapSwaggerUi(this IEndpointRouteBuilder """, "text/html")).ExcludeFromDescription(); } + + public static IEndpointRouteBuilder MapTypesWithRef(this IEndpointRouteBuilder endpoints) + { + endpoints.MapPost("/category", (Category category) => + { + return Results.Ok(category); + }); + endpoints.MapPost("/container", (ContainerType container) => + { + return Results.Ok(container); + }); + endpoints.MapPost("/root", (Root root) => + { + return Results.Ok(root); + }); + endpoints.MapPost("/location", (LocationContainer location) => + { + return Results.Ok(location); + }); + endpoints.MapPost("/parent", (ParentObject parent) => + { + return Results.Ok(parent); + }); + endpoints.MapPost("/child", (ChildObject child) => + { + return Results.Ok(child); + }); + return endpoints; + } + + public sealed class Category + { + public required string Name { get; set; } + + public required Category Parent { get; set; } + + public IEnumerable Tags { get; set; } = []; + } + + public sealed class Tag + { + public required string Name { get; set; } + } + + public sealed class ContainerType + { + public List> Seq1 { get; set; } = []; + public List> Seq2 { get; set; } = []; + } + + public sealed class Root + { + public Item Item1 { get; set; } = null!; + public Item Item2 { get; set; } = null!; + } + + public sealed class Item + { + public string[] Name { get; set; } = null!; + public int value { get; set; } + } + + public sealed class LocationContainer + { + public required LocationDto Location { get; set; } + } + + public sealed class LocationDto + { + public required AddressDto Address { get; set; } + } + + public sealed class AddressDto + { + public required LocationDto RelatedLocation { get; set; } + } + + public sealed class ParentObject + { + public int Id { get; set; } + public List Children { get; set; } = []; + } + + public sealed class ChildObject + { + public int Id { get; set; } + public required ParentObject Parent { get; set; } + } } diff --git a/src/OpenApi/sample/Program.cs b/src/OpenApi/sample/Program.cs index a622780ff482..e2a1c4c0866f 100644 --- a/src/OpenApi/sample/Program.cs +++ b/src/OpenApi/sample/Program.cs @@ -113,6 +113,7 @@ schemas.MapPost("/shape", (Shape shape) => { }); schemas.MapPost("/weatherforecastbase", (WeatherForecastBase forecast) => { }); schemas.MapPost("/person", (Person person) => { }); +schemas.MapTypesWithRef(); app.MapControllers(); diff --git a/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs b/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs index 2e69b10f213f..46f91cd8a494 100644 --- a/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs +++ b/src/OpenApi/src/Comparers/OpenApiSchemaComparer.cs @@ -24,9 +24,30 @@ public bool Equals(OpenApiSchema? x, OpenApiSchema? y) return true; } - // If a local reference is present, we can't compare the schema directly - // and should instead use the schema ID as a type-check to assert if the schemas are - // equivalent. + // If both have references, compare the final segments to handle + // equivalent types in different contexts, like the same schema + // in a dictionary value or list like "#/components/schemas/#/additionalProperties/properties/location/properties/address" + if (x.Reference != null && y.Reference != null) + { + if (x.Reference.Id.StartsWith("#", StringComparison.OrdinalIgnoreCase) && + y.Reference.Id.StartsWith("#", StringComparison.OrdinalIgnoreCase) && + x.Reference.ReferenceV3 is string xFullReferencePath && + y.Reference.ReferenceV3 is string yFullReferencePath) + { + // Compare the last segments of the reference paths + // to handle equivalent types in different contexts, + // like the same schema in a dictionary value or list + var xLastIndexOf = xFullReferencePath.LastIndexOf('/'); + var yLastIndexOf = yFullReferencePath.LastIndexOf('/'); + + if (xLastIndexOf != -1 && yLastIndexOf != -1) + { + return xFullReferencePath.AsSpan(xLastIndexOf).Equals(yFullReferencePath.AsSpan(yLastIndexOf), StringComparison.OrdinalIgnoreCase); + } + } + } + + // If only one has a reference, compare using schema IDs if ((x.Reference != null && y.Reference == null) || (x.Reference == null && y.Reference != null)) { diff --git a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs index 537eb5d5db72..812f896ee25d 100644 --- a/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs +++ b/src/OpenApi/src/Services/Schemas/OpenApiSchemaService.cs @@ -102,7 +102,7 @@ internal sealed class OpenApiSchemaService( // "nested": "#/properties/nested" becomes "nested": "#/components/schemas/NestedType" if (jsonPropertyInfo.PropertyType == jsonPropertyInfo.DeclaringType) { - return new JsonObject { [OpenApiSchemaKeywords.RefKeyword] = createSchemaReferenceId(context.TypeInfo) }; + schema[OpenApiSchemaKeywords.RefKeyword] = createSchemaReferenceId(context.TypeInfo); } schema.ApplyNullabilityContextInfo(jsonPropertyInfo); } @@ -213,13 +213,118 @@ private async Task InnerApplySchemaTransformersAsync(OpenApiSchema schema, } } - if (schema is { AdditionalPropertiesAllowed: true, AdditionalProperties: not null } && jsonTypeInfo.ElementType is not null) - { + if (schema is { AdditionalPropertiesAllowed: true, AdditionalProperties: not null } && jsonTypeInfo.ElementType is not null) + { var elementTypeInfo = _jsonSerializerOptions.GetTypeInfo(jsonTypeInfo.ElementType); await InnerApplySchemaTransformersAsync(schema.AdditionalProperties, elementTypeInfo, null, context, transformer, cancellationToken); } - } + } private JsonNode CreateSchema(OpenApiSchemaKey key) - => JsonSchemaExporter.GetJsonSchemaAsNode(_jsonSerializerOptions, key.Type, _configuration); + { + var sourceSchema = JsonSchemaExporter.GetJsonSchemaAsNode(_jsonSerializerOptions, key.Type, _configuration); + + // Resolve any relative references in the schema + ResolveRelativeReferences(sourceSchema, sourceSchema); + + return sourceSchema; + } + + // Helper method to recursively resolve relative references in a schema + private static void ResolveRelativeReferences(JsonNode node, JsonNode rootNode) + { + if (node is JsonObject jsonObj) + { + // Check if this node has a $ref property with a relative reference and no schemaId to + // resolve to + if (jsonObj.TryGetPropertyValue(OpenApiSchemaKeywords.RefKeyword, out var refNode) && + refNode is JsonValue refValue && + refValue.TryGetValue(out var refPath) && + refPath.StartsWith("#/", StringComparison.OrdinalIgnoreCase) && + !jsonObj.TryGetPropertyValue(OpenApiConstants.SchemaId, out var schemaId) && + schemaId is null) + { + // Found a relative reference, resolve it + var resolvedNode = ResolveJsonPointer(rootNode, refPath); + if (resolvedNode != null) + { + // Copy all properties from the resolved node + if (resolvedNode is JsonObject resolvedObj) + { + foreach (var property in resolvedObj) + { + // Clone the property value to avoid modifying the original + var clonedValue = property.Value != null + ? JsonNode.Parse(property.Value.ToJsonString()) + : null; + + jsonObj[property.Key] = clonedValue; + } + } + } + } + else + { + // Recursively process all properties + foreach (var property in jsonObj) + { + if (property.Value is JsonNode propNode) + { + ResolveRelativeReferences(propNode, rootNode); + } + } + } + } + else if (node is JsonArray jsonArray) + { + // Process each item in the array + for (var i = 0; i < jsonArray.Count; i++) + { + if (jsonArray[i] is JsonNode arrayItem) + { + ResolveRelativeReferences(arrayItem, rootNode); + } + } + } + } + + // Helper method to resolve a JSON pointer path and return the referenced node + private static JsonNode? ResolveJsonPointer(JsonNode root, string pointer) + { + if (string.IsNullOrEmpty(pointer) || !pointer.StartsWith("#/", StringComparison.OrdinalIgnoreCase)) + { + return null; // Invalid pointer + } + + // Remove the leading "#/" and split the path into segments + var jsonPointer = pointer.AsSpan(2); + var segments = jsonPointer.Split('/'); + var currentNode = root; + + foreach (var segment in segments) + { + if (currentNode is JsonObject jsonObj) + { + if (!jsonObj.TryGetPropertyValue(jsonPointer[segment].ToString(), out var nextNode)) + { + return null; // Path segment not found + } + currentNode = nextNode; + } + else if (currentNode is JsonArray jsonArray && int.TryParse(jsonPointer[segment], out var index)) + { + if (index < 0 || index >= jsonArray.Count) + { + return null; // Index out of range + } + currentNode = jsonArray[index]; + } + else + { + return null; // Cannot navigate further + } + } + + return currentNode; + } } diff --git a/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs b/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs index ee7e166daab7..aa98a21894ff 100644 --- a/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs +++ b/src/OpenApi/src/Transformers/Implementations/OpenApiSchemaReferenceTransformer.cs @@ -112,6 +112,13 @@ public Task TransformAsync(OpenApiDocument document, OpenApiDocumentTransformerC return new OpenApiSchema { Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = schemaId?.ToString() } }; } + // Handle relative schemas that don't point to the parent document but to another property in the same type. + // In this case, remove the reference and rely on the properties that have been resolved and copied by the OpenApiSchemaService. + if (schema.Reference is { Type: ReferenceType.Schema, Id: var id } && id.StartsWith("#/", StringComparison.Ordinal)) + { + schema.Reference = null; + } + if (schema.AllOf is not null) { for (var i = 0; i < schema.AllOf.Count; i++) diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt index cd00d261b632..3e5373a7e36b 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt @@ -375,6 +375,138 @@ } } } + }, + "/schemas-by-ref/category": { + "post": { + "tags": [ + "Sample" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Category" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/schemas-by-ref/container": { + "post": { + "tags": [ + "Sample" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ContainerType" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/schemas-by-ref/root": { + "post": { + "tags": [ + "Sample" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Root" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/schemas-by-ref/location": { + "post": { + "tags": [ + "Sample" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LocationContainer" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/schemas-by-ref/parent": { + "post": { + "tags": [ + "Sample" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ParentObject" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/schemas-by-ref/child": { + "post": { + "tags": [ + "Sample" + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChildObject" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK" + } + } + } } }, "components": { @@ -391,6 +523,128 @@ } } }, + "AddressDto": { + "required": [ + "relatedLocation" + ], + "type": "object", + "properties": { + "relatedLocation": { + "$ref": "#/components/schemas/LocationDto" + } + } + }, + "Category": { + "required": [ + "name", + "parent" + ], + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "parent": { + "$ref": "#/components/schemas/Category" + }, + "tags": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Tag" + } + } + } + }, + "ChildObject": { + "required": [ + "parent" + ], + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "parent": { + "$ref": "#/components/schemas/ParentObject" + } + } + }, + "ContainerType": { + "type": "object", + "properties": { + "seq1": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "seq2": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + }, + "Item": { + "type": "object", + "properties": { + "name": { + "type": "array", + "items": { + "type": "string" + } + }, + "value": { + "type": "integer", + "format": "int32" + } + } + }, + "LocationContainer": { + "required": [ + "location" + ], + "type": "object", + "properties": { + "location": { + "$ref": "#/components/schemas/LocationDto" + } + } + }, + "LocationDto": { + "required": [ + "address" + ], + "type": "object", + "properties": { + "address": { + "$ref": "#/components/schemas/AddressDto" + } + } + }, + "ParentObject": { + "type": "object", + "properties": { + "id": { + "type": "integer", + "format": "int32" + }, + "children": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ChildObject" + } + } + } + }, "Person": { "required": [ "discriminator" @@ -454,6 +708,17 @@ } } }, + "Root": { + "type": "object", + "properties": { + "item1": { + "$ref": "#/components/schemas/Item" + }, + "item2": { + "$ref": "#/components/schemas/Item" + } + } + }, "Shape": { "required": [ "$type" @@ -517,6 +782,17 @@ } } }, + "Tag": { + "required": [ + "name" + ], + "type": "object", + "properties": { + "name": { + "type": "string" + } + } + }, "Triangle": { "type": "object", "properties": { diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs index 7209715e3516..f8d46f771ca1 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Transformers/Implementations/OpenApiSchemaReferenceTransformerTests.cs @@ -505,6 +505,58 @@ await VerifyOpenApiDocument(builder, document => // Assert that $ref is used for related LocationDto var addressSchema = locationSchema.Properties["address"].GetEffective(document); Assert.Equal("LocationDto", addressSchema.Properties["relatedLocation"].Reference.Id); + + // Assert that only expected schemas are generated at the top-level + Assert.Equal(["AddressDto", "LocationContainer", "LocationDto"], document.Components.Schemas.Keys); + }); + } + + [Fact] + public async Task SupportsListOfNestedSchemasWithSelfReference() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/list", (List items) => { }); + builder.MapPost("/array", (LocationContainer[] items) => { }); + builder.MapPost("/dictionary", (Dictionary items) => { }); + builder.MapPost("/", (LocationContainer item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var listOperation = document.Paths["/list"].Operations[OperationType.Post]; + var listRequestSchema = listOperation.RequestBody.Content["application/json"].Schema; + + var arrayOperation = document.Paths["/array"].Operations[OperationType.Post]; + var arrayRequestSchema = arrayOperation.RequestBody.Content["application/json"].Schema; + + var dictionaryOperation = document.Paths["/dictionary"].Operations[OperationType.Post]; + var dictionaryRequestSchema = dictionaryOperation.RequestBody.Content["application/json"].Schema; + + var operation = document.Paths["/"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("LocationContainer", listRequestSchema.Items.Reference.Id); + Assert.Equal("LocationContainer", arrayRequestSchema.Items.Reference.Id); + Assert.Equal("LocationContainer", dictionaryRequestSchema.AdditionalProperties.Reference.Id); + Assert.Equal("LocationContainer", requestSchema.Reference.Id); + + // Assert that $ref is used for nested LocationDto + var locationContainerSchema = requestSchema.GetEffective(document); + Assert.Equal("LocationDto", locationContainerSchema.Properties["location"].Reference.Id); + + // Assert that $ref is used for nested AddressDto + var locationSchema = locationContainerSchema.Properties["location"].GetEffective(document); + Assert.Equal("AddressDto", locationSchema.Properties["address"].Reference.Id); + + // Assert that $ref is used for related LocationDto + var addressSchema = locationSchema.Properties["address"].GetEffective(document); + Assert.Equal("LocationDto", addressSchema.Properties["relatedLocation"].Reference.Id); + + // Assert that only expected schemas are generated at the top-level + Assert.Equal(3, document.Components.Schemas.Count); + Assert.Equal(["AddressDto", "LocationContainer", "LocationDto"], document.Components.Schemas.Keys); }); } @@ -531,6 +583,9 @@ await VerifyOpenApiDocument(builder, document => // Assert that $ref is used for nested Parent var childSchema = parentSchema.Properties["children"].Items.GetEffective(document); Assert.Equal("ParentObject", childSchema.Properties["parent"].Reference.Id); + + // Assert that only the expected schemas are registered + Assert.Equal(["ChildObject", "ParentObject"], document.Components.Schemas.Keys); }); } @@ -559,6 +614,161 @@ await VerifyOpenApiDocument(builder, document => }); } + // Test for: https://github.com/dotnet/aspnetcore/issues/60381 + [Fact] + public async Task ResolvesListBasedReferencesCorrectly() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/", (ContainerType item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var operation = document.Paths["/"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("ContainerType", requestSchema.Reference.Id); + + // Get effective schema for ContainerType + var containerSchema = requestSchema.GetEffective(document); + Assert.Equal(2, containerSchema.Properties.Count); + + // Check Seq1 and Seq2 properties + var seq1Schema = containerSchema.Properties["seq1"]; + var seq2Schema = containerSchema.Properties["seq2"]; + + // Assert both are array types + Assert.Equal("array", seq1Schema.Type); + Assert.Equal("array", seq2Schema.Type); + + // Assert items are arrays of strings + Assert.Equal("array", seq1Schema.Items.Type); + Assert.Equal("array", seq2Schema.Items.Type); + + // Since both Seq1 and Seq2 are the same type (List>), + // they should reference the same schema structure + Assert.Equal(seq1Schema.Items.Type, seq2Schema.Items.Type); + + // Verify the inner arrays contain strings + Assert.Equal("string", seq1Schema.Items.Items.Type); + Assert.Equal("string", seq2Schema.Items.Items.Type); + + Assert.Equal(["ContainerType"], document.Components.Schemas.Keys); + }); + } + + // Tests for: https://github.com/dotnet/aspnetcore/issues/60012 + [Fact] + public async Task SupportsListOfClassInSelfReferentialSchema() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/", (Category item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var operation = document.Paths["/"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("Category", requestSchema.Reference.Id); + + // Assert that $ref is used for nested Tags + var categorySchema = requestSchema.GetEffective(document); + Assert.Equal("Tag", categorySchema.Properties["tags"].Items.Reference.Id); + + // Assert that $ref is used for nested Parent + Assert.Equal("Category", categorySchema.Properties["parent"].Reference.Id); + + // Assert that no duplicate schemas are emitted + Assert.Collection(document.Components.Schemas, + schema => + { + Assert.Equal("Category", schema.Key); + }, + schema => + { + Assert.Equal("Tag", schema.Key); + }); + }); + } + + [Fact] + public async Task UsesSameReferenceForSameTypeInDifferentLocations() + { + // Arrange + var builder = CreateBuilder(); + + builder.MapPost("/parent-object", (ParentObject item) => { }); + builder.MapPost("/list", (List item) => { }); + builder.MapPost("/dictionary", (Dictionary item) => { }); + + await VerifyOpenApiDocument(builder, document => + { + var operation = document.Paths["/parent-object"].Operations[OperationType.Post]; + var requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for top-level + Assert.Equal("ParentObject", requestSchema.Reference.Id); + + // Assert that $ref is used for nested Children + var parentSchema = requestSchema.GetEffective(document); + Assert.Equal("ChildObject", parentSchema.Properties["children"].Items.Reference.Id); + + // Assert that $ref is used for nested Parent + var childSchema = parentSchema.Properties["children"].Items.GetEffective(document); + Assert.Equal("ParentObject", childSchema.Properties["parent"].Reference.Id); + + operation = document.Paths["/list"].Operations[OperationType.Post]; + requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for items in the list definition + Assert.Equal("ParentObject", requestSchema.Items.Reference.Id); + parentSchema = requestSchema.Items.GetEffective(document); + Assert.Equal("ChildObject", parentSchema.Properties["children"].Items.Reference.Id); + + childSchema = parentSchema.Properties["children"].Items.GetEffective(document); + Assert.Equal("ParentObject", childSchema.Properties["parent"].Reference.Id); + + operation = document.Paths["/dictionary"].Operations[OperationType.Post]; + requestSchema = operation.RequestBody.Content["application/json"].Schema; + + // Assert $ref used for items in the dictionary definition + Assert.Equal("ParentObject", requestSchema.AdditionalProperties.Reference.Id); + parentSchema = requestSchema.AdditionalProperties.GetEffective(document); + Assert.Equal("ChildObject", parentSchema.Properties["children"].Items.Reference.Id); + + childSchema = parentSchema.Properties["children"].Items.GetEffective(document); + Assert.Equal("ParentObject", childSchema.Properties["parent"].Reference.Id); + + // Assert that only the expected schemas are registered + Assert.Equal(["ChildObject", "ParentObject"], document.Components.Schemas.Keys); + }); + } + + private class Category + { + public required string Name { get; set; } + + public Category Parent { get; set; } + + public IEnumerable Tags { get; set; } = []; + } + + public class Tag + { + public required string Name { get; set; } + } + + private class ContainerType + { + public List> Seq1 { get; set; } = []; + public List> Seq2 { get; set; } = []; + } + private class Root { public Item Item1 { get; set; } = null!; From cd7e571b413096e4fedbf18f733723ab9b6611ef Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Mon, 10 Mar 2025 18:48:02 -0700 Subject: [PATCH 054/181] Fix CustomElements JS assets not included in build output (#60858) --- .../src/Microsoft.AspNetCore.Components.CustomElements.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj b/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj index 4c5ae75fa8a4..5d27de7c059f 100644 --- a/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj +++ b/src/Components/CustomElements/src/Microsoft.AspNetCore.Components.CustomElements.csproj @@ -1,4 +1,4 @@ - + $(DefaultNetCoreTargetFramework) @@ -18,7 +18,7 @@ - + <_JsBuildOutput Include="$(InteropWorkingDir)dist\$(Configuration)\**" Exclude="$(InteropWorkingDir)dist\.gitignore" /> From ec4f4cd4cb5520f12c63ed34e70d9b51195066a5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Mar 2025 19:26:22 +0000 Subject: [PATCH 055/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250312.18 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.3 -> To Version 9.0.4 --- NuGet.config | 8 +- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 222 insertions(+), 218 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8b0b0f8f7db..e7289285a27c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,12 @@ - + + + @@ -30,10 +32,12 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 989cca9ca192..df72e9422c51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 68c7e19496df80819410fc6de1682a194aad33d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 7d377eb03252..8e0f66872fd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 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.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25162.18 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25162.18 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25162.18 + 9.0.4-servicing.25162.18 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 - 9.0.3-servicing.25111.13 - 9.0.3 + 9.0.4-servicing.25162.18 + 9.0.4 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 9.3.0-preview.1.25156.1 9.3.0-preview.1.25156.1 From 859cccdad69e916110daf72cec7731486416c536 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Mar 2025 20:53:32 +0000 Subject: [PATCH 056/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250313.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 9.0.3 -> To Version 9.0.4 --- NuGet.config | 8 ++------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7289285a27c..13b6be6d6537 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -32,9 +30,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df72e9422c51..7f0751583f72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 68c7e19496df80819410fc6de1682a194aad33d3 + bb7c8435d82b8701a779d505b724a7107c1b0b4a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8e0f66872fd5..389ddb02db7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.3.0-preview.1.25156.1 9.3.0-preview.1.25156.1 - 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.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 4.11.0-3.24554.2 4.11.0-3.24554.2 From 6ded96b88efcc263039d5d31d53d2a919ac737bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 02:59:44 +0000 Subject: [PATCH 057/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250313.5 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.3 -> To Version 9.0.4 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13b6be6d6537..fd8ee7ae267a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f0751583f72..9d38dd34e8a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 389ddb02db7b..3e45eded9065 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25162.18 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 9.0.4 @@ -95,7 +95,7 @@ 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25162.18 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 9.0.4 @@ -111,8 +111,8 @@ 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25162.18 - 9.0.4-servicing.25162.18 + 9.0.4-servicing.25163.5 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 9.0.4 @@ -134,7 +134,7 @@ 9.0.4 9.0.4 - 9.0.4-servicing.25162.18 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 From 032c147f56f6b5c5a8751dee499f0d5bd82a08ac Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 06:56:31 +0000 Subject: [PATCH 058/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250313.10 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.4 -> To Version 9.0.4 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd8ee7ae267a..9bc1f58f58ef 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 9d38dd34e8a3..28d773064132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - bb7c8435d82b8701a779d505b724a7107c1b0b4a + 9275e9ac55e413546a09551c29d5227d6d009747 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 4a6e0054afa519a6d00a73ae161b53c4a257b64f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 18 Mar 2025 14:34:43 +0000 Subject: [PATCH 059/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250318.1 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.4 -> To Version 9.0.4 --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9bc1f58f58ef..1fc7bdf212ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,10 @@ + - + @@ -30,9 +31,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28d773064132..43f659a20f97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9275e9ac55e413546a09551c29d5227d6d009747 + 55700ce7d51b40ea546f817fd4947a6bae50be07 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 27ea9fa74cd8f2cd164fa675f5d0f9b1c4a1cb51 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 2 Apr 2025 12:33:37 -0700 Subject: [PATCH 060/181] Update branding to 9.0.5 (#61284) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7d377eb03252..9dec3f454a84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 9 0 - 4 + 5 false From 38f930810af5ab6a1c092ac7cfed1a6b4097a0f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 12:37:14 -0700 Subject: [PATCH 061/181] [release/9.0] (deps): Bump src/submodules/googletest (#61261) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `24a9e94` to `52204f7`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/24a9e940d481f992ba852599c78bb2217362847b...52204f78f94d7512df1f0f3bea1d47437a2c3a58) --- 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 24a9e940d481..52204f78f94d 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 24a9e940d481f992ba852599c78bb2217362847b +Subproject commit 52204f78f94d7512df1f0f3bea1d47437a2c3a58 From e1cae2719f0e90e829d327f5aeec87ab2b0bb59f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:10:00 -0700 Subject: [PATCH 062/181] [release/9.0] Upgrade to Ubuntu 22 (#61215) * Upgrade to Ubuntu 22 * Update install-nginx-linux.sh --------- Co-authored-by: William Godbe --- .azure/pipelines/jobs/default-build.yml | 6 +++--- eng/scripts/install-nginx-linux.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 65307d5d0ad7..15cf2272358c 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -109,10 +109,10 @@ jobs: vmImage: macOS-13 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.useHostedUbuntu, true) }}: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 ${{ else }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64.open @@ -327,7 +327,7 @@ jobs: os: macOS ${{ if eq(parameters.agentOs, 'Linux') }}: name: $(DncEngInternalBuildPool) - image: 1es-ubuntu-2004 + image: 1es-ubuntu-2204 os: linux ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngInternalBuildPool) diff --git a/eng/scripts/install-nginx-linux.sh b/eng/scripts/install-nginx-linux.sh index bbfb79c48203..f075a899d1cf 100755 --- a/eng/scripts/install-nginx-linux.sh +++ b/eng/scripts/install-nginx-linux.sh @@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" reporoot="$(dirname "$(dirname "$scriptroot")")" nginxinstall="$reporoot/.tools/nginx" -curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/ +curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/ ./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module make make install From 08c7cfdee75f1a05e3b2d8fecdbbb335c5915081 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:16:39 -0700 Subject: [PATCH 063/181] [release/9.0] Update dependencies from dotnet/extensions (#60964) * Update dependencies from https://github.com/dotnet/extensions build 20250314.5 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.3.0-preview.1.25156.1 -> To Version 9.4.0-preview.1.25164.5 * Update dependencies from https://github.com/dotnet/extensions build 20250323.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.3.0-preview.1.25156.1 -> To Version 9.4.0-preview.1.25173.2 * Quarantine tests - Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests.FormHandlingTests.FormWithParentBindingContextTest.RadioButtonGetsResetAfterSubmittingEnhancedForm https://github.com/dotnet/aspnetcore/issues/61144 - Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests.EnhancedNavigationTest.NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly https://github.com/dotnet/aspnetcore/issues/61143 * Fix build * Fix build * Update dependencies from https://github.com/dotnet/extensions build 20250328.3 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.3.0-preview.1.25156.1 -> To Version 9.4.0-preview.1.25178.3 * Fix submod --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Ankit Jain Co-authored-by: wtgodbe --- NuGet.config | 4 ---- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- .../ServerRenderingTests/EnhancedNavigationTest.cs | 2 ++ .../FormHandlingTests/FormWithParentBindingContextTest.cs | 1 + 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8b0b0f8f7db..66f5d2f4634d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 989cca9ca192..aea4c9961c1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 5da211e1c42254cb35e7ef3d5a8428fb24853169 - + https://github.com/dotnet/extensions - c221abef4b4f1bf3fcf0bda27490e8b26bb479f4 + 56df0c4f4933909367536413dcf9c16520a37f82 - + https://github.com/dotnet/extensions - c221abef4b4f1bf3fcf0bda27490e8b26bb479f4 + 56df0c4f4933909367536413dcf9c16520a37f82 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9dec3f454a84..8c766789eca6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.3 9.0.3 - 9.3.0-preview.1.25156.1 - 9.3.0-preview.1.25156.1 + 9.4.0-preview.1.25178.3 + 9.4.0-preview.1.25178.3 9.0.3 9.0.3 diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs index 94b6b80f53a1..0ba10d655cdf 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.E2ETesting; +using Microsoft.AspNetCore.InternalTesting; using TestServer; using Xunit.Abstractions; using Components.TestServer.RazorComponents; @@ -519,6 +520,7 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_OnlyServerOrWebA [Theory] [InlineData("server")] [InlineData("wasm")] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61143")] public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWebAssembly(string runtimeThatInvokedNavigation) { Navigate($"{ServerPathBase}/nav"); diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index 4b35b0c5eed0..792e222f4183 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1340,6 +1340,7 @@ void AssertUiState(string expectedStringValue, bool expectedBoolValue) } [Fact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61144")] public void RadioButtonGetsResetAfterSubmittingEnhancedForm() { GoTo("forms/form-with-checkbox-and-radio-button"); From 0ace5390482bd2f059b57168723a76ed09413042 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 17:20:47 -0700 Subject: [PATCH 064/181] [release/9.0] Update dependencies from dotnet/arcade (#60902) * Update dependencies from https://github.com/dotnet/arcade build 20250311.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.25111.5 -> To Version 9.0.0-beta.25161.4 * Update dependencies from https://github.com/dotnet/arcade build 20250314.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.25111.5 -> To Version 9.0.0-beta.25164.2 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- .../core-templates/steps/generate-sbom.yml | 2 +- eng/common/generate-sbom-prep.ps1 | 20 +++++++++++----- eng/common/generate-sbom-prep.sh | 17 ++++++++----- eng/common/templates-official/job/job.yml | 1 + eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 8 +++---- 9 files changed, 51 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea4c9961c1e..86ac56628406 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 - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee - + https://github.com/dotnet/arcade - 5da211e1c42254cb35e7ef3d5a8428fb24853169 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 8c766789eca6..c262dd970eb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 - 9.0.0-beta.25111.5 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 + 9.0.0-beta.25164.2 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index d938b60e1bb5..56a090094824 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -38,7 +38,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a1c5..a0c7d792a76f 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $PSScriptRoot\pipeline-logging-functions.ps1 +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + Write-Host "Creating dir $ManifestDirPath" + # create directory for sbom manifest to be placed -if (!(Test-Path -path $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" } else{ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." } Write-Host "Updating artifact name" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc827b4..b8ecca72bbf5 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh + +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 605692d2fb77..817555505aa6 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -16,6 +16,7 @@ jobs: parameters: PackageVersion: ${{ parameters.packageVersion }} BuildDropPath: ${{ parameters.buildDropPath }} + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom publishArtifacts: false # publish artifacts diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a46b6deb7598..22b49e09d09b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 1159726a10fd..01b09b65796c 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index e52525e2ebde..5e720cb83825 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.103" + "version": "9.0.104" }, "tools": { - "dotnet": "9.0.103", + "dotnet": "9.0.104", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2" } } From 9fc4aceea7f8295940cc6ad012a6f1cf06c91ef4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 8 Apr 2025 12:37:24 -0700 Subject: [PATCH 065/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 038221fceef4..28c064e01b73 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - - + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 @@ -120,279 +120,279 @@ - 9.0.2 + 9.0.4 - - - + + + - - - + + + - - - + + + - 9.0.2 + 9.0.4 - - - + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - - - - - + + + + + - 9.0.2 + 9.0.4 - - - - - + + + + + - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - - - - - + + + + + + - 9.0.2 + 9.0.4 - - - + + + - 9.0.2 + 9.0.4 - - - + + + - + - - - + + + - - - + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - + - + - 9.0.2 + 9.0.4 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - - + + - - + + - - + + - 9.0.2 + 9.0.4 - + - + - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 @@ -401,83 +401,83 @@ - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.2 + 9.0.4 - - + + - + - - + + - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 @@ -493,510 +493,510 @@ - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - - - + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - + + - - + + - - + + - 9.0.2 + 9.0.4 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.2 + 9.0.4 - - + + - + - - + + - - - + + + - 9.0.2 + 9.0.4 - + - + - + - 9.0.2 + 9.0.4 - + - + - + - 9.0.2 + 9.0.4 - + - + - + - 9.0.2 + 9.0.4 - - - - + + + + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - + + - - + + - - + + - 9.0.2 + 9.0.4 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.2 + 9.0.4 - - + + - - + + - - + + - 9.0.2 + 9.0.4 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - - + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - + - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - - - + + + - - - + + + - - - + + + - 9.0.2 + 9.0.4 - - - + + + - - - + + + - - - + + + - 9.0.2 + 9.0.4 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - - - + + + - - + + - - - + + + - 9.0.2 + 9.0.4 - 9.0.2 + 9.0.4 - + - 9.0.2 + 9.0.4 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index d15a11b1f2fd..71537197d7a9 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 8c027ced8593..9ea57fb7ce90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 5 - false + true 8.0.1 *-* - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + ca3c62aa504aaefb17782282cc3ae7723562cf95 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + ca3c62aa504aaefb17782282cc3ae7723562cf95 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + ca3c62aa504aaefb17782282cc3ae7723562cf95 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + ca3c62aa504aaefb17782282cc3ae7723562cf95 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + ca3c62aa504aaefb17782282cc3ae7723562cf95 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index c262dd970eb0..12303872d3f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25164.2 - 9.0.0-beta.25164.2 - 9.0.0-beta.25164.2 - 9.0.0-beta.25164.2 + 9.0.0-beta.25208.4 + 9.0.0-beta.25208.4 + 9.0.0-beta.25208.4 + 9.0.0-beta.25208.4 9.0.0-alpha.1.24575.1 diff --git a/global.json b/global.json index 5e720cb83825..158bd9aac6df 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.4" } } From 15ecdb2aeea47371374566c28ac52ea0e44e42f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:58:30 -0700 Subject: [PATCH 067/181] critical bugfix; defer HC metadata detection because of DI cycle (#60916) fix #60894 Co-authored-by: Marc Gravell --- .../StackExchangeRedis/src/RedisCache.cs | 4 +-- .../StackExchangeRedis/src/RedisCacheImpl.cs | 13 +++---- .../test/CacheServiceExtensionsTests.cs | 36 +++++++++++++++++-- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/Caching/StackExchangeRedis/src/RedisCache.cs b/src/Caching/StackExchangeRedis/src/RedisCache.cs index 4ecbf3628222..95bba7dd0088 100644 --- a/src/Caching/StackExchangeRedis/src/RedisCache.cs +++ b/src/Caching/StackExchangeRedis/src/RedisCache.cs @@ -53,7 +53,7 @@ private static RedisValue[] GetHashFields(bool getData) => getData private long _firstErrorTimeTicks; private long _previousErrorTimeTicks; - internal bool HybridCacheActive { get; set; } + internal virtual bool IsHybridCacheActive() => false; // StackExchange.Redis will also be trying to reconnect internally, // so limit how often we recreate the ConnectionMultiplexer instance @@ -378,7 +378,7 @@ private void TryAddSuffix(IConnectionMultiplexer connection) connection.AddLibraryNameSuffix("aspnet"); connection.AddLibraryNameSuffix("DC"); - if (HybridCacheActive) + if (IsHybridCacheActive()) { connection.AddLibraryNameSuffix("HC"); } diff --git a/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs b/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs index 67d262002eb3..0a58d43e136d 100644 --- a/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs +++ b/src/Caching/StackExchangeRedis/src/RedisCacheImpl.cs @@ -11,19 +11,20 @@ namespace Microsoft.Extensions.Caching.StackExchangeRedis; internal sealed class RedisCacheImpl : RedisCache { + private readonly IServiceProvider _services; + + internal override bool IsHybridCacheActive() + => _services.GetService() is not null; + public RedisCacheImpl(IOptions optionsAccessor, ILogger logger, IServiceProvider services) : base(optionsAccessor, logger) { - HybridCacheActive = IsHybridCacheDefined(services); + _services = services; // important: do not check for HybridCache here due to dependency - creates a cycle } public RedisCacheImpl(IOptions optionsAccessor, IServiceProvider services) : base(optionsAccessor) { - HybridCacheActive = IsHybridCacheDefined(services); + _services = services; // important: do not check for HybridCache here due to dependency - creates a cycle } - - // 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 1d8ce4c3fd40..71e31d19928a 100644 --- a/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs +++ b/src/Caching/StackExchangeRedis/test/CacheServiceExtensionsTests.cs @@ -8,10 +8,12 @@ using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Hybrid; +using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; using Moq; using Xunit; @@ -142,16 +144,46 @@ public void AddStackExchangeRedisCache_HybridCacheDetected(bool hybridCacheActiv services.AddStackExchangeRedisCache(options => { }); if (hybridCacheActive) { - services.TryAddSingleton(new DummyHybridCache()); + services.AddMemoryCache(); + services.TryAddSingleton(); } using var provider = services.BuildServiceProvider(); var cache = Assert.IsAssignableFrom(provider.GetRequiredService()); - Assert.Equal(hybridCacheActive, cache.HybridCacheActive); + Assert.Equal(hybridCacheActive, cache.IsHybridCacheActive()); } sealed class DummyHybridCache : HybridCache { + // emulate the layout from HybridCache in dotnet/extensions + public DummyHybridCache(IOptions options, IServiceProvider services) + { + if (services is null) + { + throw new ArgumentNullException(nameof(services)); + } + + var l1 = services.GetRequiredService(); + _ = options.Value; + var logger = services.GetService()?.CreateLogger(typeof(HybridCache)) ?? NullLogger.Instance; + // var clock = services.GetService() ?? TimeProvider.System; + var l2 = services.GetService(); // note optional + + // ignore L2 if it is really just the same L1, wrapped + // (note not just an "is" test; if someone has a custom subclass, who knows what it does?) + if (l2 is not null + && l2.GetType() == typeof(MemoryDistributedCache) + && l1.GetType() == typeof(MemoryCache)) + { + l2 = null; + } + + IHybridCacheSerializerFactory[] factories = services.GetServices().ToArray(); + Array.Reverse(factories); + } + + public class HybridCacheOptions { } + public override ValueTask GetOrCreateAsync(string key, TState state, Func> factory, HybridCacheEntryOptions options = null, IEnumerable tags = null, CancellationToken cancellationToken = default) => throw new NotSupportedException(); From 3a9e8f2e8ff314ae11520b71e59c042c97159dd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:20:20 -0700 Subject: [PATCH 068/181] Update dependencies from https://github.com/dotnet/extensions build 20250404.8 (#61354) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.4.0-preview.1.25178.3 -> To Version 9.5.0-preview.1.25204.8 Co-authored-by: dotnet-maestro[bot] --- 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 ced9431d96b3..b3ee7208c497 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade ca3c62aa504aaefb17782282cc3ae7723562cf95 - + https://github.com/dotnet/extensions - 56df0c4f4933909367536413dcf9c16520a37f82 + 2fbf99834c90a20b950b44b3dcdd2b264b422a59 - + https://github.com/dotnet/extensions - 56df0c4f4933909367536413dcf9c16520a37f82 + 2fbf99834c90a20b950b44b3dcdd2b264b422a59 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 12303872d3f7..a1896f95f13c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.3 9.0.3 - 9.4.0-preview.1.25178.3 - 9.4.0-preview.1.25178.3 + 9.5.0-preview.1.25204.8 + 9.5.0-preview.1.25204.8 9.0.3 9.0.3 From 256d55332f6dc51a771ce05eec3da7140c0fae43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:25:49 -0700 Subject: [PATCH 069/181] Update dependencies from https://github.com/dotnet/arcade build 20250408.6 (#61412) 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.25208.4 -> To Version 9.0.0-beta.25208.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5c84b056835..5cb54ee7b04e 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 - ca3c62aa504aaefb17782282cc3ae7723562cf95 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - ca3c62aa504aaefb17782282cc3ae7723562cf95 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - ca3c62aa504aaefb17782282cc3ae7723562cf95 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - ca3c62aa504aaefb17782282cc3ae7723562cf95 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - ca3c62aa504aaefb17782282cc3ae7723562cf95 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - ca3c62aa504aaefb17782282cc3ae7723562cf95 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 7bacb782c4ba..e3289667b6bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25208.4 - 9.0.0-beta.25208.4 - 9.0.0-beta.25208.4 - 9.0.0-beta.25208.4 + 9.0.0-beta.25208.6 + 9.0.0-beta.25208.6 + 9.0.0-beta.25208.6 + 9.0.0-beta.25208.6 9.0.0-alpha.1.24575.1 diff --git a/global.json b/global.json index fbb73c9ebd68..00bc10af2c7f 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6" } } From f1a2f80c897bc8429c1707516a81ae0bd5bd2768 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 9 Apr 2025 11:32:12 -0700 Subject: [PATCH 070/181] Revert "Revert "[release/9.0] Update remnants of azureedge.net" (#60323)" (#60353) This reverts commit ea2a0ca36098121d959ac2c1c0d40af59e7667b5. From bb179c277e5c3d5cda47d96b874ddb637983b548 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:42:35 -0700 Subject: [PATCH 071/181] [release/9.0] Fix preserving messages for stateful reconnect with backplane (#61374) * Fix preserving messages for stateful reconnect with backplane * Update src/SignalR/common/Shared/MessageBuffer.cs --------- Co-authored-by: Brennan --- src/SignalR/common/Shared/MessageBuffer.cs | 9 +- .../server/Core/src/SerializedHubMessage.cs | 3 + .../Internal/MessageBufferTests.cs | 59 +++++- .../StackExchangeRedis/test/RedisEndToEnd.cs | 173 +++++++++++++++++- .../server/StackExchangeRedis/test/Startup.cs | 1 + .../StackExchangeRedis/test/StatefulHub.cs | 12 ++ 6 files changed, 246 insertions(+), 11 deletions(-) create mode 100644 src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs diff --git a/src/SignalR/common/Shared/MessageBuffer.cs b/src/SignalR/common/Shared/MessageBuffer.cs index 17b9ae170fe0..f08fff86aa40 100644 --- a/src/SignalR/common/Shared/MessageBuffer.cs +++ b/src/SignalR/common/Shared/MessageBuffer.cs @@ -121,15 +121,16 @@ private async Task RunTimer() public ValueTask WriteAsync(SerializedHubMessage hubMessage, CancellationToken cancellationToken) { - return WriteAsyncCore(hubMessage.Message!, hubMessage.GetSerializedMessage(_protocol), cancellationToken); + // Default to HubInvocationMessage as that's the only type we use SerializedHubMessage for currently when Message is null. Should harden this in the future. + return WriteAsyncCore(hubMessage.Message?.GetType() ?? typeof(HubInvocationMessage), hubMessage.GetSerializedMessage(_protocol), cancellationToken); } public ValueTask WriteAsync(HubMessage hubMessage, CancellationToken cancellationToken) { - return WriteAsyncCore(hubMessage, _protocol.GetMessageBytes(hubMessage), cancellationToken); + return WriteAsyncCore(hubMessage.GetType(), _protocol.GetMessageBytes(hubMessage), cancellationToken); } - private async ValueTask WriteAsyncCore(HubMessage hubMessage, ReadOnlyMemory messageBytes, CancellationToken cancellationToken) + private async ValueTask WriteAsyncCore(Type hubMessageType, ReadOnlyMemory messageBytes, CancellationToken cancellationToken) { // TODO: Add backpressure based on message count if (_bufferedByteCount > _bufferLimit) @@ -158,7 +159,7 @@ private async ValueTask WriteAsyncCore(HubMessage hubMessage, ReadO await _writeLock.WaitAsync(cancellationToken: default).ConfigureAwait(false); try { - if (hubMessage is HubInvocationMessage invocationMessage) + if (typeof(HubInvocationMessage).IsAssignableFrom(hubMessageType)) { _totalMessageCount++; _bufferedByteCount += messageBytes.Length; diff --git a/src/SignalR/server/Core/src/SerializedHubMessage.cs b/src/SignalR/server/Core/src/SerializedHubMessage.cs index e355b0329128..9f4327a4cc58 100644 --- a/src/SignalR/server/Core/src/SerializedHubMessage.cs +++ b/src/SignalR/server/Core/src/SerializedHubMessage.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using Microsoft.AspNetCore.SignalR.Protocol; namespace Microsoft.AspNetCore.SignalR; @@ -40,6 +41,8 @@ public SerializedHubMessage(IReadOnlyList messages) /// The hub message for the cache. This will be serialized with an in to get the message's serialized representation. public SerializedHubMessage(HubMessage message) { + // Type currently only used for invocation messages, we should probably refactor it to be explicit about that e.g. new property for message type? + Debug.Assert(message.GetType().IsAssignableTo(typeof(HubInvocationMessage))); Message = message; } diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs index a7e87d2b8bda..540ea462e199 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests/Internal/MessageBufferTests.cs @@ -2,11 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.IO.Pipelines; +using System.Text.Json; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.InternalTesting; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Protocol; -using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Time.Testing; @@ -169,6 +170,62 @@ public async Task UnAckedMessageResentOnReconnect() Assert.False(messageBuffer.ShouldProcessMessage(CompletionMessage.WithResult("1", null))); } + // Regression test for https://github.com/dotnet/aspnetcore/issues/55575 + [Fact] + public async Task UnAckedSerializedMessageResentOnReconnect() + { + var protocol = new JsonHubProtocol(); + var connection = new TestConnectionContext(); + var pipes = DuplexPipe.CreateConnectionPair(new PipeOptions(), new PipeOptions()); + connection.Transport = pipes.Transport; + using var messageBuffer = new MessageBuffer(connection, protocol, bufferLimit: 1000, NullLogger.Instance); + + var invocationMessage = new SerializedHubMessage([new SerializedMessage(protocol.Name, + protocol.GetMessageBytes(new InvocationMessage("method1", [1])))]); + await messageBuffer.WriteAsync(invocationMessage, default); + + var res = await pipes.Application.Input.ReadAsync(); + + var buffer = res.Buffer; + Assert.True(protocol.TryParseMessage(ref buffer, new TestBinder(), out var message)); + var parsedMessage = Assert.IsType(message); + Assert.Equal("method1", parsedMessage.Target); + Assert.Equal(1, ((JsonElement)Assert.Single(parsedMessage.Arguments)).GetInt32()); + + pipes.Application.Input.AdvanceTo(buffer.Start); + + DuplexPipe.UpdateConnectionPair(ref pipes, connection); + await messageBuffer.ResendAsync(pipes.Transport.Output); + + Assert.True(messageBuffer.ShouldProcessMessage(PingMessage.Instance)); + Assert.True(messageBuffer.ShouldProcessMessage(CompletionMessage.WithResult("1", null))); + Assert.True(messageBuffer.ShouldProcessMessage(new SequenceMessage(1))); + + res = await pipes.Application.Input.ReadAsync(); + + buffer = res.Buffer; + Assert.True(protocol.TryParseMessage(ref buffer, new TestBinder(), out message)); + var seqMessage = Assert.IsType(message); + Assert.Equal(1, seqMessage.SequenceId); + + pipes.Application.Input.AdvanceTo(buffer.Start); + + res = await pipes.Application.Input.ReadAsync(); + + buffer = res.Buffer; + Assert.True(protocol.TryParseMessage(ref buffer, new TestBinder(), out message)); + parsedMessage = Assert.IsType(message); + Assert.Equal("method1", parsedMessage.Target); + Assert.Equal(1, ((JsonElement)Assert.Single(parsedMessage.Arguments)).GetInt32()); + + pipes.Application.Input.AdvanceTo(buffer.Start); + + messageBuffer.ShouldProcessMessage(new SequenceMessage(1)); + + Assert.True(messageBuffer.ShouldProcessMessage(PingMessage.Instance)); + Assert.False(messageBuffer.ShouldProcessMessage(CompletionMessage.WithResult("1", null))); + } + [Fact] public async Task AckedMessageNotResentOnReconnect() { diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs index 63445379ac35..46ac0ded803b 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs @@ -1,17 +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.Threading.Tasks; +using System.Net.WebSockets; using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.InternalTesting; using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.AspNetCore.SignalR.Tests; -using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests; @@ -211,7 +209,105 @@ public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLit } } - private static HubConnection CreateConnection(string url, HttpTransportType transportType, IHubProtocol protocol, ILoggerFactory loggerFactory, string userName = null) + [ConditionalTheory] + [SkipIfDockerNotPresent] + [InlineData("messagepack")] + [InlineData("json")] + public async Task StatefulReconnectPreservesMessageFromOtherServer(string protocolName) + { + using (StartVerifiableLog()) + { + var protocol = HubProtocolHelpers.GetHubProtocol(protocolName); + + ClientWebSocket innerWs = null; + WebSocketWrapper ws = null; + TaskCompletionSource reconnectTcs = null; + TaskCompletionSource startedReconnectTcs = null; + + var connection = CreateConnection(_serverFixture.FirstServer.Url + "/stateful", HttpTransportType.WebSockets, protocol, LoggerFactory, + customizeConnection: builder => + { + builder.WithStatefulReconnect(); + builder.Services.Configure(o => + { + // Replace the websocket creation for the first connection so we can make the client think there was an ungraceful closure + // Which will trigger the stateful reconnect flow + o.WebSocketFactory = async (context, token) => + { + if (reconnectTcs is null) + { + reconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + startedReconnectTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + } + else + { + startedReconnectTcs.SetResult(); + // We only want to wait on the reconnect, not the initial connection attempt + await reconnectTcs.Task.DefaultTimeout(); + } + + innerWs = new ClientWebSocket(); + ws = new WebSocketWrapper(innerWs); + await innerWs.ConnectAsync(context.Uri, token); + + _ = Task.Run(async () => + { + try + { + while (innerWs.State == WebSocketState.Open) + { + var buffer = new byte[1024]; + var res = await innerWs.ReceiveAsync(buffer, default); + ws.SetReceiveResult((res, buffer.AsMemory(0, res.Count))); + } + } + // Log but ignore receive errors, that likely just means the connection closed + catch (Exception ex) + { + Logger.LogInformation(ex, "Error while reading from inner websocket"); + } + }); + + return ws; + }; + }); + }); + var secondConnection = CreateConnection(_serverFixture.SecondServer.Url + "/stateful", HttpTransportType.WebSockets, protocol, LoggerFactory); + + var tcs = new TaskCompletionSource(); + connection.On("SendToAll", message => tcs.TrySetResult(message)); + + var tcs2 = new TaskCompletionSource(); + secondConnection.On("SendToAll", message => tcs2.TrySetResult(message)); + + await connection.StartAsync().DefaultTimeout(); + await secondConnection.StartAsync().DefaultTimeout(); + + // Close first connection before the second connection sends a message to all clients + await ws.CloseOutputAsync(WebSocketCloseStatus.InternalServerError, statusDescription: null, default); + await startedReconnectTcs.Task.DefaultTimeout(); + + // Send to all clients, since both clients are on different servers this means the backplane will be used + // And we want to test that messages are still preserved for stateful reconnect purposes when a client disconnects + // But is on a different server from the original message sender. + await secondConnection.SendAsync("SendToAll", "test message").DefaultTimeout(); + + // Check that second connection still receives the message + Assert.Equal("test message", await tcs2.Task.DefaultTimeout()); + Assert.False(tcs.Task.IsCompleted); + + // allow first connection to reconnect + reconnectTcs.SetResult(); + + // Check that first connection received the message once it reconnected + Assert.Equal("test message", await tcs.Task.DefaultTimeout()); + + await connection.DisposeAsync().DefaultTimeout(); + } + } + + private static HubConnection CreateConnection(string url, HttpTransportType transportType, IHubProtocol protocol, ILoggerFactory loggerFactory, string userName = null, + Action customizeConnection = null) { var hubConnectionBuilder = new HubConnectionBuilder() .WithLoggerFactory(loggerFactory) @@ -225,6 +321,8 @@ private static HubConnection CreateConnection(string url, HttpTransportType tran hubConnectionBuilder.Services.AddSingleton(protocol); + customizeConnection?.Invoke(hubConnectionBuilder); + return hubConnectionBuilder.Build(); } @@ -253,4 +351,67 @@ public static IEnumerable TransportTypesAndProtocolTypes } } } + + internal sealed class WebSocketWrapper : WebSocket + { + private readonly WebSocket _inner; + private TaskCompletionSource<(WebSocketReceiveResult, ReadOnlyMemory)> _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); + + public WebSocketWrapper(WebSocket inner) + { + _inner = inner; + } + + public override WebSocketCloseStatus? CloseStatus => _inner.CloseStatus; + + public override string CloseStatusDescription => _inner.CloseStatusDescription; + + public override WebSocketState State => _inner.State; + + public override string SubProtocol => _inner.SubProtocol; + + public override void Abort() + { + _inner.Abort(); + } + + public override Task CloseAsync(WebSocketCloseStatus closeStatus, string statusDescription, CancellationToken cancellationToken) + { + return _inner.CloseAsync(closeStatus, statusDescription, cancellationToken); + } + + public override Task CloseOutputAsync(WebSocketCloseStatus closeStatus, string statusDescription, CancellationToken cancellationToken) + { + _receiveTcs.TrySetException(new IOException("force reconnect")); + return Task.CompletedTask; + } + + public override void Dispose() + { + _inner.Dispose(); + } + + public void SetReceiveResult((WebSocketReceiveResult, ReadOnlyMemory) result) + { + _receiveTcs.SetResult(result); + } + + public override async Task ReceiveAsync(ArraySegment buffer, CancellationToken cancellationToken) + { + var res = await _receiveTcs.Task; + // Handle zero-byte reads + if (buffer.Count == 0) + { + return res.Item1; + } + _receiveTcs = new(TaskCreationOptions.RunContinuationsAsynchronously); + res.Item2.CopyTo(buffer); + return res.Item1; + } + + public override Task SendAsync(ArraySegment buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + { + return _inner.SendAsync(buffer, messageType, endOfMessage, cancellationToken); + } + } } diff --git a/src/SignalR/server/StackExchangeRedis/test/Startup.cs b/src/SignalR/server/StackExchangeRedis/test/Startup.cs index 3fd461aed98e..1b55bd1cff53 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Startup.cs +++ b/src/SignalR/server/StackExchangeRedis/test/Startup.cs @@ -33,6 +33,7 @@ public void Configure(IApplicationBuilder app) app.UseEndpoints(endpoints => { endpoints.MapHub("/echo"); + endpoints.MapHub("/stateful", o => o.AllowStatefulReconnects = true); }); } diff --git a/src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs b/src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs new file mode 100644 index 000000000000..1efa1d84fcd0 --- /dev/null +++ b/src/SignalR/server/StackExchangeRedis/test/StatefulHub.cs @@ -0,0 +1,12 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests; + +public class StatefulHub : Hub +{ + public Task SendToAll(string message) + { + return Clients.All.SendAsync("SendToAll", message); + } +} From 9de40de20739c1a44cfc6be44f5a830dcf9dbd8a Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Tue, 15 Apr 2025 19:08:31 +0000 Subject: [PATCH 072/181] Merged PR 49095: [internal/release/9.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 code validation to prevent errors. - `src/Shared/ThrowHelpers/ArgumentNullThrowHelper.cs`: Added `ThrowIfNullOrEmpty` method to validate non-null and non-empty strings. - `src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs`: Added tests for null and empty recovery code validation. - `src/Identity/Extensions.Stores/src/UserStoreBase.cs`: Updated recovery code validation to use `ThrowIfNullOrEmpty`. --- .../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 f55c2b48340d..fe7eb5ee9003 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 c3a9589c934492365d4e83b325cc116688ea93be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 16:59:48 -0700 Subject: [PATCH 073/181] Update dependencies from https://github.com/dotnet/extensions build 20250411.2 (#61483) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.5.0-preview.1.25204.8 -> To Version 9.5.0-preview.1.25211.2 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ---- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9bc1f58f58ef..66f5d2f4634d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cb54ee7b04e..b10251954363 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/extensions - 2fbf99834c90a20b950b44b3dcdd2b264b422a59 + f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13 - + https://github.com/dotnet/extensions - 2fbf99834c90a20b950b44b3dcdd2b264b422a59 + f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e3289667b6bc..52c3ef65cf41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.4 9.0.4 - 9.5.0-preview.1.25204.8 - 9.5.0-preview.1.25204.8 + 9.5.0-preview.1.25211.2 + 9.5.0-preview.1.25211.2 9.0.4 9.0.4 From e2a5562d031be844d541b103d730fa470c30bb8f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Apr 2025 21:01:22 +0000 Subject: [PATCH 074/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250415.9 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.4 -> To Version 9.0.5 --- NuGet.config | 8 +- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 218 insertions(+), 222 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1fc7bdf212ed..1ba076884cfc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,9 @@ - - + - @@ -31,11 +29,9 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa450d888753..cc755e5e2123 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 55700ce7d51b40ea546f817fd4947a6bae50be07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index e3289667b6bc..9e3a61401f4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4-servicing.25163.5 - 9.0.4-servicing.25163.5 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5-servicing.25215.9 + 9.0.5-servicing.25215.9 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 - 9.0.4-servicing.25163.5 - 9.0.4 + 9.0.5-servicing.25215.9 + 9.0.5 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 9.5.0-preview.1.25204.8 9.5.0-preview.1.25204.8 From 6331c787a2261a58c929ccc28b52472003bda9c7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Apr 2025 22:33:57 +0000 Subject: [PATCH 075/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250416.4 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.4 -> To Version 9.0.5 --- 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 1ba076884cfc..83bb3a983858 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc755e5e2123..9df4f6f82277 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 55700ce7d51b40ea546f817fd4947a6bae50be07 + 6765359588e8b38bab2a7974db9398432703828f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9e3a61401f4f..bcc467fcdc4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.5.0-preview.1.25204.8 9.5.0-preview.1.25204.8 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 - 9.0.4 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 + 9.0.5 4.11.0-3.24554.2 4.11.0-3.24554.2 From e790785537843b11cb41c1c97640ddc50a8a99d6 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Tue, 29 Apr 2025 19:53:12 +0200 Subject: [PATCH 076/181] [Identity] Fix Identity UI asset definitions (#59100) --- .../Microsoft.AspNetCore.Identity.UI.csproj | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index a43b8e998eec..d36fe09d60c4 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -90,11 +90,27 @@ %(RecursiveDir)%(FileName)%(Extension) - - + + - + + @@ -106,7 +122,7 @@ > - + - - + + + Discovered + + + Discovered + + + + + - + - + From ebd501118e3b4f6a2c810a94b73aec933fa3f831 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 29 Apr 2025 20:39:09 +0000 Subject: [PATCH 077/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250429.1 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.5 -> To Version 9.0.5 --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83bb3a983858..c7dcc030b66a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,13 @@ + + + + - + @@ -30,9 +34,13 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17a58cbdce67..b28f17d0a998 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6765359588e8b38bab2a7974db9398432703828f + 353095d925da575e269d6b0492671022b3707353 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 1ea3aec6f8d700d9d3747f729db30652ec922428 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 7 May 2025 16:59:16 -0700 Subject: [PATCH 078/181] Update branding to 9.0.6 (#61831) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 52c3ef65cf41..8da99add4520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 5 + 6 - true + false 8.0.1 *-* + + + + - + @@ -34,13 +38,17 @@ - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b28f17d0a998..bf13baab7e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 353095d925da575e269d6b0492671022b3707353 + 1c5361081414ce2055986dca34083aa2f1541c08 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 30f307266c9c..af8543c56086 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.5.0-preview.1.25211.2 9.5.0-preview.1.25211.2 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 4.11.0-3.24554.2 4.11.0-3.24554.2 From 18e6b4df87dffd5948137a95c101cfb7fc0f50dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 08:51:35 -0700 Subject: [PATCH 080/181] [release/9.0] (deps): Bump src/submodules/googletest (#61762) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `52204f7` to `04ee1b4`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/52204f78f94d7512df1f0f3bea1d47437a2c3a58...04ee1b4f2aefdffb0135d7cf2a2c519fe50dabe4) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-version: 04ee1b4f2aefdffb0135d7cf2a2c519fe50dabe4 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 52204f78f94d..04ee1b4f2aef 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 52204f78f94d7512df1f0f3bea1d47437a2c3a58 +Subproject commit 04ee1b4f2aefdffb0135d7cf2a2c519fe50dabe4 From 53d14234976e78753f3656fe59d2b3d9203ee5fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 08:52:09 -0700 Subject: [PATCH 081/181] Update dependencies from https://github.com/dotnet/arcade build 20250425.6 (#61714) 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.25208.6 -> To Version 9.0.0-beta.25225.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- .../core-templates/job/source-build.yml | 2 ++ .../job/source-index-stage1.yml | 4 ++-- .../core-templates/steps/source-build.yml | 1 + global.json | 4 ++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b10251954363..4c61795dd4bb 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 - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 8da99add4520..f2c709d571ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25208.6 - 9.0.0-beta.25208.6 - 9.0.0-beta.25208.6 - 9.0.0-beta.25208.6 + 9.0.0-beta.25225.6 + 9.0.0-beta.25225.6 + 9.0.0-beta.25225.6 + 9.0.0-beta.25225.6 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6ede..d47f09d58fd9 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -26,6 +26,8 @@ parameters: # Specifies the build script to invoke to perform the build in the repo. The default # './build.sh' should work for typical Arcade repositories, but this is customizable for # difficult situations. + # buildArguments: '' + # Specifies additional build arguments to pass to the build script. # jobProperties: {} # A list of job properties to inject at the top level, for potential extensibility beyond # container and pool. diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 205fb5b3a395..8b833332b3ee 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240522.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb7f6..37133b55b754 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -79,6 +79,7 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ + ${{ parameters.platform.buildArguments }} \ $officialBuildArgs \ $internalRuntimeDownloadArgs \ $internalRestoreArgs \ diff --git a/global.json b/global.json index 00bc10af2c7f..5a6b453d4852 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25225.6" } } From 594d7d5b9d6378c2073da15451dd9a6ddfa65781 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 08:53:09 -0700 Subject: [PATCH 082/181] [release/9.0] Update dependencies from dotnet/extensions (#61571) * Update dependencies from https://github.com/dotnet/extensions build 20250418.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.5.0-preview.1.25211.2 -> To Version 9.5.0-preview.1.25218.1 * Update dependencies from https://github.com/dotnet/extensions build 20250423.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.5.0-preview.1.25211.2 -> To Version 9.5.0-preview.1.25223.1 * Update dependencies from https://github.com/dotnet/extensions build 20250502.3 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.5.0-preview.1.25211.2 -> To Version 9.5.0-preview.1.25252.3 --------- Co-authored-by: dotnet-maestro[bot] --- 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 4c61795dd4bb..25c36eba24cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/extensions - f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13 + 9652f798f2de4e40c088075d00d185628c8e3dbb - + https://github.com/dotnet/extensions - f0a1a79c0b0dfb724edfcbcef82cb22d44e13e13 + 9652f798f2de4e40c088075d00d185628c8e3dbb https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index f2c709d571ae..44c514e623a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.4 9.0.4 - 9.5.0-preview.1.25211.2 - 9.5.0-preview.1.25211.2 + 9.5.0-preview.1.25252.3 + 9.5.0-preview.1.25252.3 9.0.4 9.0.4 From f8e794352dfb2376d12e52eb0765db4c796c9c83 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 10:14:44 -0700 Subject: [PATCH 083/181] [release/9.0] Forwarded Headers Middleware: Ignore XForwardedHeaders from Unknown Proxy (#61622) * Header Spoofing Proof for XForwardedProto, XForwardedHost and XForwardedPrefix * Fix Header Spoofing --------- Co-authored-by: Yannic Hamann --- .../src/ForwardedHeadersMiddleware.cs | 18 ++--- .../test/ForwardedHeadersMiddlewareTest.cs | 73 +++++++++++++++++++ 2 files changed, 82 insertions(+), 9 deletions(-) diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs index 6b2a118cb132..d00ccfa0a13d 100644 --- a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs +++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs @@ -220,19 +220,19 @@ public void ApplyForwarders(HttpContext context) for (; entriesConsumed < sets.Length; entriesConsumed++) { var set = sets[entriesConsumed]; - if (checkFor) + // For the first instance, allow remoteIp to be null for servers that don't support it natively. + if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address)) { - // For the first instance, allow remoteIp to be null for servers that don't support it natively. - if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address)) + // Stop at the first unknown remote IP, but still apply changes processed so far. + if (_logger.IsEnabled(LogLevel.Debug)) { - // Stop at the first unknown remote IP, but still apply changes processed so far. - if (_logger.IsEnabled(LogLevel.Debug)) - { - _logger.LogDebug(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort); - } - break; + _logger.LogDebug(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort); } + break; + } + if (checkFor) + { if (IPEndPoint.TryParse(set.IpAndPortText, out var parsedEndPoint)) { applyChanges = true; diff --git a/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs index aa33a191e7b7..4fd1341acc45 100644 --- a/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs +++ b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs @@ -962,6 +962,79 @@ public async Task AllOptionsDisabledRequestDoesntChange() Assert.Equal(PathString.Empty, context.Request.PathBase); } + [Theory] + [InlineData(ForwardedHeaders.XForwardedFor, false)] + [InlineData(ForwardedHeaders.XForwardedFor, true)] + [InlineData(ForwardedHeaders.XForwardedHost, false)] + [InlineData(ForwardedHeaders.XForwardedHost, true)] + [InlineData(ForwardedHeaders.XForwardedProto, false)] + [InlineData(ForwardedHeaders.XForwardedProto, true)] + [InlineData(ForwardedHeaders.XForwardedPrefix, false)] + [InlineData(ForwardedHeaders.XForwardedPrefix, true)] + public async Task IgnoreXForwardedHeadersFromUnknownProxy(ForwardedHeaders forwardedHeaders, bool unknownProxy) + { + using var host = new HostBuilder() + .ConfigureWebHost(webHostBuilder => + { + webHostBuilder + .UseTestServer() + .Configure(app => + { + var options = new ForwardedHeadersOptions + { + ForwardedHeaders = forwardedHeaders + }; + if (!unknownProxy) + { + var proxy = IPAddress.Parse("10.0.0.1"); + options.KnownProxies.Add(proxy); + } + app.UseForwardedHeaders(options); + }); + }).Build(); + + await host.StartAsync(); + + var server = host.GetTestServer(); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-Forwarded-For"] = "11.111.111.11"; + c.Request.Headers["X-Forwarded-Host"] = "testhost"; + c.Request.Headers["X-Forwarded-Proto"] = "Protocol"; + c.Request.Headers["X-Forwarded-Prefix"] = "/pathbase"; + c.Connection.RemoteIpAddress = IPAddress.Parse("10.0.0.1"); + c.Connection.RemotePort = 99; + }); + + if (unknownProxy) + { + Assert.Equal("10.0.0.1", context.Connection.RemoteIpAddress.ToString()); + Assert.Equal("localhost", context.Request.Host.ToString()); + Assert.Equal("http", context.Request.Scheme); + Assert.Equal(PathString.Empty, context.Request.PathBase); + } + else + { + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor)) + { + Assert.Equal("11.111.111.11", context.Connection.RemoteIpAddress.ToString()); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost)) + { + Assert.Equal("testhost", context.Request.Host.ToString()); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto)) + { + Assert.Equal("Protocol", context.Request.Scheme); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedPrefix)) + { + Assert.Equal("/pathbase", context.Request.PathBase); + } + } + } + [Fact] public async Task PartiallyEnabledForwardsPartiallyChangesRequest() { From 53ffaaae95c7564e72150fe9dc764388272cc1d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 15:20:13 -0700 Subject: [PATCH 084/181] Update dependencies from https://github.com/dotnet/extensions build 20250510.2 (#61877) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.5.0-preview.1.25252.3 -> To Version 9.6.0-preview.1.25260.2 Co-authored-by: dotnet-maestro[bot] --- 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 25c36eba24cc..dd715eac42c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/extensions - 9652f798f2de4e40c088075d00d185628c8e3dbb + 90dd3fdbb6056d8ae177ab102b779e3922a88981 - + https://github.com/dotnet/extensions - 9652f798f2de4e40c088075d00d185628c8e3dbb + 90dd3fdbb6056d8ae177ab102b779e3922a88981 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 44c514e623a9..c432aefc9be7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.4 9.0.4 - 9.5.0-preview.1.25252.3 - 9.5.0-preview.1.25252.3 + 9.6.0-preview.1.25260.2 + 9.6.0-preview.1.25260.2 9.0.4 9.0.4 From fe77a3236e655908ea058a69e05a3e201d35b662 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 May 2025 16:49:22 -0700 Subject: [PATCH 085/181] Update dependencies from https://github.com/dotnet/arcade build 20250505.5 (#61892) 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.25225.6 -> To Version 9.0.0-beta.25255.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd715eac42c0..8208c6115e73 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 - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 1cfa39f82d00b3659a3d367bc344241946e10681 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index c432aefc9be7..c9219a45bf47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25225.6 - 9.0.0-beta.25225.6 - 9.0.0-beta.25225.6 - 9.0.0-beta.25225.6 + 9.0.0-beta.25255.5 + 9.0.0-beta.25255.5 + 9.0.0-beta.25255.5 + 9.0.0-beta.25255.5 9.0.0-alpha.1.24575.1 diff --git a/global.json b/global.json index 5a6b453d4852..0f016bc4d19a 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25225.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5" } } From 3d6c910b51216ff9e11ac9d84f3c4aba333090bf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 13 May 2025 15:25:24 -0700 Subject: [PATCH 086/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 28c064e01b73..f29ce0f83682 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - - + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 @@ -120,279 +120,279 @@ - 9.0.4 + 9.0.5 - - - + + + - - - + + + - - - + + + - 9.0.4 + 9.0.5 - - - + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - - - - - + + + + + - 9.0.4 + 9.0.5 - - - - - + + + + + - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - - - - - + + + + + + - 9.0.4 + 9.0.5 - - - + + + - 9.0.4 + 9.0.5 - - - + + + - + - - - + + + - - - + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - + - + - 9.0.4 + 9.0.5 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - - + + - - + + - - + + - 9.0.4 + 9.0.5 - + - + - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 @@ -401,83 +401,83 @@ - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.4 + 9.0.5 - - + + - + - - + + - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 @@ -493,510 +493,510 @@ - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - - - + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - + + - - + + - - + + - 9.0.4 + 9.0.5 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.4 + 9.0.5 - - + + - + - - + + - - - + + + - 9.0.4 + 9.0.5 - + - + - + - 9.0.4 + 9.0.5 - + - + - + - 9.0.4 + 9.0.5 - + - + - + - 9.0.4 + 9.0.5 - - - - + + + + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - + + - - + + - - + + - 9.0.4 + 9.0.5 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.4 + 9.0.5 - - + + - - + + - - + + - 9.0.4 + 9.0.5 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - - + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - + - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - - - + + + - - - + + + - - - + + + - 9.0.4 + 9.0.5 - - - + + + - - - + + + - - - + + + - 9.0.4 + 9.0.5 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - - - + + + - - + + - - - + + + - 9.0.4 + 9.0.5 - 9.0.4 + 9.0.5 - + - 9.0.4 + 9.0.5 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 71537197d7a9..689d369cce19 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 7d0bf4698a00..95abba11f18f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 6 - false + true 8.0.1 *-* - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf13baab7e08..e6b1e634a96e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1c5361081414ce2055986dca34083aa2f1541c08 + e1f90ca7619a7d543d75b46862dc3e5f57a576f2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 3e30f814ec8eb733e46e312ac1e50bbf2b88d377 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 May 2025 20:23:41 +0000 Subject: [PATCH 088/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250515.4 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.5 -> To Version 9.0.6 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2e4027f782c3..76bd5abdedb6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6b1e634a96e..f7eac1f114e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e1f90ca7619a7d543d75b46862dc3e5f57a576f2 + f5f55a296da25fa685f913935b08c9fc53d4d499 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From f127672ef2e88d50e99f3b990ea4f11d99aaaf39 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 May 2025 21:47:25 +0000 Subject: [PATCH 089/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250515.7 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.5 -> To Version 9.0.6 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76bd5abdedb6..4a23e267530d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7eac1f114e3..0f4859c39790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f5f55a296da25fa685f913935b08c9fc53d4d499 + a2f72933d3efdec72b01bf3b803cea7b69233402 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 9654afee497a12fd57da14b5c9cf43aacd2f49fd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 May 2025 01:05:02 +0000 Subject: [PATCH 090/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250515.10 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.5 -> To Version 9.0.6 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a23e267530d..450c0375defb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f4859c39790..5c4174d223ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a2f72933d3efdec72b01bf3b803cea7b69233402 + 9038314cd05970826635f655a809d0fd7a4a338a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 207bcfb9aa6a37cee82728f7d546c18b7baee31f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 May 2025 14:46:57 +0000 Subject: [PATCH 091/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250516.5 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.5 -> To Version 9.0.6 --- NuGet.config | 20 +-- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 218 insertions(+), 234 deletions(-) diff --git a/NuGet.config b/NuGet.config index 450c0375defb..b60cdbaa2b1c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,15 +4,7 @@ - - - - - - - - - + @@ -41,15 +33,7 @@ - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c4174d223ea..d3167331f0f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 9038314cd05970826635f655a809d0fd7a4a338a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + ee65eb43cd4028e5ec18877f3d9c997faf4671f0 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index af8543c56086..910eed1a5988 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5-servicing.25215.9 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5-servicing.25215.9 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5-servicing.25215.9 - 9.0.5-servicing.25215.9 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6-servicing.25266.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6-servicing.25266.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6-servicing.25266.5 + 9.0.6-servicing.25266.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 - 9.0.5-servicing.25215.9 - 9.0.5 + 9.0.6-servicing.25266.5 + 9.0.6 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 - 9.0.5 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 + 9.0.6 9.5.0-preview.1.25211.2 9.5.0-preview.1.25211.2 From 6d041d4adbf35ce4c2e7c765218ff05551dd389f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 May 2025 23:32:34 +0000 Subject: [PATCH 092/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250516.13 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.6 -> To Version 9.0.6 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index b60cdbaa2b1c..4436f9255ddc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88dde1c2e627..2729ae499661 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ee65eb43cd4028e5ec18877f3d9c997faf4671f0 + 3875b54e7b10b10606b105340199946d0b877754 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 8da785e2065a..c246614af85c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.6 9.0.6 9.0.6 - 9.0.6-servicing.25266.5 + 9.0.6-servicing.25266.13 9.0.6 9.0.6 9.0.6 @@ -95,7 +95,7 @@ 9.0.6 9.0.6 9.0.6 - 9.0.6-servicing.25266.5 + 9.0.6-servicing.25266.13 9.0.6 9.0.6 9.0.6 @@ -111,8 +111,8 @@ 9.0.6 9.0.6 9.0.6 - 9.0.6-servicing.25266.5 - 9.0.6-servicing.25266.5 + 9.0.6-servicing.25266.13 + 9.0.6-servicing.25266.13 9.0.6 9.0.6 9.0.6 @@ -134,7 +134,7 @@ 9.0.6 9.0.6 - 9.0.6-servicing.25266.5 + 9.0.6-servicing.25266.13 9.0.6 9.0.6 From c9825f1e53340fa742e35c4f78c96083568c86b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 May 2025 01:57:44 +0000 Subject: [PATCH 093/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250516.7 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.6 -> To Version 9.0.6 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4436f9255ddc..64edb3888279 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 2729ae499661..533640d10c8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9038314cd05970826635f655a809d0fd7a4a338a + 8751e6d519fda94d5154187358765311ed4a4e84 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From dd27d3639bfb983544d25bcaee681ac955faa556 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 20 May 2025 20:54:44 +0000 Subject: [PATCH 094/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250520.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.6 -> To Version 9.0.6 --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64edb3888279..7f2ca0406502 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,10 @@ + - + @@ -30,9 +31,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 533640d10c8b..005e5605f253 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8751e6d519fda94d5154187358765311ed4a4e84 + 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 0542b041117341e0c85341f75ba068cc57204964 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:08:23 -0700 Subject: [PATCH 095/181] Update branding to 9.0.7 (#62242) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 95abba11f18f..b83fee5eb6ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 6 + 7 - true + false 8.0.1 *-* - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e728c7a10e85..d46a2bb0a06e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/extensions - 90dd3fdbb6056d8ae177ab102b779e3922a88981 + 2ab21ec6d6fa7371f19d8485215d4c0c99f9c338 - + https://github.com/dotnet/extensions - 90dd3fdbb6056d8ae177ab102b779e3922a88981 + 2ab21ec6d6fa7371f19d8485215d4c0c99f9c338 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index b83fee5eb6ef..aa194756b6f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.5 9.0.5 - 9.6.0-preview.1.25260.2 - 9.6.0-preview.1.25260.2 + 9.6.0-preview.1.25279.1 + 9.6.0-preview.1.25279.1 9.0.5 9.0.5 From c8ed9823bb95bcff81563ccaab83932e242d01ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:30:14 -0700 Subject: [PATCH 099/181] [release/9.0] Update dependencies from dotnet/arcade (#61945) * Update dependencies from https://github.com/dotnet/arcade build 20250513.5 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.25255.5 -> To Version 9.0.0-beta.25263.5 * Update dependencies from https://github.com/dotnet/arcade build 20250516.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.25255.5 -> To Version 9.0.0-beta.25266.2 * Update dependencies from https://github.com/dotnet/arcade build 20250521.1 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.25255.5 -> To Version 9.0.0-beta.25271.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d46a2bb0a06e..22514070f171 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 - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 - + https://github.com/dotnet/arcade - 1cfa39f82d00b3659a3d367bc344241946e10681 + 086a1771875b63404b4a710d27250fe384dc2810 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index aa194756b6f4..a0f869f9855b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 - 9.0.0-beta.25255.5 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 + 9.0.0-beta.25271.1 9.0.0-alpha.1.24575.1 diff --git a/global.json b/global.json index f50567b4c1a7..0a7be8bfd9f7 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1" } } From 2a7307f4d839544417bde6fa52b5fde50dbfb2e3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 4 Jun 2025 12:49:06 -0700 Subject: [PATCH 100/181] Update Alpine helix references (#62240) --- eng/targets/Helix.Common.props | 4 ++-- eng/targets/Helix.targets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 8a0fdf3481d3..1ba8ba99dbe3 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -2,7 +2,7 @@ (AlmaLinux.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-helix-amd64 - (Alpine.318.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64 + (Alpine.321.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64 (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 (Fedora.41.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41-helix (Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64 @@ -42,7 +42,7 @@ - + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 70e01877befa..0aab28ef20cc 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -17,7 +17,7 @@ $(HelixQueueAlmaLinux8); - $(HelixQueueAlpine318); + $(HelixQueueAlpine); $(HelixQueueDebian12); $(HelixQueueFedora40); $(HelixQueueMariner); From 9f58d66752cb65caf1b73de12b4a365f6b8fdfca Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 4 Jun 2025 12:52:26 -0700 Subject: [PATCH 101/181] [IIS] Manually parse exe bitness (#61894) (#62038) --- .../CommonLib/HostFxrResolver.cpp | 72 +++++++++++++++---- .../CommonLib/HostFxrResolver.h | 2 + src/Servers/IIS/build/Build.Lib.Settings | 2 +- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp index 9b12cd0132b4..8fb960261590 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp @@ -197,7 +197,7 @@ HostFxrResolver::TryGetHostFxrPath( size_t size = MAX_PATH * 2; hostfxrPath.resize(size); - get_hostfxr_parameters params; + get_hostfxr_parameters params{}; params.size = sizeof(get_hostfxr_parameters); params.assembly_path = applicationPath.c_str(); params.dotnet_root = dotnetRoot.c_str(); @@ -393,7 +393,7 @@ HostFxrResolver::GetAbsolutePathToDotnetFromHostfxr(const fs::path& hostfxrPath) // Tries to call where.exe to find the location of dotnet.exe. // Will check that the bitness of dotnet matches the current // worker process bitness. -// Returns true if a valid dotnet was found, else false.R +// Returns true if a valid dotnet was found, else false. // std::optional HostFxrResolver::InvokeWhereToFindDotnet() @@ -415,8 +415,7 @@ HostFxrResolver::InvokeWhereToFindDotnet() DWORD dwExitCode; STRU struDotnetSubstring; STRU struDotnetLocationsString; - DWORD dwNumBytesRead; - DWORD dwBinaryType; + DWORD dwNumBytesRead = 0; INT index = 0; INT prevIndex = 0; std::optional result; @@ -521,14 +520,7 @@ HostFxrResolver::InvokeWhereToFindDotnet() LOG_INFOF(L"Processing entry '%ls'", struDotnetSubstring.QueryStr()); - if (LOG_LAST_ERROR_IF(!GetBinaryTypeW(struDotnetSubstring.QueryStr(), &dwBinaryType))) - { - continue; - } - - LOG_INFOF(L"Binary type %d", dwBinaryType); - - if (fIsCurrentProcess64Bit == (dwBinaryType == SCS_64BIT_BINARY)) + if (fIsCurrentProcess64Bit == IsX64(struDotnetSubstring.QueryStr())) { // The bitness of dotnet matched with the current worker process bitness. return std::make_optional(struDotnetSubstring.QueryStr()); @@ -539,6 +531,62 @@ HostFxrResolver::InvokeWhereToFindDotnet() return result; } +BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) +{ + // Errors while reading from the file shouldn't throw unless + // file.exception(bits) is set + std::ifstream file(dotnetPath, std::ios::binary); + if (!file.is_open()) + { + LOG_TRACEF(L"Failed to open file %ls", dotnetPath); + return false; + } + + // Read the DOS header + IMAGE_DOS_HEADER dosHeader{}; + file.read(reinterpret_cast(&dosHeader), sizeof(dosHeader)); + if (dosHeader.e_magic != IMAGE_DOS_SIGNATURE) // 'MZ' + { + LOG_TRACEF(L"%ls is not a valid executable file (missing MZ header).", dotnetPath); + return false; + } + + // Seek to the PE header + file.seekg(dosHeader.e_lfanew, std::ios::beg); + + // Read the PE header + DWORD peSignature{}; + file.read(reinterpret_cast(&peSignature), sizeof(peSignature)); + if (peSignature != IMAGE_NT_SIGNATURE) // 'PE\0\0' + { + LOG_TRACEF(L"%ls is not a valid PE file (missing PE header).", dotnetPath); + return false; + } + + // Read the file header + IMAGE_FILE_HEADER fileHeader{}; + file.read(reinterpret_cast(&fileHeader), sizeof(fileHeader)); + + // Read the optional header magic field + WORD magic{}; + file.read(reinterpret_cast(&magic), sizeof(magic)); + + // Determine the architecture based on the magic value + if (magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + LOG_INFOF(L"%ls is 32-bit", dotnetPath); + return false; + } + else if (magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + LOG_INFOF(L"%ls is 64-bit", dotnetPath); + return true; + } + + LOG_INFOF(L"%ls is unknown architecture %i", dotnetPath, fileHeader.Machine); + return false; +} + std::optional HostFxrResolver::GetAbsolutePathToDotnetFromProgramFiles() { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h index 519f6df52c97..08ec650aec54 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h @@ -74,6 +74,8 @@ class HostFxrResolver const std::filesystem::path & requestedPath ); + static BOOL IsX64(const WCHAR* dotnetPath); + struct LocalFreeDeleter { void operator ()(_In_ LPWSTR* ptr) const diff --git a/src/Servers/IIS/build/Build.Lib.Settings b/src/Servers/IIS/build/Build.Lib.Settings index 0dcba8c2011a..9327eb363771 100644 --- a/src/Servers/IIS/build/Build.Lib.Settings +++ b/src/Servers/IIS/build/Build.Lib.Settings @@ -9,7 +9,7 @@ - false + true _LIB;%(PreprocessorDefinitions) true From 8e3e42f202cfa81fcb7947e2333b5e86246341e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jun 2025 19:05:45 +0000 Subject: [PATCH 102/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250605.5 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.6 -> To Version 9.0.7 --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7f2ca0406502..e8efedfc3fb9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,10 +5,11 @@ + - + @@ -31,10 +32,11 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 005e5605f253..7735460542f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 40b8656f6ad9b61fe973f9efa7f7e7c872b78cba + f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c246614af85c..dbaf0c54b47c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.6.0-preview.1.25260.2 9.6.0-preview.1.25260.2 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 4.11.0-3.24554.2 4.11.0-3.24554.2 From e0694e1d222f408ed0f537bd45af1c590b2d586b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jun 2025 20:39:37 +0000 Subject: [PATCH 103/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250605.10 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.6 -> To Version 9.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e8efedfc3fb9..97044710f3ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7735460542f7..328b2cbec699 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f8e6ad2cf3a23ae30ca9f5c2208dd9ab6a3bed27 + ce4ffb1439d28e3de537607cb9067dcad1d50762 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From e021ea683da6b9a4182edf1927198510f1b3be27 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Jun 2025 22:17:26 +0000 Subject: [PATCH 104/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250605.13 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.6 -> To Version 9.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97044710f3ce..ef15b3e955ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 328b2cbec699..f1376baabab4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ce4ffb1439d28e3de537607cb9067dcad1d50762 + 5b74edd702169f7b55f8799f8fcc5f7f8e35560c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From d36c5c62d174ccbea41aad9bd21a93d53f20ac08 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Fri, 6 Jun 2025 21:27:03 +0000 Subject: [PATCH 105/181] Merged PR 50151: Harden Cookie parsing Harden cookie parsing. --- .../Headers/test/CookieHeaderValueTest.cs | 36 +++++++++++------ .../HeaderDictionaryTypeExtensionsTest.cs | 2 +- .../test/RequestCookiesCollectionTests.cs | 13 ++++-- src/Http/Shared/CookieHeaderParserShared.cs | 40 +++++++++++++++++-- 4 files changed, 72 insertions(+), 19 deletions(-) diff --git a/src/Http/Headers/test/CookieHeaderValueTest.cs b/src/Http/Headers/test/CookieHeaderValueTest.cs index 6623a8ed13dd..6ad2e962d005 100644 --- a/src/Http/Headers/test/CookieHeaderValueTest.cs +++ b/src/Http/Headers/test/CookieHeaderValueTest.cs @@ -75,7 +75,7 @@ public static TheoryData InvalidCookieValues } } - public static TheoryData, string?[]> ListOfCookieHeaderDataSet + public static TheoryData, string?[]> ListOfStrictCookieHeaderDataSet { get { @@ -94,19 +94,30 @@ public static TheoryData InvalidCookieValues dataset.Add(new[] { header1 }.ToList(), new[] { string1 }); dataset.Add(new[] { header1, header1 }.ToList(), new[] { string1, string1 }); - dataset.Add(new[] { header1, header1 }.ToList(), new[] { string1, null, "", " ", ";", " , ", string1 }); dataset.Add(new[] { header2 }.ToList(), new[] { string2 }); dataset.Add(new[] { header1, header2 }.ToList(), new[] { string1, string2 }); - dataset.Add(new[] { header1, header2 }.ToList(), new[] { string1 + ", " + string2 }); dataset.Add(new[] { header2, header1 }.ToList(), new[] { string2 + "; " + string1 }); dataset.Add(new[] { header1, header2, header3, header4 }.ToList(), new[] { string1, string2, string3, string4 }); - dataset.Add(new[] { header1, header2, header3, header4 }.ToList(), new[] { string.Join(",", string1, string2, string3, string4) }); dataset.Add(new[] { header1, header2, header3, header4 }.ToList(), new[] { string.Join(";", string1, string2, string3, string4) }); return dataset; } } + public static TheoryData, string?[]> ListOfCookieHeaderDataSet + { + get + { + var header1 = new CookieHeaderValue("name1", "n1=v1&n2=v2&n3=v3"); + var string1 = "name1=n1=v1&n2=v2&n3=v3"; + + var dataset = new TheoryData, string?[]>(); + dataset.Concat(ListOfStrictCookieHeaderDataSet); + dataset.Add(new[] { header1, header1 }.ToList(), new[] { string1, null, "", " ", ";", " , ", string1 }); + return dataset; + } + } + public static TheoryData?, string?[]> ListWithInvalidCookieHeaderDataSet { get @@ -127,18 +138,19 @@ public static TheoryData InvalidCookieValues dataset.Add(new[] { header1 }.ToList(), new[] { validString1, invalidString1 }); dataset.Add(new[] { header1 }.ToList(), new[] { validString1, null, "", " ", ";", " , ", invalidString1 }); dataset.Add(new[] { header1 }.ToList(), new[] { invalidString1, null, "", " ", ";", " , ", validString1 }); - dataset.Add(new[] { header1 }.ToList(), new[] { validString1 + ", " + invalidString1 }); - dataset.Add(new[] { header2 }.ToList(), new[] { invalidString1 + ", " + validString2 }); + dataset.Add(null, new[] { validString1 + ", " }); + dataset.Add(null, new[] { invalidString1 + ", " + validString2 }); dataset.Add(new[] { header1 }.ToList(), new[] { invalidString1 + "; " + validString1 }); dataset.Add(new[] { header2 }.ToList(), new[] { validString2 + "; " + invalidString1 }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { invalidString1, validString1, validString2, validString3 }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { validString1, invalidString1, validString2, validString3 }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { validString1, validString2, invalidString1, validString3 }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { validString1, validString2, validString3, invalidString1 }); - dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", invalidString1, validString1, validString2, validString3) }); - dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", validString1, invalidString1, validString2, validString3) }); - dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", validString1, validString2, invalidString1, validString3) }); - dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(",", validString1, validString2, validString3, invalidString1) }); + dataset.Add(null, new[] { string.Join(",", invalidString1, validString1, validString2, validString3) }); + dataset.Add(null, new[] { string.Join(",", validString1, invalidString1, validString2, validString3) }); + dataset.Add(null, new[] { string.Join(",", validString1, validString2, invalidString1, validString3) }); + dataset.Add(null, new[] { string.Join(",", validString1, validString2, validString3, invalidString1) }); + dataset.Add(null, new[] { string.Join(",", validString1, validString2, validString3) }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(";", invalidString1, validString1, validString2, validString3) }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(";", validString1, invalidString1, validString2, validString3) }); dataset.Add(new[] { header1, header2, header3 }.ToList(), new[] { string.Join(";", validString1, validString2, invalidString1, validString3) }); @@ -248,7 +260,7 @@ public void CookieHeaderValue_ParseList_AcceptsValidValues(IList cookies, string[] input) { var results = CookieHeaderValue.ParseStrictList(input); @@ -267,7 +279,7 @@ public void CookieHeaderValue_TryParseList_AcceptsValidValues(IList cookies, string[] input) { var result = CookieHeaderValue.TryParseStrictList(input, out var results); diff --git a/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs b/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs index 33ecc3ff1ea8..b4071866534b 100644 --- a/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs +++ b/src/Http/Http.Extensions/test/HeaderDictionaryTypeExtensionsTest.cs @@ -214,7 +214,7 @@ public void GetListT_StringWithQualityHeaderValidValue_Success() public void GetListT_CookieHeaderValue_Success() { var context = new DefaultHttpContext(); - context.Request.Headers.Cookie = "cookie1=a,cookie2=b"; + context.Request.Headers.Cookie = "cookie1=a;cookie2=b"; var result = context.Request.GetTypedHeaders().GetList(HeaderNames.Cookie); diff --git a/src/Http/Http/test/RequestCookiesCollectionTests.cs b/src/Http/Http/test/RequestCookiesCollectionTests.cs index e08a53f29711..d584f2db0599 100644 --- a/src/Http/Http/test/RequestCookiesCollectionTests.cs +++ b/src/Http/Http/test/RequestCookiesCollectionTests.cs @@ -33,11 +33,18 @@ public void ParseManyCookies() [Theory] [InlineData(",", null)] [InlineData(";", null)] - [InlineData("er=dd,cc,bb", new[] { "dd" })] - [InlineData("er=dd,err=cc,errr=bb", new[] { "dd", "cc", "bb" })] - [InlineData("errorcookie=dd,:(\"sa;", new[] { "dd" })] + [InlineData("er=dd,cc,bb", null)] + [InlineData("er=dd,err=cc,errr=bb", null)] + [InlineData("errorcookie=dd,:(\"sa;", null)] [InlineData("s;", null)] [InlineData("er=;,err=,errr=\\,errrr=\"", null)] + [InlineData("a@a=a;", null)] + [InlineData("a@ a=a;", null)] + [InlineData("a a=a;", null)] + [InlineData(",a=a;", null)] + [InlineData(",a=a", null)] + [InlineData("a=a;,b=b", new []{ "a" })] // valid cookie followed by invalid cookie + [InlineData(",a=a;b=b", new[] { "b" })] // invalid cookie followed by valid cookie public void ParseInvalidCookies(string cookieToParse, string[] expectedCookieValues) { var cookies = RequestCookieCollection.Parse(new StringValues(new[] { cookieToParse })); diff --git a/src/Http/Shared/CookieHeaderParserShared.cs b/src/Http/Shared/CookieHeaderParserShared.cs index e4b1d83e519a..0eb1c64d533a 100644 --- a/src/Http/Shared/CookieHeaderParserShared.cs +++ b/src/Http/Shared/CookieHeaderParserShared.cs @@ -89,6 +89,17 @@ public static bool TryParseValue(StringSegment value, ref int index, bool suppor if (!TryGetCookieLength(value, ref current, out parsedName, out parsedValue)) { + var separatorIndex = value.IndexOf(';', current); + if (separatorIndex > 0) + { + // Skip the invalid values and keep trying. + index = separatorIndex; + } + else + { + // No more separators, so we're done. + index = value.Length; + } return false; } @@ -97,6 +108,17 @@ public static bool TryParseValue(StringSegment value, ref int index, bool suppor // If we support multiple values and we've not reached the end of the string, then we must have a separator. if ((separatorFound && !supportsMultipleValues) || (!separatorFound && (current < value.Length))) { + var separatorIndex = value.IndexOf(';', current); + if (separatorIndex > 0) + { + // Skip the invalid values and keep trying. + index = separatorIndex; + } + else + { + // No more separators, so we're done. + index = value.Length; + } return false; } @@ -112,7 +134,7 @@ private static int GetNextNonEmptyOrWhitespaceIndex(StringSegment input, int sta separatorFound = false; var current = startIndex + HttpRuleParser.GetWhitespaceLength(input, startIndex); - if ((current == input.Length) || (input[current] != ',' && input[current] != ';')) + if (current == input.Length || input[current] != ';') { return current; } @@ -125,8 +147,8 @@ private static int GetNextNonEmptyOrWhitespaceIndex(StringSegment input, int sta if (skipEmptyValues) { - // Most headers only split on ',', but cookies primarily split on ';' - while ((current < input.Length) && ((input[current] == ',') || (input[current] == ';'))) + // Cookies are split on ';' + while (current < input.Length && input[current] == ';') { current++; // skip delimiter. current = current + HttpRuleParser.GetWhitespaceLength(input, current); @@ -136,6 +158,18 @@ private static int GetNextNonEmptyOrWhitespaceIndex(StringSegment input, int sta return current; } + /* + * https://www.rfc-editor.org/rfc/rfc6265#section-4.1.1 + * cookie-pair = cookie-name "=" cookie-value + * cookie-name = token + * token = 1* + separators = "(" | ")" | "<" | ">" | "@" + | "," | ";" | ":" | "\" | <"> + | "/" | "[" | "]" | "?" | "=" + | "{" | "}" | SP | HT + CTL = + */ // name=value; name="value" internal static bool TryGetCookieLength(StringSegment input, ref int offset, [NotNullWhen(true)] out StringSegment? parsedName, [NotNullWhen(true)] out StringSegment? parsedValue) { From 543d8e329fee0d36e19562d03eef14344fddb6a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 15:49:00 -0700 Subject: [PATCH 106/181] [release/9.0] Associate tagged keys with entries so replacements are not evicted (#62248) * Adding an entryId for taggedEntries so that replaced items in the cache do not have their tags removed on eviction. Fixes #61524 * Removing string allocation and refactoring to ValueTuple. * Code cleanup. * Using named ValueTuples * Adding assertion and deconstruction. * Refactoring tuple naming to PascalCase. Other code style changes. * Refactor tagged entries to use a record type. * Update src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs Co-authored-by: Rick Anderson <3605364+Rick-Anderson@users.noreply.github.com> * Update src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs Co-authored-by: Rick Anderson <3605364+Rick-Anderson@users.noreply.github.com> --------- Co-authored-by: Benjamin Grabkowitz Co-authored-by: Rick Anderson <3605364+Rick-Anderson@users.noreply.github.com> --- .../src/Memory/MemoryOutputCacheStore.cs | 36 +++++++++++------- .../test/MemoryOutputCacheStoreTests.cs | 37 +++++++++++++++++++ 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs b/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs index a75546b6793f..38a38069b32c 100644 --- a/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs +++ b/src/Middleware/OutputCaching/src/Memory/MemoryOutputCacheStore.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; +using System.Linq; using Microsoft.Extensions.Caching.Memory; namespace Microsoft.AspNetCore.OutputCaching.Memory; @@ -9,7 +10,7 @@ namespace Microsoft.AspNetCore.OutputCaching.Memory; internal sealed class MemoryOutputCacheStore : IOutputCacheStore { private readonly MemoryCache _cache; - private readonly Dictionary> _taggedEntries = new(); + private readonly Dictionary> _taggedEntries = []; private readonly object _tagsLock = new(); internal MemoryOutputCacheStore(MemoryCache cache) @@ -20,7 +21,7 @@ internal MemoryOutputCacheStore(MemoryCache cache) } // For testing - internal Dictionary> TaggedEntries => _taggedEntries; + internal Dictionary> TaggedEntries => _taggedEntries.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Select(t => t.Key).ToHashSet()); public ValueTask EvictByTagAsync(string tag, CancellationToken cancellationToken) { @@ -30,7 +31,7 @@ public ValueTask EvictByTagAsync(string tag, CancellationToken cancellationToken { if (_taggedEntries.TryGetValue(tag, out var keys)) { - if (keys != null && keys.Count > 0) + if (keys is { Count: > 0 }) { // If MemoryCache changed to run eviction callbacks inline in Remove, iterating over keys could throw // To prevent allocating a copy of the keys we check if the eviction callback ran, @@ -40,7 +41,7 @@ public ValueTask EvictByTagAsync(string tag, CancellationToken cancellationToken while (i > 0) { var oldCount = keys.Count; - foreach (var key in keys) + foreach (var (key, _) in keys) { _cache.Remove(key); i--; @@ -74,6 +75,8 @@ public ValueTask SetAsync(string key, byte[] value, string[]? tags, TimeSpan val ArgumentNullException.ThrowIfNull(key); ArgumentNullException.ThrowIfNull(value); + var entryId = Guid.NewGuid(); + if (tags != null) { // Lock with SetEntry() to prevent EvictByTagAsync() from trying to remove a tag whose entry hasn't been added yet. @@ -90,27 +93,27 @@ public ValueTask SetAsync(string key, byte[] value, string[]? tags, TimeSpan val if (!_taggedEntries.TryGetValue(tag, out var keys)) { - keys = new HashSet(); + keys = new HashSet(); _taggedEntries[tag] = keys; } Debug.Assert(keys != null); - keys.Add(key); + keys.Add(new TaggedEntry(key, entryId)); } - SetEntry(key, value, tags, validFor); + SetEntry(key, value, tags, validFor, entryId); } } else { - SetEntry(key, value, tags, validFor); + SetEntry(key, value, tags, validFor, entryId); } return ValueTask.CompletedTask; } - void SetEntry(string key, byte[] value, string[]? tags, TimeSpan validFor) + private void SetEntry(string key, byte[] value, string[]? tags, TimeSpan validFor, Guid entryId) { Debug.Assert(key != null); @@ -120,22 +123,25 @@ void SetEntry(string key, byte[] value, string[]? tags, TimeSpan validFor) Size = value.Length }; - if (tags != null && tags.Length > 0) + if (tags is { Length: > 0 }) { // Remove cache keys from tag lists when the entry is evicted - options.RegisterPostEvictionCallback(RemoveFromTags, tags); + options.RegisterPostEvictionCallback(RemoveFromTags, (tags, entryId)); } _cache.Set(key, value, options); } - void RemoveFromTags(object key, object? value, EvictionReason reason, object? state) + private void RemoveFromTags(object key, object? value, EvictionReason reason, object? state) { - var tags = state as string[]; + Debug.Assert(state != null); + + var (tags, entryId) = ((string[] Tags, Guid EntryId))state; Debug.Assert(tags != null); Debug.Assert(tags.Length > 0); Debug.Assert(key is string); + Debug.Assert(entryId != Guid.Empty); lock (_tagsLock) { @@ -143,7 +149,7 @@ void RemoveFromTags(object key, object? value, EvictionReason reason, object? st { if (_taggedEntries.TryGetValue(tag, out var tagged)) { - tagged.Remove((string)key); + tagged.Remove(new TaggedEntry((string)key, entryId)); // Remove the collection if there is no more keys in it if (tagged.Count == 0) @@ -154,4 +160,6 @@ void RemoveFromTags(object key, object? value, EvictionReason reason, object? st } } } + + private record TaggedEntry(string Key, Guid EntryId); } diff --git a/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs b/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs index e8c809911add..c1ad1d708f4b 100644 --- a/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs +++ b/src/Middleware/OutputCaching/test/MemoryOutputCacheStoreTests.cs @@ -197,6 +197,43 @@ public async Task ExpiredEntries_AreRemovedFromTags() Assert.Single(tag2s); } + [Fact] + public async Task ReplacedEntries_AreNotRemovedFromTags() + { + var testClock = new TestMemoryOptionsClock { UtcNow = DateTimeOffset.UtcNow }; + var cache = new MemoryCache(new MemoryCacheOptions { SizeLimit = 1000, Clock = testClock, ExpirationScanFrequency = TimeSpan.FromMilliseconds(1) }); + var store = new MemoryOutputCacheStore(cache); + var value = "abc"u8.ToArray(); + + await store.SetAsync("a", value, new[] { "tag1", "tag2" }, TimeSpan.FromMilliseconds(5), default); + await store.SetAsync("a", value, new[] { "tag1" }, TimeSpan.FromMilliseconds(20), default); + + testClock.Advance(TimeSpan.FromMilliseconds(10)); + + // Trigger background expiration by accessing the cache. + _ = cache.Get("a"); + + var resulta = await store.GetAsync("a", default); + + Assert.NotNull(resulta); + + HashSet tag1s, tag2s; + + // Wait for the tag2 HashSet to be removed by the background expiration thread. + + using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30)); + + while (store.TaggedEntries.TryGetValue("tag2", out tag2s) && !cts.IsCancellationRequested) + { + await Task.Yield(); + } + + store.TaggedEntries.TryGetValue("tag1", out tag1s); + + Assert.Null(tag2s); + Assert.Single(tag1s); + } + [Theory] [InlineData(null)] public async Task Store_Throws_OnInvalidTag(string tag) From 8315d8e1173fd6ca2d1574979ce45d09c0b801d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 14:14:33 -0700 Subject: [PATCH 107/181] [release/9.0] Block test that is failing after switching to latest-chrome (#62283) * Block test failing after switching to latest-chrome version. * Update issue number --------- Co-authored-by: Ilona Tomkowicz --- .../FormHandlingTests/FormWithParentBindingContextTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index 792e222f4183..53fd2addd404 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1287,7 +1287,7 @@ public void CanBindToFormWithFiles() } [Theory] - [InlineData(true)] + // [InlineData(true)] QuarantinedTest: https://github.com/dotnet/aspnetcore/issues/61882 [InlineData(false)] public void CanUseFormWithMethodGet(bool suppressEnhancedNavigation) { From a13b26751e906bbbea13d02b2f2d36173f64f3d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 14:20:17 -0700 Subject: [PATCH 108/181] Update dependencies from https://github.com/dotnet/arcade build 20250602.2 (#62281) 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.25271.1 -> To Version 9.0.0-beta.25302.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- .../core-templates/post-build/post-build.yml | 6 +++++ eng/common/post-build/publish-using-darc.ps1 | 7 +++++- global.json | 4 ++-- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22514070f171..4b196816f9cd 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 - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/arcade - 086a1771875b63404b4a710d27250fe384dc2810 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index a0f869f9855b..b64a0ea8ddec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 - 9.0.0-beta.25271.1 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 + 9.0.0-beta.25302.2 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 454fd75c7aff..a8c0bd3b9214 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -44,6 +44,11 @@ parameters: displayName: Publish installers and checksums type: boolean default: true + + - name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false - name: SDLValidationParameters type: object @@ -312,5 +317,6 @@ stages: -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true + -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 90b58e32a87b..a261517ef906 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,7 +5,8 @@ param( [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, + [Parameter(Mandatory=$false)][string] $RequireDefaultChannels ) try { @@ -33,6 +34,10 @@ try { if ("false" -eq $WaitPublishingFinish) { $optionalParams.Add("--no-wait") | Out-Null } + + if ("true" -eq $RequireDefaultChannels) { + $optionalParams.Add("--default-channels-required") | Out-Null + } & $darc add-build-to-channel ` --id $buildId ` diff --git a/global.json b/global.json index 0a7be8bfd9f7..1b7bc3a1ac56 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2" } } From bd99997ac72930d857dfd5feb89c143ab31d22d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 14:23:22 -0700 Subject: [PATCH 109/181] Update dependencies from https://github.com/dotnet/extensions build 20250606.2 (#62282) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.6.0-preview.1.25279.1 -> To Version 9.7.0-preview.1.25306.2 Co-authored-by: dotnet-maestro[bot] --- 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 4b196816f9cd..95704858308d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 - + https://github.com/dotnet/extensions - 2ab21ec6d6fa7371f19d8485215d4c0c99f9c338 + 04bd58871e6dd4dfd2fbcf5f0365c89d2466fffe - + https://github.com/dotnet/extensions - 2ab21ec6d6fa7371f19d8485215d4c0c99f9c338 + 04bd58871e6dd4dfd2fbcf5f0365c89d2466fffe https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index b64a0ea8ddec..59cf4294cef6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.5 9.0.5 - 9.6.0-preview.1.25279.1 - 9.6.0-preview.1.25279.1 + 9.7.0-preview.1.25306.2 + 9.7.0-preview.1.25306.2 9.0.5 9.0.5 From 9b05cef2cc6c85c0430e57b4b5f98459ad860db4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jun 2025 08:09:31 +0000 Subject: [PATCH 110/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250610.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 9.0.6 -> To Version 9.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef15b3e955ee..6095562fb0ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1376baabab4..22d6e0a1012a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b74edd702169f7b55f8799f8fcc5f7f8e35560c + 140ef0b0d09225f4cf6d53639046ef5f8b310b5c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 7381ec75ae70b49fa168cff9524d3d7ce65b0648 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jun 2025 09:42:18 +0000 Subject: [PATCH 111/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250611.4 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.6 -> To Version 9.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6095562fb0ed..a8ca5b1d0536 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22d6e0a1012a..d15c1c36b20d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 140ef0b0d09225f4cf6d53639046ef5f8b310b5c + e58d6106fd351e3d5079331702892bd56de92b72 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 4d98e62f70295f26701661a4f1dda08f07115db4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Jun 2025 11:19:28 +0000 Subject: [PATCH 112/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250610.29 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.6 -> To Version 9.0.7 --- NuGet.config | 8 +- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 218 insertions(+), 222 deletions(-) diff --git a/NuGet.config b/NuGet.config index a8ca5b1d0536..e6170c5b7e5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -35,9 +33,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d15c1c36b20d..e4b0beeaa6d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore e58d6106fd351e3d5079331702892bd56de92b72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + d2042a18ee63b2021128e1e5674d79eae9cd4932 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index dbaf0c54b47c..998b983a24d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6-servicing.25266.13 - 9.0.6-servicing.25266.13 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7-servicing.25310.29 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7-servicing.25310.29 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7-servicing.25310.29 + 9.0.7-servicing.25310.29 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 - 9.0.6-servicing.25266.13 - 9.0.6 + 9.0.7-servicing.25310.29 + 9.0.7 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 - 9.0.6 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 + 9.0.7 9.6.0-preview.1.25260.2 9.6.0-preview.1.25260.2 From 7a6961ec7cb535219ae59930ae73ded7a26ef8d2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 11 Jun 2025 13:56:56 -0700 Subject: [PATCH 113/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index f29ce0f83682..3fd723523160 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - - + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 @@ -120,279 +120,279 @@ - 9.0.5 + 9.0.6 - - - + + + - - - + + + - - - + + + - 9.0.5 + 9.0.6 - - - + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - - - - - + + + + + - 9.0.5 + 9.0.6 - - - - - + + + + + - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - - - - - + + + + + + - 9.0.5 + 9.0.6 - - - + + + - 9.0.5 + 9.0.6 - - - + + + - + - - - + + + - - - + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - + - + - 9.0.5 + 9.0.6 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - - + + - - + + - - + + - 9.0.5 + 9.0.6 - + - + - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 @@ -401,83 +401,83 @@ - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.5 + 9.0.6 - - + + - + - - + + - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 @@ -493,510 +493,510 @@ - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - - - + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - + + - - + + - - + + - 9.0.5 + 9.0.6 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.5 + 9.0.6 - - + + - + - - + + - - - + + + - 9.0.5 + 9.0.6 - + - + - + - 9.0.5 + 9.0.6 - + - + - + - 9.0.5 + 9.0.6 - + - + - + - 9.0.5 + 9.0.6 - - - - + + + + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - + + - - + + - - + + - 9.0.5 + 9.0.6 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.5 + 9.0.6 - - + + - - + + - - + + - 9.0.5 + 9.0.6 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - - + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - + - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - - - + + + - - - + + + - - - + + + - 9.0.5 + 9.0.6 - - - + + + - - - + + + - - - + + + - 9.0.5 + 9.0.6 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - - - + + + - - + + - - - + + + - 9.0.5 + 9.0.6 - 9.0.5 + 9.0.6 - + - 9.0.5 + 9.0.6 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 689d369cce19..4c39c3649c99 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 76f037991072..2c913c13f975 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7 - false + true 8.0.1 *-* - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4b0beeaa6d8..2a2b4ec4b0e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d2042a18ee63b2021128e1e5674d79eae9cd4932 + 1bafa9761541b20cded99398ce1a8630d09f43fd https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 998b983a24d3..2204e3f12027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 9.0.7 @@ -95,7 +95,7 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 9.0.7 @@ -111,8 +111,8 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25310.29 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 9.0.7 @@ -134,7 +134,7 @@ 9.0.7 9.0.7 - 9.0.7-servicing.25310.29 + 9.0.7-servicing.25311.18 9.0.7 9.0.7 From 0484e26200cc754a86e177255735268a652fd16b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Jun 2025 22:27:04 +0000 Subject: [PATCH 115/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250616.5 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.7 -> To Version 9.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84d84d7306f0..1d79830e4ed5 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 711df77b0945..728f12d84c91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e58d6106fd351e3d5079331702892bd56de92b72 + 6c58042f4ce29effc070230b43b518ed4cf66983 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 634d5763b7e437a82b2d2adfedcd6f66c789ba50 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 00:08:30 +0000 Subject: [PATCH 116/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250616.16 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.7 -> To Version 9.0.7 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d79830e4ed5..85a4a092f9af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 728f12d84c91..b55d0c83fdae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1bafa9761541b20cded99398ce1a8630d09f43fd + 3c298d9f00936d651cc47d221762474e25277672 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 695e0b9d6ddb..9b36b8ee3df4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 9.0.7 @@ -95,7 +95,7 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 9.0.7 @@ -111,8 +111,8 @@ 9.0.7 9.0.7 9.0.7 - 9.0.7-servicing.25311.18 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 9.0.7 @@ -134,7 +134,7 @@ 9.0.7 9.0.7 - 9.0.7-servicing.25311.18 + 9.0.7-servicing.25316.16 9.0.7 9.0.7 From c6213af89547cd80b1c71c806db431a5e1813566 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Jun 2025 03:57:52 +0000 Subject: [PATCH 117/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250616.7 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.7 -> To Version 9.0.7 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85a4a092f9af..1d1ed063d794 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 b55d0c83fdae..45cd5c7c30f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 6c58042f4ce29effc070230b43b518ed4cf66983 + 67d253c17619e6ba325e5390905ea2a13cc7f532 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 199bf109fcebde9d7cb387fed4badd0951796977 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 3 Jul 2025 21:31:44 -0700 Subject: [PATCH 118/181] Update branding to 9.0.8 (#62561) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c913c13f975..1f3e5ed51c6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 7 + 8 - true + false 8.0.1 *-* - + + + + @@ -30,10 +33,13 @@ + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45cd5c7c30f3..b8b76e2c8283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 67d253c17619e6ba325e5390905ea2a13cc7f532 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + 94e3a9c5ac7d490aa970a8620bb335d1e9096730 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 8929774bac06..6a5f861dbd04 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7-servicing.25316.16 - 9.0.7-servicing.25316.16 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8-servicing.25353.13 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8-servicing.25353.13 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8-servicing.25353.13 + 9.0.8-servicing.25353.13 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 - 9.0.7-servicing.25316.16 - 9.0.7 + 9.0.8-servicing.25353.13 + 9.0.8 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 9.7.0-preview.1.25306.2 9.7.0-preview.1.25306.2 From 52895e921fdcebddbf96945323e41655859d9f42 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 8 Jul 2025 15:13:15 -0700 Subject: [PATCH 120/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 3fd723523160..ffeba29a66d4 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - - + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 @@ -120,279 +120,279 @@ - 9.0.6 + 9.0.7 - - - + + + - - - + + + - - - + + + - 9.0.6 + 9.0.7 - - - + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - - - - - + + + + + - 9.0.6 + 9.0.7 - - - - - + + + + + - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - - - - - + + + + + + - 9.0.6 + 9.0.7 - - - + + + - 9.0.6 + 9.0.7 - - - + + + - + - - - + + + - - - + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - + - + - 9.0.6 + 9.0.7 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - - + + - - + + - - + + - 9.0.6 + 9.0.7 - + - + - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 @@ -401,83 +401,83 @@ - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.6 + 9.0.7 - - + + - + - - + + - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 @@ -493,510 +493,510 @@ - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - - - + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - + + - - + + - - + + - 9.0.6 + 9.0.7 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.6 + 9.0.7 - - + + - + - - + + - - - + + + - 9.0.6 + 9.0.7 - + - + - + - 9.0.6 + 9.0.7 - + - + - + - 9.0.6 + 9.0.7 - + - + - + - 9.0.6 + 9.0.7 - - - - + + + + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - + + - - + + - - + + - 9.0.6 + 9.0.7 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.6 + 9.0.7 - - + + - - + + - - + + - 9.0.6 + 9.0.7 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - - + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - + - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - - - + + + - - - + + + - - - + + + - 9.0.6 + 9.0.7 - - - + + + - - - + + + - - - + + + - 9.0.6 + 9.0.7 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - - - + + + - - + + - - - + + + - 9.0.6 + 9.0.7 - 9.0.6 + 9.0.7 - + - 9.0.6 + 9.0.7 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 4c39c3649c99..3efad5672524 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 8929774bac06..a277d5b7d6f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 8 - false + true 8.0.1 *-* - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bc9e1e523e9..314523252673 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 - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 1f3e5ed51c6b..a733329256bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 - 9.0.0-beta.25302.2 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 + 9.0.0-beta.25325.4 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd513..abe80a2a0e09 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b166..f70261ed689b 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index df8d08a6315e..af226bcbc749 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4" } } From 3dc8bbccd1be21b6709d7068e003ebd0ba272aec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:24:45 -0700 Subject: [PATCH 122/181] [release/9.0] (deps): Bump src/submodules/googletest (#62521) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `e9092b1` to `c67de11`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/e9092b12dc3cf617d47578f13a1f64285cfa5b2f...c67de117379f4d1c889c7581a0a76aa0979c2083) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-version: c67de117379f4d1c889c7581a0a76aa0979c2083 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 e9092b12dc3c..c67de117379f 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit e9092b12dc3cf617d47578f13a1f64285cfa5b2f +Subproject commit c67de117379f4d1c889c7581a0a76aa0979c2083 From 7cffc04dd0c501308f8c72012dfae840ac7e369b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:26:17 -0700 Subject: [PATCH 123/181] [release/9.0] Quarantine HubConnectionCanSendAndReceiveGroupMessages test (#62563) * Initial plan for issue * Quarantine HubConnectionCanSendAndReceiveGroupMessages test Co-authored-by: javiercn <6995051+javiercn@users.noreply.github.com> * Fix QuarantinedTest attribute placement to follow standard pattern Co-authored-by: javiercn <6995051+javiercn@users.noreply.github.com> * Quarantine all five Redis end-to-end tests with issue #62435 Co-authored-by: javiercn <6995051+javiercn@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: javiercn <6995051+javiercn@users.noreply.github.com> --- src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs index 46ac0ded803b..f3501fb69c1e 100644 --- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs +++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs @@ -35,6 +35,7 @@ public RedisEndToEndTests(RedisServerFixture serverFixture) [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")] public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType transportType, string protocolName) { using (StartVerifiableLog()) @@ -55,6 +56,7 @@ public async Task HubConnectionCanSendAndReceiveMessages(HttpTransportType trans [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")] public async Task HubConnectionCanSendAndReceiveGroupMessages(HttpTransportType transportType, string protocolName) { using (StartVerifiableLog()) @@ -116,6 +118,7 @@ public async Task CanSendAndReceiveUserMessagesFromMultipleConnectionsWithSameUs [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")] public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconnects(HttpTransportType transportType, string protocolName) { // Regression test: @@ -145,6 +148,7 @@ public async Task CanSendAndReceiveUserMessagesWhenOneConnectionWithUserDisconne [ConditionalTheory] [SkipIfDockerNotPresent] [MemberData(nameof(TransportTypesAndProtocolTypes))] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")] public async Task HubConnectionCanSendAndReceiveGroupMessagesGroupNameWithPatternIsTreatedAsLiteral(HttpTransportType transportType, string protocolName) { using (StartVerifiableLog()) @@ -213,6 +217,7 @@ public async Task CanSendAndReceiveUserMessagesUserNameWithPatternIsTreatedAsLit [SkipIfDockerNotPresent] [InlineData("messagepack")] [InlineData("json")] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/62435")] public async Task StatefulReconnectPreservesMessageFromOtherServer(string protocolName) { using (StartVerifiableLog()) From 3444eab0849a998a79060c52786abdf1a6d3cb3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Jul 2025 16:26:58 -0700 Subject: [PATCH 124/181] [release/9.0] Update dependencies from dotnet/extensions (#62357) * Update dependencies from https://github.com/dotnet/extensions build 20250613.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.7.0-preview.1.25306.2 -> To Version 9.7.0-preview.1.25313.1 * Update dependencies from https://github.com/dotnet/extensions build 20250620.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.7.0-preview.1.25306.2 -> To Version 9.7.0-preview.1.25320.1 * Update dependencies from https://github.com/dotnet/extensions build 20250627.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.7.0-preview.1.25306.2 -> To Version 9.7.0-preview.1.25327.2 * Update dependencies from https://github.com/dotnet/extensions build 20250704.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.7.0-preview.1.25306.2 -> To Version 9.8.0-preview.1.25354.1 --------- Co-authored-by: dotnet-maestro[bot] --- 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 314523252673..a7f172e3418c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/extensions - 04bd58871e6dd4dfd2fbcf5f0365c89d2466fffe + f9c61b4a372e372b9a11914a7dbdbdca59a912fe - + https://github.com/dotnet/extensions - 04bd58871e6dd4dfd2fbcf5f0365c89d2466fffe + f9c61b4a372e372b9a11914a7dbdbdca59a912fe https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index a733329256bd..3623e8e7d13d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.6 9.0.6 - 9.7.0-preview.1.25306.2 - 9.7.0-preview.1.25306.2 + 9.8.0-preview.1.25354.1 + 9.8.0-preview.1.25354.1 9.0.6 9.0.6 From 255d4932e650779e84a3c7d22e4f88eb2aa8dcd6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Jul 2025 01:47:15 +0000 Subject: [PATCH 125/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250708.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 9.0.7 -> To Version 9.0.8 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 328ea15ffb43..1acaa5288e0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -33,10 +30,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8b76e2c8283..313a91e48326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 67d253c17619e6ba325e5390905ea2a13cc7f532 + 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6a5f861dbd04..db99f8f34e64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.7.0-preview.1.25306.2 9.7.0-preview.1.25306.2 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 - 9.0.7 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 + 9.0.8 4.11.0-3.24554.2 4.11.0-3.24554.2 From 698e00d6cf3bd87dc3382afc9bbdac031f6a2785 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Jul 2025 05:49:44 +0000 Subject: [PATCH 126/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250708.20 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.7 -> To Version 9.0.8 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1acaa5288e0b..31005e3ab60a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 313a91e48326..64a30d1f26fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 94e3a9c5ac7d490aa970a8620bb335d1e9096730 + a53bab00a73f56e1183242bec45cfd12c3b03758 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index db99f8f34e64..704dde2f57f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 9.0.8 @@ -95,7 +95,7 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 9.0.8 @@ -111,8 +111,8 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25353.13 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 9.0.8 @@ -134,7 +134,7 @@ 9.0.8 9.0.8 - 9.0.8-servicing.25353.13 + 9.0.8-servicing.25358.20 9.0.8 9.0.8 From 41f46507056f2331aeba1480ab5087b55c2bf804 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Jul 2025 13:19:33 +0000 Subject: [PATCH 127/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250709.3 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.7 -> To Version 9.0.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31005e3ab60a..0c86b59f7dae 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 64a30d1f26fe..9228a120bce8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 7f094542cbdaff9dc52d5f630bd9deb8dcb8d3e8 + 529bc68987624200b31d3369bb950f2701c823fa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 9da46959d0fc5c9e49ea6cb290e569034c67c4c2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Jul 2025 18:33:11 +0000 Subject: [PATCH 128/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250710.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 9.0.7 -> To Version 9.0.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0c86b59f7dae..34f47b67d2f4 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 9228a120bce8..453399c33b27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 529bc68987624200b31d3369bb950f2701c823fa + 3fc3809b8da9bca07f42fa4fa3b49e617514c22f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From f20d278e608a9aa68476b96905fc1ad3bd18c485 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 13 Jul 2025 02:21:56 +0000 Subject: [PATCH 129/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250711.3 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.8 -> To Version 9.0.8 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34f47b67d2f4..4db33642d434 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8696b120ef3c..09976f78c76d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a53bab00a73f56e1183242bec45cfd12c3b03758 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 8fd58cb3c559..bb92100841c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 9.0.8 @@ -95,7 +95,7 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 9.0.8 @@ -111,8 +111,8 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25358.20 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 9.0.8 @@ -134,7 +134,7 @@ 9.0.8 9.0.8 - 9.0.8-servicing.25358.20 + 9.0.8-servicing.25361.3 9.0.8 9.0.8 From d1d7c25e3f08e2fd8d4c9bd65afdd99d266810ae Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 14 Jul 2025 20:08:52 +0000 Subject: [PATCH 130/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250714.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.8 -> To Version 9.0.8 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4db33642d434..b13eb0ed238c 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 09976f78c76d..f4a78197c3a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3fc3809b8da9bca07f42fa4fa3b49e617514c22f + a050e0039986bf1f4133e4f6dcb05bd0bd077c9f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 0db16464937fc4f693be4817719cefb0f79b2c71 Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 14 Jul 2025 14:39:27 -0700 Subject: [PATCH 131/181] Add AppContext switch in patch release to opt-out of breaking behavior change in ForwardedHeaders middleware. (#62687) * Add AppContext switch in patch release to opt-out of breaking behavior change in ForwardedHeaders middleware. * env --- .../src/ForwardedHeadersMiddleware.cs | 30 ++++- .../test/ForwardedHeadersMiddlewareTest.cs | 123 ++++++++++++++++++ 2 files changed, 147 insertions(+), 6 deletions(-) diff --git a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs index d00ccfa0a13d..72cae1507a0e 100644 --- a/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs +++ b/src/Middleware/HttpOverrides/src/ForwardedHeadersMiddleware.cs @@ -21,6 +21,7 @@ public class ForwardedHeadersMiddleware private readonly ForwardedHeadersOptions _options; private readonly RequestDelegate _next; private readonly ILogger _logger; + private readonly bool _ignoreUnknownProxiesWithoutFor; private bool _allowAllHosts; private IList? _allowedHosts; @@ -63,6 +64,18 @@ public ForwardedHeadersMiddleware(RequestDelegate next, ILoggerFactory loggerFac _logger = loggerFactory.CreateLogger(); _next = next; + if (AppContext.TryGetSwitch("Microsoft.AspNetCore.HttpOverrides.IgnoreUnknownProxiesWithoutFor", out var enabled) + && enabled) + { + _ignoreUnknownProxiesWithoutFor = true; + } + + if (Environment.GetEnvironmentVariable("MICROSOFT_ASPNETCORE_HTTPOVERRIDES_IGNORE_UNKNOWN_PROXIES_WITHOUT_FOR") is string env + && (env.Equals("true", StringComparison.OrdinalIgnoreCase) || env.Equals("1"))) + { + _ignoreUnknownProxiesWithoutFor = true; + } + PreProcessHosts(); } @@ -220,15 +233,20 @@ public void ApplyForwarders(HttpContext context) for (; entriesConsumed < sets.Length; entriesConsumed++) { var set = sets[entriesConsumed]; - // For the first instance, allow remoteIp to be null for servers that don't support it natively. - if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address)) + // Opt-out of breaking change behavior where we now always check KnownProxies and KnownNetworks + // It used to be guarded by the ForwardedHeaders.XForwardedFor flag, but now we always check it. + if (!_ignoreUnknownProxiesWithoutFor || checkFor) { - // Stop at the first unknown remote IP, but still apply changes processed so far. - if (_logger.IsEnabled(LogLevel.Debug)) + // For the first instance, allow remoteIp to be null for servers that don't support it natively. + if (currentValues.RemoteIpAndPort != null && checkKnownIps && !CheckKnownAddress(currentValues.RemoteIpAndPort.Address)) { - _logger.LogDebug(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort); + // Stop at the first unknown remote IP, but still apply changes processed so far. + if (_logger.IsEnabled(LogLevel.Warning)) + { + _logger.LogWarning(1, "Unknown proxy: {RemoteIpAndPort}", currentValues.RemoteIpAndPort); + } + break; } - break; } if (checkFor) diff --git a/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs index 4fd1341acc45..627ad96a3cd6 100644 --- a/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs +++ b/src/Middleware/HttpOverrides/test/ForwardedHeadersMiddlewareTest.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; +using Microsoft.DotNet.RemoteExecutor; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -1035,6 +1036,128 @@ public async Task IgnoreXForwardedHeadersFromUnknownProxy(ForwardedHeaders forwa } } + [Theory] + [InlineData(ForwardedHeaders.XForwardedFor)] + [InlineData(ForwardedHeaders.XForwardedHost)] + [InlineData(ForwardedHeaders.XForwardedProto)] + [InlineData(ForwardedHeaders.XForwardedPrefix)] + public void AppContextDoesNotValidateUnknownProxyWithoutForwardedFor(ForwardedHeaders forwardedHeaders) + { + RemoteExecutor.Invoke(static async (forwardedHeadersName) => + { + Assert.True(Enum.TryParse(forwardedHeadersName, out var forwardedHeaders)); + AppContext.SetSwitch("Microsoft.AspNetCore.HttpOverrides.IgnoreUnknownProxiesWithoutFor", true); + using var host = new HostBuilder() + .ConfigureWebHost(webHostBuilder => + { + webHostBuilder + .UseTestServer() + .Configure(app => + { + var options = new ForwardedHeadersOptions + { + ForwardedHeaders = forwardedHeaders + }; + app.UseForwardedHeaders(options); + }); + }).Build(); + + await host.StartAsync(); + + var server = host.GetTestServer(); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-Forwarded-For"] = "11.111.111.11"; + c.Request.Headers["X-Forwarded-Host"] = "testhost"; + c.Request.Headers["X-Forwarded-Proto"] = "Protocol"; + c.Request.Headers["X-Forwarded-Prefix"] = "/pathbase"; + c.Connection.RemoteIpAddress = IPAddress.Parse("10.0.0.1"); + c.Connection.RemotePort = 99; + }); + + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor)) + { + // X-Forwarded-For ignored since 10.0.0.1 isn't in KnownProxies + Assert.Equal("10.0.0.1", context.Connection.RemoteIpAddress.ToString()); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost)) + { + Assert.Equal("testhost", context.Request.Host.ToString()); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto)) + { + Assert.Equal("Protocol", context.Request.Scheme); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedPrefix)) + { + Assert.Equal("/pathbase", context.Request.PathBase); + } + return RemoteExecutor.SuccessExitCode; + }, forwardedHeaders.ToString()).Dispose(); + } + + [Theory] + [InlineData(ForwardedHeaders.XForwardedFor)] + [InlineData(ForwardedHeaders.XForwardedHost)] + [InlineData(ForwardedHeaders.XForwardedProto)] + [InlineData(ForwardedHeaders.XForwardedPrefix)] + public void EnvVariableDoesNotValidateUnknownProxyWithoutForwardedFor(ForwardedHeaders forwardedHeaders) + { + RemoteExecutor.Invoke(static async (forwardedHeadersName) => + { + Assert.True(Enum.TryParse(forwardedHeadersName, out var forwardedHeaders)); + Environment.SetEnvironmentVariable("MICROSOFT_ASPNETCORE_HTTPOVERRIDES_IGNORE_UNKNOWN_PROXIES_WITHOUT_FOR", "true"); + using var host = new HostBuilder() + .ConfigureWebHost(webHostBuilder => + { + webHostBuilder + .UseTestServer() + .Configure(app => + { + var options = new ForwardedHeadersOptions + { + ForwardedHeaders = forwardedHeaders + }; + app.UseForwardedHeaders(options); + }); + }).Build(); + + await host.StartAsync(); + + var server = host.GetTestServer(); + + var context = await server.SendAsync(c => + { + c.Request.Headers["X-Forwarded-For"] = "11.111.111.11"; + c.Request.Headers["X-Forwarded-Host"] = "testhost"; + c.Request.Headers["X-Forwarded-Proto"] = "Protocol"; + c.Request.Headers["X-Forwarded-Prefix"] = "/pathbase"; + c.Connection.RemoteIpAddress = IPAddress.Parse("10.0.0.1"); + c.Connection.RemotePort = 99; + }); + + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedFor)) + { + // X-Forwarded-For ignored since 10.0.0.1 isn't in KnownProxies + Assert.Equal("10.0.0.1", context.Connection.RemoteIpAddress.ToString()); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedHost)) + { + Assert.Equal("testhost", context.Request.Host.ToString()); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedProto)) + { + Assert.Equal("Protocol", context.Request.Scheme); + } + if (forwardedHeaders.HasFlag(ForwardedHeaders.XForwardedPrefix)) + { + Assert.Equal("/pathbase", context.Request.PathBase); + } + return RemoteExecutor.SuccessExitCode; + }, forwardedHeaders.ToString()).Dispose(); + } + [Fact] public async Task PartiallyEnabledForwardsPartiallyChangesRequest() { From 7aa22b3f0e3f50cc654d3d6fe944f32c5dfbd5ea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 02:24:49 +0000 Subject: [PATCH 132/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250715.11 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.8 -> To Version 9.0.8 --- NuGet.config | 6 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 86 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index b13eb0ed238c..c2c07ce65149 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,11 @@ - + + @@ -30,10 +31,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4a78197c3a0..3dc6b2a15cf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index bb92100841c2..2800a53129a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 9.0.8 @@ -95,7 +95,7 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 9.0.8 @@ -111,8 +111,8 @@ 9.0.8 9.0.8 9.0.8 - 9.0.8-servicing.25361.3 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 9.0.8 @@ -134,7 +134,7 @@ 9.0.8 9.0.8 - 9.0.8-servicing.25361.3 + 9.0.8-servicing.25365.11 9.0.8 9.0.8 From ba66acdeccad406a1ce02800b442fbee405bd474 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Jul 2025 16:06:53 +0000 Subject: [PATCH 133/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250718.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.8 -> To Version 9.0.8 --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index c2c07ce65149..868daeb0446f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -31,8 +30,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dc6b2a15cf6..680a6e8fb963 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a050e0039986bf1f4133e4f6dcb05bd0bd077c9f + 3f7d40ec7be104358780955b3f0fea62495264dc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 7852997db1263971e55db7871c71e2f35e2f5b01 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Mon, 4 Aug 2025 12:03:03 -0700 Subject: [PATCH 134/181] Update branding to 9.0.9 (#63107) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 06a532daf18c..b342c5e4d219 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 8 + 9 - true + false 8.0.1 *-* - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b5557957a57..eafb6ee7bdd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/extensions - f9c61b4a372e372b9a11914a7dbdbdca59a912fe + c6529a0a68989cc881e4add4872c344917bc1ca9 - + https://github.com/dotnet/extensions - f9c61b4a372e372b9a11914a7dbdbdca59a912fe + c6529a0a68989cc881e4add4872c344917bc1ca9 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index b342c5e4d219..8ff9d65bbf4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.7 9.0.7 - 9.8.0-preview.1.25354.1 - 9.8.0-preview.1.25354.1 + 9.8.0-preview.1.25401.1 + 9.8.0-preview.1.25401.1 9.0.7 9.0.7 From 8a983948c66673605f6efb913243de6944cd3c85 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 4 Aug 2025 15:59:11 -0700 Subject: [PATCH 138/181] [release/9.0] Update Microsoft.Build versions (#62505) * Update Microsoft.Build versions * Update eng/Versions.props Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update SourceBuildPrebuiltBaseline.xml --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- eng/SourceBuildPrebuiltBaseline.xml | 7 +++++++ eng/Versions.props | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 8e86375464ef..2c8d20d3234b 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -46,6 +46,13 @@ + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 8ff9d65bbf4b..e7a7f85823fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -227,13 +227,12 @@ 6.0.0 1.1.1 - 17.4.0 + 17.8.29 1.2.0 - 17.4.0 - 17.4.0 - 17.4.0 + 17.8.29 + 17.8.29 + 17.8.29 1.2.6 - 17.4.0 - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index e7a7f85823fa..a4263f410f92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 + 9.0.0-beta.25380.1 9.0.0-alpha.1.24575.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22b49e09d09b..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index 50846f295c7d..16b496cf514f 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1" } } From 612bc0db8c535da9f9f3c5a25ca7aacaabffabdb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 18:04:48 -0700 Subject: [PATCH 140/181] Update SignalR Redis tests to use internal Docker Hub mirror (#63116) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Docker Hub is prone to rate limiting. To prevent this in dotnet builds we should use our internal container registry. Co-authored-by: Sébastien Ros --- src/SignalR/server/StackExchangeRedis/test/Docker.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SignalR/server/StackExchangeRedis/test/Docker.cs b/src/SignalR/server/StackExchangeRedis/test/Docker.cs index 76fa6440e672..41315734daea 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Docker.cs +++ b/src/SignalR/server/StackExchangeRedis/test/Docker.cs @@ -16,7 +16,8 @@ public class Docker { private static readonly string _exeSuffix = OperatingSystem.IsWindows() ? ".exe" : string.Empty; - private static readonly string _dockerContainerName = "redisTestContainer"; + private static readonly string _redisImageName = "dotnetdhmirror-f8bzbjakh8cga6ab.azurecr.io/library/redis:7.4"; + private static readonly string _dockerContainerName = "redisTestContainer74"; private static readonly string _dockerMonitorContainerName = _dockerContainerName + "Monitor"; private static readonly Lazy _instance = new Lazy(Create); @@ -112,7 +113,7 @@ void Run() // use static name 'redisTestContainer' so if the container doesn't get removed we don't keep adding more // use redis base docker image // 30 second timeout to allow redis image to be downloaded, should be a rare occurrence, only happening when a new version is released - RunProcessAndThrowIfFailed(_path, $"run --rm -p 6379:6379 --name {_dockerContainerName} -d redis", "redis", logger, TimeSpan.FromMinutes(1)); + RunProcessAndThrowIfFailed(_path, $"run --rm -p 6379:6379 --name {_dockerContainerName} -d {_redisImageName}", "redis", logger, TimeSpan.FromMinutes(1)); } } From 649cf2144d8cb7a4c3d78bf0090cc0d2182a429c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 09:13:02 -0700 Subject: [PATCH 141/181] [SignalR] Don't throw for message headers in Java client (#62783) Co-authored-by: Brennan --- .../microsoft/signalr/GsonHubProtocol.java | 9 +- .../signalr/GsonHubProtocolTest.java | 94 +++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java index 042ca484806f..4b0c8848e816 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/GsonHubProtocol.java @@ -126,7 +126,14 @@ public List parseMessages(ByteBuffer payload, InvocationBinder binde } break; case "headers": - throw new RuntimeException("Headers not implemented yet."); + // Parse headers as Map but don't store for now as it's unused + reader.beginObject(); + while (reader.hasNext()) { + reader.nextName(); // Read the key + reader.nextString(); // Read the value + } + reader.endObject(); + break; default: // Skip unknown property, allows new clients to still work with old protocols reader.skipValue(); 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 d696a74850eb..2ecfd483c7f5 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 @@ -527,4 +527,98 @@ public void canRegisterTypeAdaptorWithoutAffectingJsonProtocol() { assertEquals(3, (int) invocationMessage.getArguments()[0]); assertEquals("four", invocationMessage.getArguments()[1]); } + + @Test + public void canParseInvocationMessageWithHeaders() { + String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42],\"headers\":{\"a\":\"b\",\"c\":\"d\"}}\u001E"; + ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage); + TestBinder binder = new TestBinder(new Type[] { int.class }, null); + + List messages = hubProtocol.parseMessages(message, binder); + + assertNotNull(messages); + assertEquals(1, messages.size()); + + assertEquals(HubMessageType.INVOCATION, messages.get(0).getMessageType()); + InvocationMessage invocationMessage = (InvocationMessage) messages.get(0); + + assertEquals("test", invocationMessage.getTarget()); + assertEquals(null, invocationMessage.getInvocationId()); + int messageResult = (int)invocationMessage.getArguments()[0]; + assertEquals(42, messageResult); + // Headers are parsed but not stored, so we just verify the message was processed successfully + } + + @Test + public void canParseInvocationMessageWithEmptyHeaders() { + String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42],\"headers\":{}}\u001E"; + ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage); + TestBinder binder = new TestBinder(new Type[] { int.class }, null); + + List messages = hubProtocol.parseMessages(message, binder); + + assertNotNull(messages); + assertEquals(1, messages.size()); + + assertEquals(HubMessageType.INVOCATION, messages.get(0).getMessageType()); + InvocationMessage invocationMessage = (InvocationMessage) messages.get(0); + + assertEquals("test", invocationMessage.getTarget()); + int messageResult = (int)invocationMessage.getArguments()[0]; + assertEquals(42, messageResult); + } + + @Test + public void canParseCompletionMessageWithHeaders() { + String stringifiedMessage = "{\"type\":3,\"invocationId\":\"1\",\"result\":42,\"headers\":{\"a\":\"b\",\"c\":\"d\"}}\u001E"; + ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage); + TestBinder binder = new TestBinder(null, int.class); + + List messages = hubProtocol.parseMessages(message, binder); + + assertNotNull(messages); + assertEquals(1, messages.size()); + + assertEquals(HubMessageType.COMPLETION, messages.get(0).getMessageType()); + CompletionMessage completionMessage = (CompletionMessage) messages.get(0); + assertEquals("1", completionMessage.getInvocationId()); + assertEquals(42, completionMessage.getResult()); + assertEquals(null, completionMessage.getError()); + } + + @Test + public void canParseStreamItemMessageWithHeaders() { + String stringifiedMessage = "{\"type\":2,\"invocationId\":\"1\",\"item\":\"test-item\",\"headers\":{\"a\":\"b\"}}\u001E"; + ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage); + TestBinder binder = new TestBinder(null, String.class); + + List messages = hubProtocol.parseMessages(message, binder); + + assertNotNull(messages); + assertEquals(1, messages.size()); + + assertEquals(HubMessageType.STREAM_ITEM, messages.get(0).getMessageType()); + StreamItem streamItem = (StreamItem) messages.get(0); + assertEquals("1", streamItem.getInvocationId()); + assertEquals("test-item", streamItem.getItem()); + } + + @Test + public void canParseMessageWithHeadersInDifferentOrder() { + String stringifiedMessage = "{\"headers\":{\"First\":\"value1\",\"Second\":\"value2\"},\"type\":1,\"target\":\"test\",\"arguments\":[42]}\u001E"; + ByteBuffer message = TestUtils.stringToByteBuffer(stringifiedMessage); + TestBinder binder = new TestBinder(new Type[] { int.class }, null); + + List messages = hubProtocol.parseMessages(message, binder); + + assertNotNull(messages); + assertEquals(1, messages.size()); + + assertEquals(HubMessageType.INVOCATION, messages.get(0).getMessageType()); + InvocationMessage invocationMessage = (InvocationMessage) messages.get(0); + + assertEquals("test", invocationMessage.getTarget()); + int messageResult = (int)invocationMessage.getArguments()[0]; + assertEquals(42, messageResult); + } } From d94cf4158baa51b6a14b577a4c676720a63d1226 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 6 Aug 2025 09:29:21 -0700 Subject: [PATCH 142/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index ffeba29a66d4..4ff4b2c148c6 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - - + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 @@ -120,279 +120,279 @@ - 9.0.7 + 9.0.8 - - - + + + - - - + + + - - - + + + - 9.0.7 + 9.0.8 - - - + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - - - - - + + + + + - 9.0.7 + 9.0.8 - - - - - + + + + + - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - - - - - + + + + + + - 9.0.7 + 9.0.8 - - - + + + - 9.0.7 + 9.0.8 - - - + + + - + - - - + + + - - - + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - + - + - 9.0.7 + 9.0.8 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - - + + - - + + - - + + - 9.0.7 + 9.0.8 - + - + - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 @@ -401,83 +401,83 @@ - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.7 + 9.0.8 - - + + - + - - + + - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 @@ -493,510 +493,510 @@ - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - - - + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - + + - - + + - - + + - 9.0.7 + 9.0.8 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.7 + 9.0.8 - - + + - + - - + + - - - + + + - 9.0.7 + 9.0.8 - + - + - + - 9.0.7 + 9.0.8 - + - + - + - 9.0.7 + 9.0.8 - + - + - + - 9.0.7 + 9.0.8 - - - - + + + + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - + + - - + + - - + + - 9.0.7 + 9.0.8 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.7 + 9.0.8 - - + + - - + + - - + + - 9.0.7 + 9.0.8 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - - + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - + - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - - - + + + - - - + + + - - - + + + - 9.0.7 + 9.0.8 - - - + + + - - - + + + - - - + + + - 9.0.7 + 9.0.8 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - - - + + + - - + + - - - + + + - 9.0.7 + 9.0.8 - 9.0.7 + 9.0.8 - + - 9.0.7 + 9.0.8 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 3efad5672524..71f542dc6973 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 9ff0ab910e51..0bf8bd7f79ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 9 - false + true 8.0.1 *-* + + + + @@ -30,9 +34,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a40c616c5bb..7bb5362ce2f2 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 - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/arcade - 7e67a7b4b62513a475afe46c4cd74d54b68f65c9 + e29823691315ed6b3acff20d5bdf3b0be7628283 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 0bf8bd7f79ed..1579c647b67d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 - 9.0.0-beta.25380.1 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 + 9.0.0-beta.25407.2 9.0.0-alpha.1.24575.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09..8947ea3f0593 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/global.json b/global.json index 56b35b9f8b78..ae875b2ea090 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25380.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25380.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2" } } From a8b048e28497df07206891d8e3ae84bc6f5705b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 21:08:07 -0700 Subject: [PATCH 144/181] Update dependencies from https://github.com/dotnet/extensions build 20250809.1 (#63214) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.8.0-preview.1.25401.1 -> To Version 9.9.0-preview.1.25409.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: William Godbe --- NuGet.config | 12 ------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45022caf7cc9..66f5d2f4634d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,14 +4,8 @@ - - - - - - @@ -34,14 +28,8 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bb5362ce2f2..686695b09ee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade e29823691315ed6b3acff20d5bdf3b0be7628283 - + https://github.com/dotnet/extensions - c6529a0a68989cc881e4add4872c344917bc1ca9 + ed336d147b46d36edad3e9441398de636b67cf5d - + https://github.com/dotnet/extensions - c6529a0a68989cc881e4add4872c344917bc1ca9 + ed336d147b46d36edad3e9441398de636b67cf5d https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1579c647b67d..d18ff5fa3f40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.8 9.0.8 - 9.8.0-preview.1.25401.1 - 9.8.0-preview.1.25401.1 + 9.9.0-preview.1.25409.1 + 9.9.0-preview.1.25409.1 9.0.8 9.0.8 From 60d301dfdc7ad273b13bdc38fde8ff2c004f21c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 04:12:46 +0000 Subject: [PATCH 145/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250812.11 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.8 -> To Version 9.0.9 --- NuGet.config | 14 +- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 218 insertions(+), 228 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45022caf7cc9..486653887053 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,14 +4,9 @@ - - - + - - - @@ -34,14 +29,9 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bb5362ce2f2..3d823eee7786 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore 3f7d40ec7be104358780955b3f0fea62495264dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 1579c647b67d..8571281c156e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8-servicing.25365.11 - 9.0.8-servicing.25365.11 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9-servicing.25412.11 + 9.0.9-servicing.25412.11 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 - 9.0.8-servicing.25365.11 - 9.0.8 + 9.0.9-servicing.25412.11 + 9.0.9 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 9.8.0-preview.1.25401.1 9.8.0-preview.1.25401.1 From d7ff281271e072ec7b3eadb7a5ed9e954d76537b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Aug 2025 05:30:11 +0000 Subject: [PATCH 146/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250812.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 9.0.8 -> To Version 9.0.9 --- 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 486653887053..e197463b6e14 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d823eee7786..42fb5e513183 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3f7d40ec7be104358780955b3f0fea62495264dc + f6551eb4553451ff4b806042808b3d192518ed10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8571281c156e..84a52ad94a59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.8.0-preview.1.25401.1 9.8.0-preview.1.25401.1 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 - 9.0.8 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 + 9.0.9 4.11.0-3.24554.2 4.11.0-3.24554.2 From a41aeac226c301e9cd84b45ed18e021bfbdf13a7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Aug 2025 23:41:02 +0000 Subject: [PATCH 147/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250815.12 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.9 -> To Version 9.0.9 --- NuGet.config | 6 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 86 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index e197463b6e14..a6f4e9ea43d1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,11 @@ - + + @@ -30,10 +31,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc8270b5fdad..4b15c38b76ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index edea5e365c7f..a5132028f442 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 9.0.9 @@ -95,7 +95,7 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 9.0.9 @@ -111,8 +111,8 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25412.11 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 9.0.9 @@ -134,7 +134,7 @@ 9.0.9 9.0.9 - 9.0.9-servicing.25412.11 + 9.0.9-servicing.25415.12 9.0.9 9.0.9 From 5198654f46985d23fba083d273cc3c1157c9e6fa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 16 Aug 2025 04:03:14 +0000 Subject: [PATCH 148/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250815.12 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.9 -> To Version 9.0.9 --- NuGet.config | 6 ++---- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6f4e9ea43d1..97f42b153138 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -31,8 +30,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b15c38b76ce..76bab91d0e7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - f6551eb4553451ff4b806042808b3d192518ed10 + 36cf4f90ba0d2d97d8dfb13394022289ddb7955e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 94ff2d8c6daa5a63428bcfe3eb885369cc40804c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Aug 2025 15:04:15 +0000 Subject: [PATCH 149/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250819.5 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.9 -> To Version 9.0.9 --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97f42b153138..9f3f4f84a4fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,10 @@ + - + @@ -30,9 +31,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76bab91d0e7b..d8d98ad4a127 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 36cf4f90ba0d2d97d8dfb13394022289ddb7955e + 3182b86f459271b72e6c9128bd2e24a874b68096 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 18109a8f8cf95047e07b1de69e7b2f5c3b5d9754 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 03:18:23 +0000 Subject: [PATCH 150/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250819.16 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.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.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.9 -> To Version 9.0.9 --- NuGet.config | 6 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f3f4f84a4fd..70749b8ff590 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,7 @@ - - + @@ -34,8 +33,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8d98ad4a127..708984cbc5ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index a5132028f442..a2d7c6b770e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 9.0.9 @@ -95,7 +95,7 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 9.0.9 @@ -111,8 +111,8 @@ 9.0.9 9.0.9 9.0.9 - 9.0.9-servicing.25415.12 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 9.0.9 @@ -134,7 +134,7 @@ 9.0.9 9.0.9 - 9.0.9-servicing.25415.12 + 9.0.9-servicing.25419.16 9.0.9 9.0.9 From 8f8fae6782ce769647bff3270a64ce066f1ca4bf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Aug 2025 06:46:59 +0000 Subject: [PATCH 151/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250819.9 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.9 -> To Version 9.0.9 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70749b8ff590..cd8902cfb5ec 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 708984cbc5ba..3ebbb1853f12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3182b86f459271b72e6c9128bd2e24a874b68096 + 78871c83aac6c38eb5476c2f34aae98ef65314f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 96103c4a586e28b7ddf7629e1a7d5e79a097d285 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:25:29 -0700 Subject: [PATCH 152/181] Update branding to 9.0.10 (#63510) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d18ff5fa3f40..82b6ad5b0eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,10 +8,10 @@ 9 0 - 9 + 10 - true + false 8.0.1 *-* $(VersionPrefix) diff --git a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj index 5295906837c5..4ffc3aa85fe8 100644 --- a/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj +++ b/src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj @@ -38,6 +38,7 @@ $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(TargetArchitecture).deb + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-newkey-$(TargetArchitecture).deb $(TargetDir)$(TargetFileName) $(TargetingPackVersionPrefix) diff --git a/src/Installers/Rpm/Directory.Build.props b/src/Installers/Rpm/Directory.Build.props index 252ab60311c5..d74912838189 100644 --- a/src/Installers/Rpm/Directory.Build.props +++ b/src/Installers/Rpm/Directory.Build.props @@ -11,6 +11,7 @@ -cm.1 -cm.2 + -newkey true diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 30d705abb1dc..e9800cf062eb 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -40,6 +40,7 @@ $(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension) $(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension) + $(InstallersOutputPath)$(NewKeyBaseName)$(NewKeyVersionSuffix)$(NewKeyExtension) @@ -103,5 +104,13 @@ UseHardlinksIfPossible="False" /> + + + + diff --git a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj index 5e0427aea7f8..26e74893aba8 100644 --- a/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj +++ b/src/Installers/Rpm/Runtime/Rpm.Runtime.rpmproj @@ -16,5 +16,7 @@ $(InstallersOutputPath)$(TargetFileName) $(RuntimeInstallerBaseName)-$(SharedFxVersion) -$(RpmArch).rpm + $(RuntimeInstallerBaseName)-$(SharedFxVersion) + -$(RpmArch).rpm diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index a29db936bd79..7098eaea452c 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -33,6 +33,8 @@ $(InstallersOutputPath)$(TargetFileName) $(TargetingPackInstallerBaseName)-$(TargetingPackVersion) -$(RpmArch).rpm + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion) + -$(RpmArch).rpm $(TargetingPackVersionPrefix) From 1ea95626429cad485a440b3d19db19b9df37d21c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:30:51 -0700 Subject: [PATCH 154/181] Extend Unofficial 1ES template in IdentityModel nightly tests job (#63465) Co-authored-by: William Godbe --- .azure/pipelines/identitymodel-helix-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/identitymodel-helix-matrix.yml b/.azure/pipelines/identitymodel-helix-matrix.yml index 9159fe350b7e..48bba5e63274 100644 --- a/.azure/pipelines/identitymodel-helix-matrix.yml +++ b/.azure/pipelines/identitymodel-helix-matrix.yml @@ -26,7 +26,7 @@ resources: ref: refs/tags/release extends: - template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: sdl: sourceAnalysisPool: From aea22332d6908d84626ffa94c4fcbfbde8203c5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:31:07 -0700 Subject: [PATCH 155/181] [release/9.0] (deps): Bump src/submodules/googletest (#63501) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `373af2e` to `eb2d85e`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/373af2e3df71599b87a40ce0e37164523849166b...eb2d85edd0bff7a712b6aff147cd9f789f0d7d0b) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-version: eb2d85edd0bff7a712b6aff147cd9f789f0d7d0b 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 373af2e3df71..eb2d85edd0bf 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 373af2e3df71599b87a40ce0e37164523849166b +Subproject commit eb2d85edd0bff7a712b6aff147cd9f789f0d7d0b From d168ab01a3efb15dd9a43aa35e134413f5560bb3 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 3 Sep 2025 20:59:41 -0700 Subject: [PATCH 156/181] Quarantine ResponseBody_WriteContentLength_PassedThrough (#63533) --- src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs index 90634d72cfbf..7c263bac6371 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs @@ -206,6 +206,7 @@ public async Task ResponseBody_WriteChunked_ManuallyChunked() } [ConditionalFact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/63532")] public async Task ResponseBody_WriteContentLength_PassedThrough() { string address; From 898e997890da388d47fb34206fab6a25dd084222 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 22:18:27 -0700 Subject: [PATCH 157/181] Merge pull request #63304 from dotnet/darc-release/9.0-325b9375-24e0-4f02-b83a-f58ab0137299 [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- eng/common/SetupNugetSources.ps1 | 4 ++-- eng/common/SetupNugetSources.sh | 4 ++-- eng/common/core-templates/job/job.yml | 8 +++---- eng/common/core-templates/job/onelocbuild.yml | 6 ++--- .../job/publish-build-assets.yml | 10 ++++---- .../core-templates/job/source-build.yml | 4 ++++ .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 ++ .../core-templates/jobs/source-build.yml | 5 ++++ .../core-templates/post-build/post-build.yml | 8 +++---- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +++++----- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 +++++------ .../core-templates/steps/source-build.yml | 11 +++++++-- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 ++-- global.json | 4 ++-- 23 files changed, 81 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686695b09ee6..6d84a230b32d 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 - e29823691315ed6b3acff20d5bdf3b0be7628283 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 82b6ad5b0eba..59931c160d1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 - 9.0.0-beta.25407.2 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 + 9.0.0-beta.25428.3 9.0.0-alpha.1.24575.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2f..792b60b49d42 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0323..facb415ca6ff 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 8947ea3f0593..8da43d3b5837 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -166,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -189,7 +189,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -200,7 +200,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -244,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8ebbc3..edefa789d360 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e31967..b103b7ee1686 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -72,7 +74,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,7 +95,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net @@ -113,7 +115,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +144,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58fd9..5baedac1e03d 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b3ee..662b9fcce154 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252cc65..4571a7864df6 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be4341c6..3129670b3380 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +118,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6de..0b408a67bd51 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9214..2ee8bbfff545 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe7..a7abd58c4bb6 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3c..4085512b6909 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094824..7f5b84c4cb82 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c523191..0623ac6e1123 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b754..0718e4ba902e 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -97,7 +101,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0ba..4bf4cf41bd7c 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505aa6..81ea7a261f2d 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3..f1311bbb1b33 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fcea5..5bdd3dd85fd2 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index ae875b2ea090..d6326c6a09a6 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3" } } From 773460572b6ffac6c5e4b7c1c9afbcb5a7e9353e Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 4 Sep 2025 06:21:52 +0100 Subject: [PATCH 158/181] [OpenAPI] Use invariant culture for TextWriter (#62239) Ensure OpenAPI documents are written to a culture-invariant `TextWriter` implementation. Resolves #60628. --- .../sample/Controllers/TestController.cs | 11 ++++++ src/OpenApi/sample/Program.cs | 27 +++++++++++++ .../OpenApiEndpointRouteBuilderExtensions.cs | 3 +- .../OpenApiDocumentIntegrationTests.cs | 20 ++-------- ...ment_documentName=controllers.verified.txt | 39 ++++++++++++++++++- ...piDocument_documentName=forms.verified.txt | 5 +++ ...cument_documentName=responses.verified.txt | 5 +++ ...t_documentName=schemas-by-ref.verified.txt | 5 +++ ...enApiDocument_documentName=v1.verified.txt | 5 +++ ...enApiDocument_documentName=v2.verified.txt | 5 +++ .../common/Shared/Utf8BufferTextWriter.cs | 6 +++ 11 files changed, 112 insertions(+), 19 deletions(-) diff --git a/src/OpenApi/sample/Controllers/TestController.cs b/src/OpenApi/sample/Controllers/TestController.cs index cf1fed79abb2..26c47ba191d0 100644 --- a/src/OpenApi/sample/Controllers/TestController.cs +++ b/src/OpenApi/sample/Controllers/TestController.cs @@ -24,6 +24,15 @@ public IActionResult PostForm([FromForm] MvcTodo todo) return Ok(todo); } + [HttpGet] + [Produces("application/json")] + [ProducesResponseType(typeof(CurrentWeather), 200)] + [Route("/getcultureinvariant")] + public IActionResult GetCurrentWeather() + { + return Ok(new CurrentWeather(1.0f)); + } + public class RouteParamsContainer { [FromRoute] @@ -36,4 +45,6 @@ public class RouteParamsContainer } public record MvcTodo(string Title, string Description, bool IsCompleted); + + public record CurrentWeather([Range(-100.5f, 100.5f)] float Temperature = 0.1f); } diff --git a/src/OpenApi/sample/Program.cs b/src/OpenApi/sample/Program.cs index e2a1c4c0866f..b0b0a5b053f0 100644 --- a/src/OpenApi/sample/Program.cs +++ b/src/OpenApi/sample/Program.cs @@ -3,6 +3,7 @@ using System.Collections.Immutable; using System.ComponentModel; +using System.Globalization; using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; using Microsoft.OpenApi.Models; @@ -36,6 +37,32 @@ var app = builder.Build(); +// Run requests with a culture that uses commas to format decimals to +// verify the invariant culture is used to generate the OpenAPI document. +app.Use((next) => +{ + return async context => + { + var originalCulture = CultureInfo.CurrentCulture; + var originalUICulture = CultureInfo.CurrentUICulture; + + var newCulture = new CultureInfo("fr-FR"); + + try + { + CultureInfo.CurrentCulture = newCulture; + CultureInfo.CurrentUICulture = newCulture; + + await next(context); + } + finally + { + CultureInfo.CurrentCulture = originalCulture; + CultureInfo.CurrentUICulture = originalUICulture; + } + }; +}); + app.MapOpenApi(); if (app.Environment.IsDevelopment()) { diff --git a/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs b/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs index de74fd8d1257..0533e4f6029f 100644 --- a/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs +++ b/src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs @@ -46,7 +46,8 @@ public static IEndpointConventionBuilder MapOpenApi(this IEndpointRouteBuilder e var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.Request, context.RequestAborted); var documentOptions = options.Get(documentName); using var output = MemoryBufferWriter.Get(); - using var writer = Utf8BufferTextWriter.Get(output); + using var writer = new Utf8BufferTextWriter(System.Globalization.CultureInfo.InvariantCulture); + writer.SetWriter(output); try { document.Serialize(new OpenApiJsonWriter(writer), documentOptions.OpenApiVersion); diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs index 37ebf3c26f06..9c0f540bee3a 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs @@ -1,12 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Globalization; using Microsoft.AspNetCore.InternalTesting; -using Microsoft.AspNetCore.OpenApi; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.OpenApi.Models; -using Microsoft.OpenApi.Writers; [UsesVerify] public sealed class OpenApiDocumentIntegrationTests(SampleAppFixture fixture) : IClassFixture @@ -20,21 +15,12 @@ public sealed class OpenApiDocumentIntegrationTests(SampleAppFixture fixture) : [InlineData("schemas-by-ref")] public async Task VerifyOpenApiDocument(string documentName) { - var documentService = fixture.Services.GetRequiredKeyedService(documentName); - var scopedServiceProvider = fixture.Services.CreateScope(); - var document = await documentService.GetOpenApiDocumentAsync(scopedServiceProvider.ServiceProvider); - await Verifier.Verify(GetOpenApiJson(document)) + using var client = fixture.CreateClient(); + var json = await client.GetStringAsync($"/openapi/{documentName}.json"); + await Verify(json) .UseDirectory(SkipOnHelixAttribute.OnHelix() ? Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "Integration", "snapshots") : "snapshots") .UseParameters(documentName); } - - private static string GetOpenApiJson(OpenApiDocument document) - { - using var textWriter = new StringWriter(CultureInfo.InvariantCulture); - var jsonWriter = new OpenApiJsonWriter(textWriter); - document.SerializeAsV3(jsonWriter); - return textWriter.ToString(); - } } diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt index 5f8abe054fd2..3fe8eab4c666 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt @@ -4,6 +4,11 @@ "title": "Sample | controllers", "version": "1.0.0" }, + "servers": [ + { + "url": "http://localhost/" + } + ], "paths": { "/getbyidandname/{id}/{name}": { "get": { @@ -88,9 +93,41 @@ } } } + }, + "/getcultureinvariant": { + "get": { + "tags": [ + "Test" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CurrentWeather" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "CurrentWeather": { + "type": "object", + "properties": { + "temperature": { + "type": "number", + "format": "float", + "default": 0.1 + } + } + } } }, - "components": { }, "tags": [ { "name": "Test" diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt index 3e341cabab82..63632cfb7642 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt @@ -4,6 +4,11 @@ "title": "Sample | forms", "version": "1.0.0" }, + "servers": [ + { + "url": "http://localhost/" + } + ], "paths": { "/forms/form-file": { "post": { diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt index 12fb88cb35e6..984b97169553 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt @@ -4,6 +4,11 @@ "title": "Sample | responses", "version": "1.0.0" }, + "servers": [ + { + "url": "http://localhost/" + } + ], "paths": { "/responses/200-add-xml": { "get": { diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt index 3e5373a7e36b..ff07dc9d8b1b 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt @@ -4,6 +4,11 @@ "title": "Sample | schemas-by-ref", "version": "1.0.0" }, + "servers": [ + { + "url": "http://localhost/" + } + ], "paths": { "/schemas-by-ref/typed-results": { "get": { diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt index 96ce428e5d17..ef793985d68c 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt @@ -4,6 +4,11 @@ "title": "Sample | v1", "version": "1.0.0" }, + "servers": [ + { + "url": "http://localhost/" + } + ], "paths": { "/v1/array-of-guids": { "get": { diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt index b3d4fa31bff9..c0749f035ec3 100644 --- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt +++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt @@ -11,6 +11,11 @@ }, "version": "1.0.0" }, + "servers": [ + { + "url": "http://localhost/" + } + ], "paths": { "/v2/users": { "get": { diff --git a/src/SignalR/common/Shared/Utf8BufferTextWriter.cs b/src/SignalR/common/Shared/Utf8BufferTextWriter.cs index 6c993f11be7a..f86432af249a 100644 --- a/src/SignalR/common/Shared/Utf8BufferTextWriter.cs +++ b/src/SignalR/common/Shared/Utf8BufferTextWriter.cs @@ -35,6 +35,12 @@ public Utf8BufferTextWriter() _encoder = _utf8NoBom.GetEncoder(); } + public Utf8BufferTextWriter(IFormatProvider formatProvider) + : base(formatProvider) + { + _encoder = _utf8NoBom.GetEncoder(); + } + public static Utf8BufferTextWriter Get(IBufferWriter bufferWriter) { var writer = _cachedInstance; From 5f58326b6a4cfb09c94000375b956d0ec02322b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:28:08 -0700 Subject: [PATCH 159/181] [release/9.0] Update dependencies from dotnet/extensions (#63303) * Update dependencies from https://github.com/dotnet/extensions build 20250815.2 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.9.0-preview.1.25409.1 -> To Version 9.9.0-preview.1.25415.2 * Update dependencies from https://github.com/dotnet/extensions build 20250819.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.9.0-preview.1.25409.1 -> To Version 9.9.0-preview.1.25419.1 * Update dependencies from https://github.com/dotnet/extensions build 20250827.1 Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.9.0-preview.1.25409.1 -> To Version 9.9.0-preview.1.25427.1 --------- Co-authored-by: dotnet-maestro[bot] --- 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 6d84a230b32d..4854e5593bb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/extensions - ed336d147b46d36edad3e9441398de636b67cf5d + ec3b31d717a05bfa5ea1ea084ff33d15430a6cdf - + https://github.com/dotnet/extensions - ed336d147b46d36edad3e9441398de636b67cf5d + ec3b31d717a05bfa5ea1ea084ff33d15430a6cdf https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 59931c160d1e..a36addde445e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.8 9.0.8 - 9.9.0-preview.1.25409.1 - 9.9.0-preview.1.25409.1 + 9.9.0-preview.1.25427.1 + 9.9.0-preview.1.25427.1 9.0.8 9.0.8 From 81b394c4271099e3cbb2baeeaf9d7c7f889de160 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Fri, 5 Sep 2025 22:53:31 +0200 Subject: [PATCH 160/181] Unquarantine `RadioButtonGetsResetAfterSubmittingEnhancedForm` (#63556) * Enable tests with 100% pass rate. * Backport Assert-WaitAssert improvement, just to be sure. * Revert quarantine. --- .../FormWithParentBindingContextTest.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index 53fd2addd404..423b18bfc1dc 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -1340,24 +1340,23 @@ void AssertUiState(string expectedStringValue, bool expectedBoolValue) } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61144")] public void RadioButtonGetsResetAfterSubmittingEnhancedForm() { GoTo("forms/form-with-checkbox-and-radio-button"); - Assert.False(Browser.Exists(By.Id("checkbox")).Selected); - Assert.False(Browser.Exists(By.Id("radio-button")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected); Browser.Exists(By.Id("checkbox")).Click(); Browser.Exists(By.Id("radio-button")).Click(); - Assert.True(Browser.Exists(By.Id("checkbox")).Selected); - Assert.True(Browser.Exists(By.Id("radio-button")).Selected); + WaitAssert.True(Browser, () => Browser.Exists(By.Id("checkbox")).Selected); + WaitAssert.True(Browser, () => Browser.Exists(By.Id("radio-button")).Selected); Browser.Exists(By.Id("submit-button")).Click(); - Assert.False(Browser.Exists(By.Id("checkbox")).Selected); - Assert.False(Browser.Exists(By.Id("radio-button")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("checkbox")).Selected); + WaitAssert.False(Browser, () => Browser.Exists(By.Id("radio-button")).Selected); } [Fact] From 63b74906940af632db30a41fe87b95d5cb0e9ec3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 13:25:37 -0700 Subject: [PATCH 161/181] Update dependencies from https://github.com/dotnet/extensions build 20250906.3 (#63577) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.9.0-preview.1.25427.1 -> To Version 9.10.0-preview.1.25456.3 Co-authored-by: dotnet-maestro[bot] --- 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 4854e5593bb6..2782512cd790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 5fe939db0a156be6f10e17c105b1842c0c8c8bdc - + https://github.com/dotnet/extensions - ec3b31d717a05bfa5ea1ea084ff33d15430a6cdf + 3645ccc33d29294341654cc37d0c448ed47c836c - + https://github.com/dotnet/extensions - ec3b31d717a05bfa5ea1ea084ff33d15430a6cdf + 3645ccc33d29294341654cc37d0c448ed47c836c https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index a36addde445e..a5709677c8c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 9.0.8 9.0.8 - 9.9.0-preview.1.25427.1 - 9.9.0-preview.1.25427.1 + 9.10.0-preview.1.25456.3 + 9.10.0-preview.1.25456.3 9.0.8 9.0.8 From 97a86434195a82fc7e302a4c57d5ec7f885c1ad5 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Tue, 9 Sep 2025 17:11:35 +0000 Subject: [PATCH 162/181] Merged PR 51302: Fix chunked request parsing --- src/Servers/Kestrel/Core/src/CoreStrings.resx | 3 + .../Http/Http1ChunkedEncodingMessageBody.cs | 45 +++++- .../Internal/Http/RequestRejectionReason.cs | 3 +- .../src/KestrelBadHttpRequestException.cs | 3 + .../Kestrel/Core/test/MessageBodyTests.cs | 4 +- .../ChunkedRequestTests.cs | 147 ++++++++++++++++++ 6 files changed, 195 insertions(+), 10 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/CoreStrings.resx b/src/Servers/Kestrel/Core/src/CoreStrings.resx index 55f5bde688f0..c6fb576b6011 100644 --- a/src/Servers/Kestrel/Core/src/CoreStrings.resx +++ b/src/Servers/Kestrel/Core/src/CoreStrings.resx @@ -740,4 +740,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l The client sent a {frameType} frame to a control stream that was too large. + + Bad chunk extension. + \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs index 5e426ed25721..6f2b39a205b7 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ChunkedEncodingMessageBody.cs @@ -16,6 +16,7 @@ internal sealed class Http1ChunkedEncodingMessageBody : Http1MessageBody { // byte consts don't have a data type annotation so we pre-cast it private const byte ByteCR = (byte)'\r'; + private const byte ByteLF = (byte)'\n'; // "7FFFFFFF\r\n" is the largest chunk size that could be returned as an int. private const int MaxChunkPrefixBytes = 10; @@ -27,6 +28,8 @@ internal sealed class Http1ChunkedEncodingMessageBody : Http1MessageBody private readonly Pipe _requestBodyPipe; private ReadResult _readResult; + private static readonly bool InsecureChunkedParsing = AppContext.TryGetSwitch("Microsoft.AspNetCore.Server.Kestrel.EnableInsecureChunkedRequestParsing", out var value) && value; + public Http1ChunkedEncodingMessageBody(Http1Connection context, bool keepAlive) : base(context, keepAlive) { @@ -345,15 +348,31 @@ private void ParseChunkedPrefix(in ReadOnlySequence buffer, out SequencePo KestrelBadHttpRequestException.Throw(RequestRejectionReason.BadChunkSizeData); } + // https://www.rfc-editor.org/rfc/rfc9112#section-7.1 + // chunk = chunk-size [ chunk-ext ] CRLF + // chunk-data CRLF + + // https://www.rfc-editor.org/rfc/rfc9112#section-7.1.1 + // chunk-ext = *( BWS ";" BWS chunk-ext-name + // [BWS "=" BWS chunk-ext-val] ) + // chunk-ext-name = token + // chunk-ext-val = token / quoted-string private void ParseExtension(ReadOnlySequence buffer, out SequencePosition consumed, out SequencePosition examined) { - // Chunk-extensions not currently parsed - // Just drain the data - examined = buffer.Start; + // Chunk-extensions parsed for \r\n and throws for unpaired \r or \n. do { - SequencePosition? extensionCursorPosition = buffer.PositionOf(ByteCR); + SequencePosition? extensionCursorPosition; + if (InsecureChunkedParsing) + { + extensionCursorPosition = buffer.PositionOf(ByteCR); + } + else + { + extensionCursorPosition = buffer.PositionOfAny(ByteCR, ByteLF); + } + if (extensionCursorPosition == null) { // End marker not found yet @@ -361,9 +380,10 @@ private void ParseExtension(ReadOnlySequence buffer, out SequencePosition examined = buffer.End; AddAndCheckObservedBytes(buffer.Length); return; - }; + } var extensionCursor = extensionCursorPosition.Value; + var charsToByteCRExclusive = buffer.Slice(0, extensionCursor).Length; var suffixBuffer = buffer.Slice(extensionCursor); @@ -378,7 +398,9 @@ private void ParseExtension(ReadOnlySequence buffer, out SequencePosition suffixBuffer = suffixBuffer.Slice(0, 2); var suffixSpan = suffixBuffer.ToSpan(); - if (suffixSpan[1] == '\n') + if (InsecureChunkedParsing + ? (suffixSpan[1] == ByteLF) + : (suffixSpan[0] == ByteCR && suffixSpan[1] == ByteLF)) { // We consumed the \r\n at the end of the extension, so switch modes. _mode = _inputLength > 0 ? Mode.Data : Mode.Trailer; @@ -387,13 +409,22 @@ private void ParseExtension(ReadOnlySequence buffer, out SequencePosition examined = suffixBuffer.End; AddAndCheckObservedBytes(charsToByteCRExclusive + 2); } - else + else if (InsecureChunkedParsing) { + examined = buffer.Start; // Don't consume suffixSpan[1] in case it is also a \r. buffer = buffer.Slice(charsToByteCRExclusive + 1); consumed = extensionCursor; AddAndCheckObservedBytes(charsToByteCRExclusive + 1); } + else + { + consumed = suffixBuffer.End; + examined = suffixBuffer.End; + + // We have \rX or \nX, that's an invalid extension. + KestrelBadHttpRequestException.Throw(RequestRejectionReason.BadChunkExtension); + } } while (_mode == Mode.Extension); } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs b/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs index 827192823023..91467c6cb046 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/RequestRejectionReason.cs @@ -16,6 +16,7 @@ internal enum RequestRejectionReason UnexpectedEndOfRequestContent, BadChunkSuffix, BadChunkSizeData, + BadChunkExtension, ChunkedRequestIncomplete, InvalidRequestTarget, InvalidCharactersInHeaderName, @@ -31,5 +32,5 @@ internal enum RequestRejectionReason ConnectMethodRequired, MissingHostHeader, MultipleHostHeaders, - InvalidHostHeader + InvalidHostHeader, } diff --git a/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs b/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs index 05ae34f89802..6bfa5bfe60c4 100644 --- a/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs +++ b/src/Servers/Kestrel/Core/src/KestrelBadHttpRequestException.cs @@ -49,6 +49,9 @@ internal static BadHttpRequestException GetException(RequestRejectionReason reas case RequestRejectionReason.BadChunkSizeData: ex = new BadHttpRequestException(CoreStrings.BadRequest_BadChunkSizeData, StatusCodes.Status400BadRequest, reason); break; + case RequestRejectionReason.BadChunkExtension: + ex = new BadHttpRequestException(CoreStrings.BadRequest_BadChunkExtension, StatusCodes.Status400BadRequest, reason); + break; case RequestRejectionReason.ChunkedRequestIncomplete: ex = new BadHttpRequestException(CoreStrings.BadRequest_ChunkedRequestIncomplete, StatusCodes.Status400BadRequest, reason); break; diff --git a/src/Servers/Kestrel/Core/test/MessageBodyTests.cs b/src/Servers/Kestrel/Core/test/MessageBodyTests.cs index 8cd5db8c8cbe..d9ee3c979a11 100644 --- a/src/Servers/Kestrel/Core/test/MessageBodyTests.cs +++ b/src/Servers/Kestrel/Core/test/MessageBodyTests.cs @@ -338,14 +338,14 @@ public async Task ReadExitsGivenIncompleteChunkedExtension() var stream = new HttpRequestStream(Mock.Of(), reader); reader.StartAcceptingReads(body); - input.Add("5;\r\0"); + input.Add("5;\r"); var buffer = new byte[1024]; var readTask = stream.ReadAsync(buffer, 0, buffer.Length); Assert.False(readTask.IsCompleted); - input.Add("\r\r\r\nHello\r\n0\r\n\r\n"); + input.Add("\nHello\r\n0\r\n\r\n"); Assert.Equal(5, await readTask.DefaultTimeout()); try diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs index f5ee2b28228e..7859716d6ff1 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ChunkedRequestTests.cs @@ -4,6 +4,7 @@ using System.Buffers; using System.Globalization; using System.Text; +using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.InternalTesting; using Microsoft.AspNetCore.Server.Kestrel.Core; @@ -18,6 +19,70 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests; public class ChunkedRequestTests : LoggedTest { + [Theory] + [InlineData("2;\rxx\r\nxy\r\n0")] // \r in chunk extensions + [InlineData("2;\nxx\r\nxy\r\n0")] // \n in chunk extensions + public async Task RejectsInvalidChunkExtensions(string invalidChunkLine) + { + var testContext = new TestServiceContext(LoggerFactory); + + await using (var server = new TestServer(AppChunked, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "Content-Type: text/plain", + "", + invalidChunkLine, + "", + ""); + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Content-Length: 0", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + } + } + } + + [Theory] + [InlineData("2;a=b;b=c\r\nxy\r\n0")] // Multiple chunk extensions + [InlineData("2; \r\nxy\r\n0")] // Space in chunk extensions (BWS) + [InlineData("2;;;\r\nxy\r\n0")] // Multiple ';' in chunk extensions + [InlineData("2;novalue\r\nxy\r\n0")] // Name only chunk extension + //[InlineData("2 ;\r\nxy\r\n0")] // Technically allowed per spec, but we never supported it, and no one should be sending it + public async Task AllowsValidChunkExtensions(string chunkLine) + { + var testContext = new TestServiceContext(LoggerFactory); + + await using (var server = new TestServer(AppChunked, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.Send( + "POST / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "Content-Type: text/plain", + "", + chunkLine, + "", + ""); + await connection.Receive( + "HTTP/1.1 200 OK", + "Content-Length: 2", + $"Date: {testContext.DateHeaderValue}", + "", + "xy"); + } + } + } + private async Task App(HttpContext httpContext) { var request = httpContext.Request; @@ -1117,4 +1182,86 @@ await connection.Receive( } } } + + [Fact] + public async Task MultiReadWithInvalidNewlineAcrossReads() + { + // Inline so that we know when the first connection.Send has been parsed so we can send the next part + var testContext = new TestServiceContext(LoggerFactory) + { Scheduler = System.IO.Pipelines.PipeScheduler.Inline }; + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + await using (var server = new TestServer(async httpContext => + { + var request = httpContext.Request; + var readTask = request.BodyReader.ReadAsync(); + tcs.TrySetResult(); + var readResult = await readTask; + request.BodyReader.AdvanceTo(readResult.Buffer.End); + }, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.SendAll( + "GET / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "", + "1;\r"); + await tcs.Task; + await connection.SendAll( + "\r"); + + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Content-Length: 0", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + } + } + } + + [Fact] + public async Task InvalidNewlineInFirstReadWithPartialChunkExtension() + { + // Inline so that we know when the first connection.Send has been parsed so we can send the next part + var testContext = new TestServiceContext(LoggerFactory) + { Scheduler = System.IO.Pipelines.PipeScheduler.Inline }; + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + await using (var server = new TestServer(async httpContext => + { + var request = httpContext.Request; + var readTask = request.BodyReader.ReadAsync(); + tcs.TrySetResult(); + var readResult = await readTask; + request.BodyReader.AdvanceTo(readResult.Buffer.End); + }, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.SendAll( + "GET / HTTP/1.1", + "Host:", + "Transfer-Encoding: chunked", + "", + "1;\n"); + await tcs.Task; + await connection.SendAll( + "t"); + + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Content-Length: 0", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "", + ""); + } + } + } } From ee8e68523856d6a6556b51dcd07afa167f42b02e Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Sep 2025 11:44:50 -0700 Subject: [PATCH 163/181] Update baseline, SDK --- eng/Baseline.Designer.props | 776 ++++++++++++++++++------------------ eng/Baseline.xml | 212 +++++----- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 497 insertions(+), 497 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 4ff4b2c148c6..c028a1e628ea 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - - + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 @@ -120,279 +120,279 @@ - 9.0.8 + 9.0.9 - - - + + + - - - + + + - - - + + + - 9.0.8 + 9.0.9 - - - + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - - - - - + + + + + - 9.0.8 + 9.0.9 - - - - - + + + + + - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - - - - - + + + + + + - 9.0.8 + 9.0.9 - - - + + + - 9.0.8 + 9.0.9 - - - + + + - + - - - + + + - - - + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - + - + - 9.0.8 + 9.0.9 - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - - + + - - + + - - + + - 9.0.8 + 9.0.9 - + - + - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 @@ -401,83 +401,83 @@ - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.8 + 9.0.9 - - + + - + - - + + - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 @@ -493,510 +493,510 @@ - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - - - + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - + + - - + + - - + + - 9.0.8 + 9.0.9 - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - 9.0.8 + 9.0.9 - - + + - + - - + + - - - + + + - 9.0.8 + 9.0.9 - + - + - + - 9.0.8 + 9.0.9 - + - + - + - 9.0.8 + 9.0.9 - + - + - + - 9.0.8 + 9.0.9 - - - - + + + + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - + + - - + + - - + + - 9.0.8 + 9.0.9 - - - + + + - - - + + + - - - + + + - - - + + + - 9.0.8 + 9.0.9 - - + + - - + + - - + + - 9.0.8 + 9.0.9 - - - - - + + + + + - - - - + + + + - - - - - + + + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - - + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - + - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - - - + + + - - - + + + - - - + + + - 9.0.8 + 9.0.9 - - - + + + - - - + + + - - - + + + - 9.0.8 + 9.0.9 - - - - + + + + - - - - + + + + - - - - + + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - - - + + + - - + + - - - + + + - 9.0.8 + 9.0.9 - 9.0.8 + 9.0.9 - + - 9.0.8 + 9.0.9 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 71f542dc6973..3ebda983fc82 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 3648bc6ca33c..09b265328ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 10 - false + true 8.0.1 *-* + + + + + + + + @@ -30,9 +38,17 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eccebefe527..6dee8ec8357c 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 - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 09b265328ecc..6811f974d870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 - 9.0.0-beta.25428.3 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 + 9.0.0-beta.25460.1 9.0.0-alpha.1.24575.1 diff --git a/global.json b/global.json index fb705b70ff28..25bf23883f5d 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25428.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1" } } From 6875c0355944c71d38048162baab7fb35b51cc65 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Sep 2025 10:36:59 +0000 Subject: [PATCH 165/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250916.4 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.9 -> To Version 9.0.10 --- NuGet.config | 22 ++-------------------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31ba7284d787..279a7d1b2992 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,18 +4,9 @@ - - - - - - - - - - + @@ -38,18 +29,9 @@ - - - - - + - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dee8ec8357c..6a66305ca169 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,38 +9,38 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 78871c83aac6c38eb5476c2f34aae98ef65314f5 + ddcda41d82201cf79bb985068d6495d215b3cf1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6811f974d870..160e0b30f69a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,14 +146,14 @@ 9.10.0-preview.1.25456.3 9.10.0-preview.1.25456.3 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 4.11.0-3.24554.2 4.11.0-3.24554.2 From 0a6a48d56dd85a3c6131e2ca5ff757203771d2b3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Sep 2025 00:46:28 +0000 Subject: [PATCH 166/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250916.12 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.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 , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 9.0.9 -> To Version 9.0.10 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.9-servicing.25419.16 -> To Version 9.0.10-servicing.25466.12 --- NuGet.config | 2 + eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 3 files changed, 218 insertions(+), 216 deletions(-) diff --git a/NuGet.config b/NuGet.config index 279a7d1b2992..fd7cb3041275 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -32,6 +33,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a66305ca169..bbeb2b90729c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore ddcda41d82201cf79bb985068d6495d215b3cf1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ bc1c3011064a493b0ca527df6fb7215e2e5cfa96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + 11f875f585b0832c69374a4bd185c9f8626190d6 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 160e0b30f69a..04c93504ef26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,80 +68,80 @@ --> - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9-servicing.25419.16 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9-servicing.25419.16 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9-servicing.25419.16 - 9.0.9-servicing.25419.16 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10-servicing.25466.12 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10-servicing.25466.12 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10-servicing.25466.12 + 9.0.10-servicing.25466.12 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 - 9.0.9-servicing.25419.16 - 9.0.9 + 9.0.10-servicing.25466.12 + 9.0.10 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 - 9.0.9 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 + 9.0.10 9.10.0-preview.1.25456.3 9.10.0-preview.1.25456.3 From 940db9ccd8c7c5924f02b24934d213df099ebd6d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Sep 2025 19:57:27 +0000 Subject: [PATCH 167/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250917.6 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd7cb3041275..bbeecaf09836 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 bbeb2b90729c..6fe65bf22e18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ddcda41d82201cf79bb985068d6495d215b3cf1d + e982e1207215549b69fc4bb7bbb74093f7ac0c2f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 4cff5950d163692d4e3b38f282c33ff90d81c3e1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Sep 2025 21:33:15 +0000 Subject: [PATCH 168/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250917.9 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.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 , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 9.0.10 -> To Version 9.0.10 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.10-servicing.25466.12 -> To Version 9.0.10-servicing.25467.9 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbeecaf09836..67f2944f2851 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fe65bf22e18..eb51f6ceeb66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 11f875f585b0832c69374a4bd185c9f8626190d6 + b3173376176f145ed904d9f18f24c062756ada9d https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 04c93504ef26..b1c89a9621b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25466.12 + 9.0.10-servicing.25467.9 9.0.10 9.0.10 9.0.10 @@ -95,7 +95,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25466.12 + 9.0.10-servicing.25467.9 9.0.10 9.0.10 9.0.10 @@ -111,8 +111,8 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25466.12 - 9.0.10-servicing.25466.12 + 9.0.10-servicing.25467.9 + 9.0.10-servicing.25467.9 9.0.10 9.0.10 9.0.10 @@ -134,7 +134,7 @@ 9.0.10 9.0.10 - 9.0.10-servicing.25466.12 + 9.0.10-servicing.25467.9 9.0.10 9.0.10 From e0d667ccd1ebc48cb81eaeb5e174a44adf16999c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Sep 2025 23:29:38 +0000 Subject: [PATCH 169/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250917.8 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 67f2944f2851..b8e171e2b0d8 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 eb51f6ceeb66..054bb65720c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e982e1207215549b69fc4bb7bbb74093f7ac0c2f + d25c0697ea69ce8b3a26f58aeb1670e60cc9569d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From a5dc8fac6ed6bb1085a4def0278cabc0fc3944ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 04:50:15 +0000 Subject: [PATCH 170/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250917.23 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.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 , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 9.0.10 -> To Version 9.0.10 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.10-servicing.25467.9 -> To Version 9.0.10-servicing.25467.23 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8e171e2b0d8..f32b75362501 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 054bb65720c1..f1a7c961b1af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index b1c89a9621b3..21e5d0e93825 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25467.9 + 9.0.10-servicing.25467.23 9.0.10 9.0.10 9.0.10 @@ -95,7 +95,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25467.9 + 9.0.10-servicing.25467.23 9.0.10 9.0.10 9.0.10 @@ -111,8 +111,8 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25467.9 - 9.0.10-servicing.25467.9 + 9.0.10-servicing.25467.23 + 9.0.10-servicing.25467.23 9.0.10 9.0.10 9.0.10 @@ -134,7 +134,7 @@ 9.0.10 9.0.10 - 9.0.10-servicing.25467.9 + 9.0.10-servicing.25467.23 9.0.10 9.0.10 From ddb7987d6a34f91094d03fa7f200584ccd198b20 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Sep 2025 08:51:17 +0000 Subject: [PATCH 171/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250919.2 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index f32b75362501..b52d7e675fd0 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 f1a7c961b1af..edc385ac1bd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d25c0697ea69ce8b3a26f58aeb1670e60cc9569d + 660bcfaf9168bdfee957c40bf4d4821afd7452cf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From e820f5876944f21a3cd87cf12093cbf48ed8a90c Mon Sep 17 00:00:00 2001 From: Korolev Dmitry Date: Fri, 19 Sep 2025 23:55:44 +0200 Subject: [PATCH 172/181] Fix runtime architecture detection logic in ANCM. (#63707) Co-authored-by: Aditya Mandaleeka --- .../CommonLib/Environment.cpp | 17 ++++ .../CommonLib/Environment.h | 3 + .../CommonLib/HostFxrResolver.cpp | 78 ++++++++++--------- .../CommonLib/HostFxrResolver.h | 4 +- .../CommonLib/ProcessorArchitecture.h | 28 +++++++ 5 files changed, 91 insertions(+), 39 deletions(-) create mode 100644 src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp index c49200ce8d2f..e7892419d123 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp @@ -133,6 +133,23 @@ std::wstring Environment::GetDllDirectoryValue() return expandedStr; } +ProcessorArchitecture Environment::GetCurrentProcessArchitecture() +{ + // Use compile-time detection - we know which architectures we support + // and this is the most reliable and efficient approach. IsWow64Process2 + // doesn't show the correct architecture when running under x64 emulation + // on ARM64. +#if defined(_M_ARM64) + return ProcessorArchitecture::ARM64; +#elif defined(_M_AMD64) + return ProcessorArchitecture::AMD64; +#elif defined(_M_IX86) + return ProcessorArchitecture::x86; +#else + static_assert(false, "Unknown target architecture"); +#endif +} + bool Environment::IsRunning64BitProcess() { // Check the bitness of the currently running process diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h index 9e3e1b1bf772..a9e6e85d9ecc 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.h @@ -5,6 +5,7 @@ #include #include +#include "ProcessorArchitecture.h" class Environment { @@ -23,6 +24,8 @@ class Environment static bool IsRunning64BitProcess(); static + ProcessorArchitecture GetCurrentProcessArchitecture(); + static HRESULT CopyToDirectory(const std::wstring& source, const std::filesystem::path& destination, bool cleanDest, const std::filesystem::path& directoryToIgnore, int& copiedFileCount); static bool CheckUpToDate(const std::wstring& source, const std::filesystem::path& destination, const std::wstring& extension, const std::filesystem::path& directoryToIgnore); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp index 8fb960261590..8552852ce0e5 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.cpp @@ -409,10 +409,9 @@ HostFxrResolver::InvokeWhereToFindDotnet() HandleWrapper hStdOutWritePipe; HandleWrapper hProcess; HandleWrapper hThread; - CComBSTR pwzDotnetName = NULL; - DWORD dwFilePointer; - BOOL fIsCurrentProcess64Bit; - DWORD dwExitCode; + CComBSTR pwzDotnetName = nullptr; + DWORD dwFilePointer = 0; + DWORD dwExitCode = 0; STRU struDotnetSubstring; STRU struDotnetLocationsString; DWORD dwNumBytesRead = 0; @@ -426,6 +425,7 @@ HostFxrResolver::InvokeWhereToFindDotnet() securityAttributes.bInheritHandle = TRUE; LOG_INFO(L"Invoking where.exe to find dotnet.exe"); + auto currentProcessArch = Environment::GetCurrentProcessArchitecture(); // Create a read/write pipe that will be used for reading the result of where.exe FINISHED_LAST_ERROR_IF(!CreatePipe(&hStdOutReadPipe, &hStdOutWritePipe, &securityAttributes, 0)); @@ -499,13 +499,9 @@ HostFxrResolver::InvokeWhereToFindDotnet() } FINISHED_IF_FAILED(struDotnetLocationsString.CopyA(pzFileContents, dwNumBytesRead)); - LOG_INFOF(L"where.exe invocation returned: '%ls'", struDotnetLocationsString.QueryStr()); - fIsCurrentProcess64Bit = Environment::IsRunning64BitProcess(); - - LOG_INFOF(L"Current process bitness type detected as isX64=%d", fIsCurrentProcess64Bit); - + // Look for a dotnet.exe that matches the current process architecture while (TRUE) { index = struDotnetLocationsString.IndexOf(L"\r\n", prevIndex); @@ -518,28 +514,38 @@ HostFxrResolver::InvokeWhereToFindDotnet() // \r\n is two wchars, so add 2 here. prevIndex = index + 2; - LOG_INFOF(L"Processing entry '%ls'", struDotnetSubstring.QueryStr()); - - if (fIsCurrentProcess64Bit == IsX64(struDotnetSubstring.QueryStr())) + ProcessorArchitecture dotnetArch = GetFileProcessorArchitecture(struDotnetSubstring.QueryStr()); + if (dotnetArch == currentProcessArch) { - // The bitness of dotnet matched with the current worker process bitness. + LOG_INFOF(L"Found dotnet.exe matching current process architecture (%ls) '%ls'", + ProcessorArchitectureToString(dotnetArch), + struDotnetSubstring.QueryStr()); + return std::make_optional(struDotnetSubstring.QueryStr()); } + else + { + LOG_INFOF(L"Skipping dotnet.exe with non-matching architecture %ls (need %ls). '%ls'", + ProcessorArchitectureToString(dotnetArch), + ProcessorArchitectureToString(currentProcessArch), + struDotnetSubstring.QueryStr()); + } } Finished: return result; } -BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) +// Reads the PE header of the binary to determine its architecture. +ProcessorArchitecture HostFxrResolver::GetFileProcessorArchitecture(const WCHAR* binaryPath) { // Errors while reading from the file shouldn't throw unless // file.exception(bits) is set - std::ifstream file(dotnetPath, std::ios::binary); + std::ifstream file(binaryPath, std::ios::binary); if (!file.is_open()) { - LOG_TRACEF(L"Failed to open file %ls", dotnetPath); - return false; + LOG_TRACEF(L"Failed to open file %ls", binaryPath); + return ProcessorArchitecture::Unknown; } // Read the DOS header @@ -547,8 +553,8 @@ BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) file.read(reinterpret_cast(&dosHeader), sizeof(dosHeader)); if (dosHeader.e_magic != IMAGE_DOS_SIGNATURE) // 'MZ' { - LOG_TRACEF(L"%ls is not a valid executable file (missing MZ header).", dotnetPath); - return false; + LOG_TRACEF(L"%ls is not a valid executable file (missing MZ header).", binaryPath); + return ProcessorArchitecture::Unknown; } // Seek to the PE header @@ -559,32 +565,30 @@ BOOL HostFxrResolver::IsX64(const WCHAR* dotnetPath) file.read(reinterpret_cast(&peSignature), sizeof(peSignature)); if (peSignature != IMAGE_NT_SIGNATURE) // 'PE\0\0' { - LOG_TRACEF(L"%ls is not a valid PE file (missing PE header).", dotnetPath); - return false; + LOG_TRACEF(L"%ls is not a valid PE file (missing PE header).", binaryPath); + return ProcessorArchitecture::Unknown; } // Read the file header IMAGE_FILE_HEADER fileHeader{}; file.read(reinterpret_cast(&fileHeader), sizeof(fileHeader)); - // Read the optional header magic field - WORD magic{}; - file.read(reinterpret_cast(&magic), sizeof(magic)); - - // Determine the architecture based on the magic value - if (magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + // Determine the architecture based on the machine type + switch (fileHeader.Machine) { - LOG_INFOF(L"%ls is 32-bit", dotnetPath); - return false; - } - else if (magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - LOG_INFOF(L"%ls is 64-bit", dotnetPath); - return true; + case IMAGE_FILE_MACHINE_I386: + LOG_INFOF(L"%ls is x86 (32-bit)", binaryPath); + return ProcessorArchitecture::x86; + case IMAGE_FILE_MACHINE_AMD64: + LOG_INFOF(L"%ls is AMD64 (x64)", binaryPath); + return ProcessorArchitecture::AMD64; + case IMAGE_FILE_MACHINE_ARM64: + LOG_INFOF(L"%ls is ARM64", binaryPath); + return ProcessorArchitecture::ARM64; + default: + LOG_INFOF(L"%ls has unknown architecture (machine type: 0x%X)", binaryPath, fileHeader.Machine); + return ProcessorArchitecture::Unknown; } - - LOG_INFOF(L"%ls is unknown architecture %i", dotnetPath, fileHeader.Machine); - return false; } std::optional diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h index 08ec650aec54..9065e2aecd2b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/HostFxrResolver.h @@ -8,8 +8,8 @@ #include #include #include - #include "ErrorContext.h" +#include "ProcessorArchitecture.h" #define READ_BUFFER_SIZE 4096 @@ -74,7 +74,7 @@ class HostFxrResolver const std::filesystem::path & requestedPath ); - static BOOL IsX64(const WCHAR* dotnetPath); + static ProcessorArchitecture GetFileProcessorArchitecture(const WCHAR* binaryPath); struct LocalFreeDeleter { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h new file mode 100644 index 000000000000..195feddcae7b --- /dev/null +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/ProcessorArchitecture.h @@ -0,0 +1,28 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once + +enum class ProcessorArchitecture +{ + Unknown, + x86, + AMD64, + ARM64 +}; + +inline const wchar_t* ProcessorArchitectureToString(ProcessorArchitecture arch) +{ + switch (arch) + { + case ProcessorArchitecture::x86: + return L"x86"; + case ProcessorArchitecture::AMD64: + return L"AMD64"; + case ProcessorArchitecture::ARM64: + return L"ARM64"; + case ProcessorArchitecture::Unknown: + default: + return L"Unknown"; + } +} \ No newline at end of file From 414e63bdbda1b6df17f888ee0c55210e4e2b2b3c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Sep 2025 07:24:26 +0000 Subject: [PATCH 173/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250921.3 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index b52d7e675fd0..899518a5fd59 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 edc385ac1bd0..296b4a8b4353 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 660bcfaf9168bdfee957c40bf4d4821afd7452cf + 741af216d45608faa8e78d28aea38168cfff12ff https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 15ed1d33106384105c7e85b17633b3bdc40b5ff0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 22 Sep 2025 21:25:17 +0000 Subject: [PATCH 174/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250922.8 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.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 , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 9.0.10 -> To Version 9.0.10 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.10-servicing.25467.23 -> To Version 9.0.10-servicing.25472.8 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 899518a5fd59..8a6e1963dbe2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 296b4a8b4353..189e04094221 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + af15b36fc39dd5c91c39710be2ad0689a82dbac6 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 21e5d0e93825..d6693e0f8dbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25467.23 + 9.0.10-servicing.25472.8 9.0.10 9.0.10 9.0.10 @@ -95,7 +95,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25467.23 + 9.0.10-servicing.25472.8 9.0.10 9.0.10 9.0.10 @@ -111,8 +111,8 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25467.23 - 9.0.10-servicing.25467.23 + 9.0.10-servicing.25472.8 + 9.0.10-servicing.25472.8 9.0.10 9.0.10 9.0.10 @@ -134,7 +134,7 @@ 9.0.10 9.0.10 - 9.0.10-servicing.25467.23 + 9.0.10-servicing.25472.8 9.0.10 9.0.10 From 0e2f2483f109dc44a6990474becf1e3a8ea9b55d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 09:16:02 +0000 Subject: [PATCH 175/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250923.3 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a6e1963dbe2..bc03eb5a87c5 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 189e04094221..f21350c27008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 741af216d45608faa8e78d28aea38168cfff12ff + 850bc6957561a22f32ea80f5717a2d3868ee1e74 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From fa3b7442ee294a0d7b061404677043acde9b63e0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 17:25:09 +0000 Subject: [PATCH 176/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250923.7 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc03eb5a87c5..aea49e65afa5 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 f21350c27008..c618f8341ad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 850bc6957561a22f32ea80f5717a2d3868ee1e74 + 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From ead83a1e8fbe03a772e61443d650ef0be49a2b3c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Sep 2025 23:28:55 +0000 Subject: [PATCH 177/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250923.10 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index aea49e65afa5..6f8df62c2bff 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 c618f8341ad1..bb6ac90ae9a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 07f05aeccc82bfec153831e9b59ebcefa7eb2df2 + 5ce9640462858a2ecfa21d6b8edfce32decef73e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 7c94b04f353d58724e6fccec8a5cd533197c681c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Sep 2025 20:04:59 +0000 Subject: [PATCH 178/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250924.3 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.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 , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 9.0.10 -> To Version 9.0.10 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.10-servicing.25472.8 -> To Version 9.0.10-servicing.25474.3 --- NuGet.config | 4 +- eng/Version.Details.xml | 154 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f8df62c2bff..58ce397ab526 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb6ac90ae9a5..16337bf11f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -44,268 +44,268 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - af15b36fc39dd5c91c39710be2ad0689a82dbac6 + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index d6693e0f8dbf..25aa1fd145fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25472.8 + 9.0.10-servicing.25474.3 9.0.10 9.0.10 9.0.10 @@ -95,7 +95,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25472.8 + 9.0.10-servicing.25474.3 9.0.10 9.0.10 9.0.10 @@ -111,8 +111,8 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25472.8 - 9.0.10-servicing.25472.8 + 9.0.10-servicing.25474.3 + 9.0.10-servicing.25474.3 9.0.10 9.0.10 9.0.10 @@ -134,7 +134,7 @@ 9.0.10 9.0.10 - 9.0.10-servicing.25472.8 + 9.0.10-servicing.25474.3 9.0.10 9.0.10 From ad9875e7c0b93e928a311b7db5b5cd429ce4ffc2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 25 Sep 2025 00:00:34 +0000 Subject: [PATCH 179/181] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20250924.7 On relative base path root dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 9.0.10 -> To Version 9.0.10 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 58ce397ab526..cd7c1c8f34bb 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 16337bf11f92..21a4ac6aa1ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5ce9640462858a2ecfa21d6b8edfce32decef73e + 8b62e5e1fb82eb1792c26f7266414e365fdde658 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 5ead537f37f3443159f32403893edca28e6282a6 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 00:47:42 +0000 Subject: [PATCH 180/181] Merged PR 53785: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime 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](https://maestro.dot.net/subscriptions?search=67a6df8f-40a9-4218-839a-e336f1bd1d79) - **Build**: [20250925.10](https://dev.azure.com/dnceng/internal/_build/results?buildId=2801920) ([284724](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-efcore/build/284724)) - **Date Produced**: September 25, 2025 8:30:56 PM UTC - **Commit**: [e7e38d569e070e436c7fa93806ed78b428ce6735](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?_a=history&version=GCe7e38d569e070e436c7fa93806ed78b428ce6735) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10 to 9.0.10][1] - dotnet-ef - Microsoft.EntityFrameworkCore - Microsoft.EntityFrameworkCore.Design - Microsoft.EntityFrameworkCore.InMemory - Microsoft.EntityFrameworkCore.Relational - Microsoft.EntityFrameworkCore.Sqlite - Microsoft.EntityFrameworkCore.SqlServer - Microsoft.EntityFrameworkCore.Tools [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC8b62e5e1fb82eb1792c26f7266414e365fdde658&targetVersion=GCe7e38d569e070e436c7fa93806ed78b428ce6735&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79) [marker]: <> (Begin:ff8719c2-a1bf-4aef-ad09-b38561e103bc) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: [ff8719c2-a1bf-4aef-ad09-b38561e103bc](https://maestro.dot.net/subscriptions?search=ff8719c2-a1bf-4aef-ad09-b38561e103bc) - **Build**: [20250925.15](https://dev.azure.com/dnceng/internal/_build/results?buildId=2801901) ([284759](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-runtime/build/284759)) - **Date Produced**: September 26, 2025 12:15:53 AM UTC - **Commit**: [e1f19886fe3354963a4a790c896b3f99689fd7a5](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCe1f19886fe3354963a4a790c896b3f99689fd7a5) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10 to 9.0.10][2] - Microsoft.Bcl.AsyncInterfaces - Microsoft.Bcl.TimeProvider - Microsoft.Extensions.Caching.Abstractions - Microsoft.Extensions.Caching.Memory - Microsoft.Extensions.Configuration - Microsoft.Extensions.Configuration.Abstractions - Microsoft.Extensions.Configuration.Binder - Microsoft.Extensions.Configuration.CommandLine - Microsoft.Extensions.Configuration.EnvironmentVariables - Microsoft.Extensions.Configuration.FileExtensions - Micro... --- NuGet.config | 8 +- eng/Version.Details.xml | 170 ++++++++++++++++++++-------------------- eng/Versions.props | 10 +-- 3 files changed, 94 insertions(+), 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd7c1c8f34bb..9cade80676d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -30,10 +30,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21a4ac6aa1ab..c980a93f460e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,301 +11,301 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 8b62e5e1fb82eb1792c26f7266414e365fdde658 + e7e38d569e070e436c7fa93806ed78b428ce6735 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://github.com/dotnet/xdt @@ -369,7 +369,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 @@ -380,9 +380,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 25aa1fd145fd..910f240ecf2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25474.3 + 9.0.10-servicing.25475.15 9.0.10 9.0.10 9.0.10 @@ -95,7 +95,7 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25474.3 + 9.0.10-servicing.25475.15 9.0.10 9.0.10 9.0.10 @@ -111,8 +111,8 @@ 9.0.10 9.0.10 9.0.10 - 9.0.10-servicing.25474.3 - 9.0.10-servicing.25474.3 + 9.0.10-servicing.25475.15 + 9.0.10-servicing.25475.15 9.0.10 9.0.10 9.0.10 @@ -134,7 +134,7 @@ 9.0.10 9.0.10 - 9.0.10-servicing.25474.3 + 9.0.10-servicing.25475.15 9.0.10 9.0.10 From 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 26 Sep 2025 02:27:34 +0000 Subject: [PATCH 181/181] Merged PR 53806: [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](https://maestro.dot.net/subscriptions?search=67a6df8f-40a9-4218-839a-e336f1bd1d79) - **Build**: [20250925.14](https://dev.azure.com/dnceng/internal/_build/results?buildId=2802141) ([284781](https://maestro.dot.net/channel/5128/azdo:dnceng:internal:dotnet-efcore/build/284781)) - **Date Produced**: September 26, 2025 2:08:50 AM UTC - **Commit**: [5452ff90a79084afd23df379388ae8bca24284f3](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?_a=history&version=GC5452ff90a79084afd23df379388ae8bca24284f3) - **Branch**: [refs/heads/internal/release/9.0](https://dev.azure.com/dnceng/internal/_git/dotnet-efcore?version=GBrefs/heads/internal/release/9.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [9.0.10 to 9.0.10][1] - dotnet-ef - Microsoft.EntityFrameworkCore - Microsoft.EntityFrameworkCore.Design - Microsoft.EntityFrameworkCore.InMemory - Microsoft.EntityFrameworkCore.Relational - Microsoft.EntityFrameworkCore.Sqlite - Microsoft.EntityFrameworkCore.SqlServer - Microsoft.EntityFrameworkCore.Tools [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GCe7e38d569e070e436c7fa93806ed78b428ce6735&targetVersion=GC5452ff90a79084afd23df379388ae8bca24284f3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:67a6df8f-40a9-4218-839a-e336f1bd1d79) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9cade80676d8..cabc4d8508a0 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 c980a93f460e..72b4a55be806 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,36 +11,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e7e38d569e070e436c7fa93806ed78b428ce6735 + 5452ff90a79084afd23df379388ae8bca24284f3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime