From 4a6e0054afa519a6d00a73ae161b53c4a257b64f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 18 Mar 2025 14:34:43 +0000 Subject: [PATCH 01/59] 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 02/59] 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 03/59] [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 04/59] [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 05/59] [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 06/59] [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 07/59] 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 09/59] 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 10/59] 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 11/59] 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 12/59] 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 13/59] [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 14/59] 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 15/59] 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 16/59] 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 17/59] 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 18/59] [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 19/59] 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 20/59] 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 22/59] [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 23/59] 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 24/59] [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 25/59] [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 26/59] 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 27/59] 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 28/59] 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 30/59] 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 31/59] 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 32/59] 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 33/59] 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 34/59] 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 35/59] 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 36/59] 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 37/59] 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 41/59] [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 42/59] 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 43/59] [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 44/59] 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 45/59] 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 46/59] 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 47/59] 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 48/59] [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 49/59] [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 50/59] 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 51/59] 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 52/59] 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 53/59] 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 54/59] 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 55/59] 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 57/59] 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 58/59] 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 59/59] 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