From fa2aafe9eb65a3026a7cc5f4cfb8465c2ea6bb8f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 28 Jul 2022 04:03:33 +0000 Subject: [PATCH 01/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0057e5ff395f..9ce2712d5811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,11 @@ - + + @@ -27,10 +28,11 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2036ca3cb2d8..b17333b6fd42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 https://github.com/dotnet/runtime @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 55fb7ef977e7d120dc12f0960edcff0739d7ee0e + 5a522a116acb7118c30e71881e296063008a63f2 diff --git a/eng/Versions.props b/eng/Versions.props index c2703b08cf0b..1918832b39ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.8 6.0.8 6.0.8 - 6.0.8-servicing.22363.6 + 6.0.8-servicing.22377.7 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.8-servicing.22363.6 + 6.0.8-servicing.22377.7 6.0.0 6.0.0 6.0.1 From c43cf7abfe4b7c788dd782c5cb376f555fcdd1fd Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 2 Aug 2022 18:01:14 -0700 Subject: [PATCH 02/27] Update branding to 6.0.9 (#43057) * Update branding to 6.0.9 * [release/6.0] Move builds to MacOS 11 - hosted macOS-10.15 environment is deprecated * Use an installed XCode version Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> --- .azure/pipelines/jobs/default-build.yml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index f3eb0197a617..2908d5bb869a 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -94,7 +94,7 @@ jobs: # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if eq(parameters.agentOs, 'macOS') }}: - vmImage: macOS-10.15 + vmImage: macOS-11 ${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}: vmImage: ubuntu-18.04 @@ -151,8 +151,8 @@ jobs: - script: df -h displayName: Disk size - ${{ if eq(parameters.agentOs, 'macOS') }}: - - script: sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer - displayName: Use XCode 12.2 + - script: sudo xcode-select -s /Applications/Xcode_12.5.1.app/Contents/Developer + displayName: Use XCode 12.5.1 - checkout: self clean: true - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}: diff --git a/eng/Versions.props b/eng/Versions.props index 77b17f9f2348..c3c3f809a8e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,8 +8,8 @@ 6 0 - 8 - true + 9 + false From dfe5ab753e36a758be1a0ed704a4ec866f515bba Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 2 Aug 2022 18:08:30 -0700 Subject: [PATCH 03/27] [release/6.0] Add missing ConfigureAwait(false) to PolicyHttpMessageHandler (#42940) --- src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs b/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs index c32c52fc2f1d..71bfe54ce0f7 100644 --- a/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs +++ b/src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs @@ -167,7 +167,7 @@ protected virtual async Task SendCoreAsync(HttpRequestMessa disposable.Dispose(); } - var result = await base.SendAsync(request, cancellationToken); + var result = await base.SendAsync(request, cancellationToken).ConfigureAwait(false); request.Properties[PriorResponseKey] = result; From b3dbb1496cc842741728b62f697c404a3fe65380 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Tue, 2 Aug 2022 18:09:16 -0700 Subject: [PATCH 04/27] [release/6.0] Set WebApplication.New().ServerFeatures. (#43001) --- src/DefaultBuilder/src/WebApplication.cs | 2 +- .../WebApplicationTests.cs | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/DefaultBuilder/src/WebApplication.cs b/src/DefaultBuilder/src/WebApplication.cs index 9d0a837c8300..2c1fb9d17925 100644 --- a/src/DefaultBuilder/src/WebApplication.cs +++ b/src/DefaultBuilder/src/WebApplication.cs @@ -27,7 +27,7 @@ public sealed class WebApplication : IHost, IApplicationBuilder, IEndpointRouteB internal WebApplication(IHost host) { _host = host; - ApplicationBuilder = new ApplicationBuilder(host.Services); + ApplicationBuilder = new ApplicationBuilder(host.Services, ServerFeatures); Logger = host.Services.GetRequiredService().CreateLogger(Environment.ApplicationName); Properties[GlobalEndpointRouteBuilderKey] = this; diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs index d487d2594939..7be67edb239f 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs @@ -31,6 +31,16 @@ namespace Microsoft.AspNetCore.Tests { public class WebApplicationTests { + [Fact] + public async Task WebApplicationBuilder_New() + { + var builder = WebApplication.CreateBuilder(new string[] { "--urls", "http://localhost:5001" }); + + await using var app = builder.Build(); + var newApp = (app as IApplicationBuilder).New(); + Assert.NotNull(newApp.ServerFeatures); + } + [Fact] public async Task WebApplicationBuilderConfiguration_IncludesCommandLineArguments() { @@ -1696,13 +1706,13 @@ public void EmptyAppConfiguration() createdDirectory = true; Directory.CreateDirectory(wwwroot); } - + try { var builder = WebApplication.CreateBuilder(); - + builder.WebHost.ConfigureAppConfiguration((ctx, config) => { }); - + using var app = builder.Build(); var hostEnv = app.Services.GetRequiredService(); Assert.Equal(wwwroot, hostEnv.WebRootPath); From 875a6fc91432f66608a3f2d228dd708759ccd55d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 02:56:33 +0000 Subject: [PATCH 05/27] [release/6.0] (deps): Bump src/submodules/spa-templates (#43022) Bumps [src/submodules/spa-templates](https://github.com/dotnet/spa-templates) from `74e05a1` to `0c5a96b`. - [Release notes](https://github.com/dotnet/spa-templates/releases) - [Commits](https://github.com/dotnet/spa-templates/compare/74e05a19dc83b736877cb2c5120456948d7799f1...0c5a96babb595838516b43680db6f100c8867a7c) --- updated-dependencies: - dependency-name: src/submodules/spa-templates dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/spa-templates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/spa-templates b/src/submodules/spa-templates index 74e05a19dc83..0c5a96babb59 160000 --- a/src/submodules/spa-templates +++ b/src/submodules/spa-templates @@ -1 +1 @@ -Subproject commit 74e05a19dc83b736877cb2c5120456948d7799f1 +Subproject commit 0c5a96babb595838516b43680db6f100c8867a7c From 0b2d8b00180e36435f4f826149e863d8bd02764d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 3 Aug 2022 02:59:14 +0000 Subject: [PATCH 06/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 6 ++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ce2712d5811..4fae7b21cc0f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -28,8 +27,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b17333b6fd42..4d45b36654b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 62e1b2f494af376a4588bf3d365f7be5443d4a5d + 1adf5a784bba0a5aa90df2f900702da4c3d19b1d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 81d0eed05806..c6aa91cf2ffb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,14 +122,14 @@ 6.0.5 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 6.0.0-beta.22314.7 6.0.0-beta.22314.7 From 91d095d8c67b33e9cfae51db76ac78fedbf4a5bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Aug 2022 03:32:29 +0000 Subject: [PATCH 07/27] [release/6.0] (deps): Bump src/submodules/googletest (#43021) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `96f5142` to `dd7a9d2`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/96f51426e4c776a71d0a446c1e4f4c7a5ea921df...dd7a9d29a33de34836c345c3b753d4eba15c5f44) --- 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 96f51426e4c7..dd7a9d29a33d 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 96f51426e4c776a71d0a446c1e4f4c7a5ea921df +Subproject commit dd7a9d29a33de34836c345c3b753d4eba15c5f44 From f46133fe8823b3974cc4d23a243ff47182d01e00 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 3 Aug 2022 12:40:07 -0700 Subject: [PATCH 08/27] Default to 3 local retries (#40503) --- eng/test-configuration.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/test-configuration.json b/eng/test-configuration.json index 6f8c5e36aaf1..02a918bc9f4d 100644 --- a/eng/test-configuration.json +++ b/eng/test-configuration.json @@ -1,6 +1,6 @@ { "version" : 1, - "defaultOnFailure": "fail", + "defaultOnFailure": "retry", "localRerunCount" : 3, "retryOnRules": [ {"testName": {"contains": "AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess"}}, @@ -15,4 +15,4 @@ ], "quarantineRules": [ ] -} \ No newline at end of file +} From cffec518cad67f879049f3e0e1a45a01d3e75984 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 5 Aug 2022 02:28:48 +0000 Subject: [PATCH 09/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-efcore --- NuGet.config | 8 +++---- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4fae7b21cc0f..25bdb7b3fd5a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d45b36654b6..f994aeafc50d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1adf5a784bba0a5aa90df2f900702da4c3d19b1d + ec64cd55651971f02d0a0d859790d714f0513c0b https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 https://github.com/dotnet/runtime @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 https://github.com/dotnet/runtime @@ -245,33 +245,33 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5a522a116acb7118c30e71881e296063008a63f2 + 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 diff --git a/eng/Versions.props b/eng/Versions.props index c6aa91cf2ffb..8392890d73f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,12 +63,12 @@ 6.0.0 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8 - 6.0.8-servicing.22377.7 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9 + 6.0.9-servicing.22403.2 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.8-servicing.22377.7 + 6.0.9-servicing.22403.2 6.0.0 6.0.0 6.0.1 From fb8c9e7800619ad6ce75fc9591cd4b06c93e5164 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 Aug 2022 00:49:24 +0000 Subject: [PATCH 10/27] Suppress downgrade error in SharedFx bundle (#43122) Co-authored-by: William Godbe --- src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs index 453548c27511..ca33112a07ce 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs +++ b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs @@ -4,6 +4,7 @@ From 7f3f9120830e4ef3b622dc078315e71e74902012 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 6 Aug 2022 13:51:33 +0000 Subject: [PATCH 11/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25bdb7b3fd5a..a182a1908c20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f994aeafc50d..fef1d18b3b5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - ec64cd55651971f02d0a0d859790d714f0513c0b + 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 https://github.com/dotnet/runtime From 5470a6cd129c0e940f9787506e8419c21d7cb2e1 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Tue, 9 Aug 2022 12:10:20 -0700 Subject: [PATCH 12/27] [6.0] macOS dev-certs - Handle keychain paths with spaces (#43148) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [6.0] macOS dev-certs - Handle keychain paths with spaces * Update src/Shared/CertificateGeneration/MacOSCertificateManager.cs Co-authored-by: Sébastien Ros Co-authored-by: Sébastien Ros --- .../CertificateGeneration/MacOSCertificateManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Shared/CertificateGeneration/MacOSCertificateManager.cs b/src/Shared/CertificateGeneration/MacOSCertificateManager.cs index c58eff3e0382..a63aeb50ed82 100644 --- a/src/Shared/CertificateGeneration/MacOSCertificateManager.cs +++ b/src/Shared/CertificateGeneration/MacOSCertificateManager.cs @@ -19,17 +19,17 @@ internal class MacOSCertificateManager : CertificateManager private static readonly string MacOSUserKeyChain = Environment.GetEnvironmentVariable("HOME") + "/Library/Keychains/login.keychain-db"; private const string MacOSSystemKeyChain = "/Library/Keychains/System.keychain"; private const string MacOSFindCertificateCommandLine = "security"; - private const string MacOSFindCertificateCommandLineArgumentsFormat = "find-certificate -c {0} -a -Z -p " + MacOSSystemKeyChain; + private const string MacOSFindCertificateCommandLineArgumentsFormat = "find-certificate -c {0} -a -Z -p \"" + MacOSSystemKeyChain + "\""; private const string MacOSFindCertificateOutputRegex = "SHA-1 hash: ([0-9A-Z]+)"; private const string MacOSRemoveCertificateTrustCommandLine = "sudo"; - private const string MacOSRemoveCertificateTrustCommandLineArgumentsFormat = "security remove-trusted-cert -d {0}"; + private const string MacOSRemoveCertificateTrustCommandLineArgumentsFormat = "security remove-trusted-cert -d \"{0}\""; private const string MacOSDeleteCertificateCommandLine = "sudo"; - private const string MacOSDeleteCertificateCommandLineArgumentsFormat = "security delete-certificate -Z {0} {1}"; + private const string MacOSDeleteCertificateCommandLineArgumentsFormat = "security delete-certificate -Z {0} \"{1}\""; private const string MacOSTrustCertificateCommandLine = "sudo"; - private const string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " "; + private const string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k \"" + MacOSSystemKeyChain + "\" "; private const string MacOSAddCertificateToKeyChainCommandLine = "security"; - private static readonly string MacOSAddCertificateToKeyChainCommandLineArgumentsFormat = "import {0} -k " + MacOSUserKeyChain + " -t cert -f pkcs12 -P {1} -A"; + private static readonly string MacOSAddCertificateToKeyChainCommandLineArgumentsFormat = "import \"{0}\" -k \"" + MacOSUserKeyChain + "\" -t cert -f pkcs12 -P {1} -A"; public const string InvalidCertificateState = "The ASP.NET Core developer certificate is in an invalid state. " + "To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates " + From 347c6daa74321a00f5b2688386cc0f6325e5834c Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Aug 2022 12:21:10 -0700 Subject: [PATCH 13/27] Update SDK, baseline, SiteEx --- eng/Baseline.Designer.props | 450 ++++++++++++++++++------------------ eng/Baseline.xml | 214 ++++++++--------- eng/Versions.props | 4 +- global.json | 6 +- 4 files changed, 337 insertions(+), 337 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index dc5385edc181..28042e9d0222 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - - - + + + @@ -34,120 +34,120 @@ - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 @@ -155,114 +155,114 @@ - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - - - + + + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - - + + @@ -270,7 +270,7 @@ - 6.0.7 + 6.0.8 @@ -278,132 +278,132 @@ - 6.0.7 + 6.0.8 - + - + - + - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - - + + - + - - + + - + - - + + - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 @@ -411,71 +411,71 @@ - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 @@ -491,195 +491,195 @@ - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - - + + - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - - + + - - + + - - + + - 6.0.7 + 6.0.8 - - + + - - + + - - + + - - + + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - - - - + + + + - 6.0.7 + 6.0.8 @@ -688,69 +688,69 @@ - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 @@ -769,7 +769,7 @@ - 6.0.7 + 6.0.8 @@ -788,7 +788,7 @@ - 6.0.7 + 6.0.8 @@ -804,46 +804,46 @@ - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - - - + + + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 @@ -853,7 +853,7 @@ - 6.0.7 + 6.0.8 @@ -862,73 +862,73 @@ - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - + - + - + - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 @@ -957,11 +957,11 @@ - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 @@ -979,13 +979,13 @@ - 6.0.7 + 6.0.8 - 6.0.7 + 6.0.8 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 79b54e2ee34d..549d55431ba9 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,111 +4,111 @@ 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 1a1d36eeed44..6096db293484 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 6 0 9 - false + true @@ -214,7 +214,7 @@ 2.1.1 2.2.0 - 3.1.27-servicing-22316-11 + 3.1.28-servicing-22364-2 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version) 5.0.17-servicing-22215-7 diff --git a/global.json b/global.json index bbd837de7707..fe757ec1255f 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "6.0.107" + "version": "6.0.108" }, "tools": { - "dotnet": "6.0.107", + "dotnet": "6.0.108", "runtimes": { "dotnet/x64": [ "2.1.30", @@ -13,7 +13,7 @@ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ], "aspnetcore/x64": [ - "3.1.27" + "3.1.28" ] }, "Git": "2.22.0", From 4a52cfedc5ffd918d42bb69fccc93c5dd20704b2 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Aug 2022 22:08:15 +0000 Subject: [PATCH 14/27] Merged PR 24735: [6.0] ASP.NET ModelStateDictionary fix Adding Recursion depth control to ModelStateDictionary --- .../src/ModelBinding/ModelStateDictionary.cs | 48 ++++-- src/Mvc/Mvc.Abstractions/src/Resources.resx | 5 +- .../ModelBinding/ModelStateDictionaryTest.cs | 157 ++++++++++++++++++ .../ControllerActionInvokerProvider.cs | 6 + .../ControllerRequestDelegateFactory.cs | 6 + .../ControllerActionInvokerProviderTest.cs | 97 +++++++++++ 6 files changed, 308 insertions(+), 11 deletions(-) create mode 100644 src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerProviderTest.cs diff --git a/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs index e72d6443c4e1..1ff9b7dd9b3c 100644 --- a/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs +++ b/src/Mvc/Mvc.Abstractions/src/ModelBinding/ModelStateDictionary.cs @@ -25,6 +25,9 @@ public class ModelStateDictionary : IReadOnlyDictionary public static readonly int DefaultMaxAllowedErrors = 200; + // internal for testing + internal const int DefaultMaxRecursionDepth = 32; + private const char DelimiterDot = '.'; private const char DelimiterOpen = '['; @@ -43,8 +46,18 @@ public ModelStateDictionary() /// Initializes a new instance of the class. /// public ModelStateDictionary(int maxAllowedErrors) + : this(maxAllowedErrors, maxValidationDepth: DefaultMaxRecursionDepth, maxStateDepth: DefaultMaxRecursionDepth) + { + } + + /// + /// Initializes a new instance of the class. + /// + private ModelStateDictionary(int maxAllowedErrors, int maxValidationDepth, int maxStateDepth) { MaxAllowedErrors = maxAllowedErrors; + MaxValidationDepth = maxValidationDepth; + MaxStateDepth = maxStateDepth; var emptySegment = new StringSegment(buffer: string.Empty); _root = new ModelStateNode(subKey: emptySegment) { @@ -58,7 +71,9 @@ public ModelStateDictionary(int maxAllowedErrors) /// /// The to copy values from. public ModelStateDictionary(ModelStateDictionary dictionary) - : this(dictionary?.MaxAllowedErrors ?? DefaultMaxAllowedErrors) + : this(dictionary?.MaxAllowedErrors ?? DefaultMaxAllowedErrors, + dictionary?.MaxValidationDepth ?? DefaultMaxRecursionDepth, + dictionary?.MaxStateDepth ?? DefaultMaxRecursionDepth) { if (dictionary == null) { @@ -154,7 +169,7 @@ public bool IsValid } /// - public ModelValidationState ValidationState => GetValidity(_root) ?? ModelValidationState.Valid; + public ModelValidationState ValidationState => GetValidity(_root, currentDepth: 0) ?? ModelValidationState.Valid; /// public ModelStateEntry? this[string key] @@ -174,6 +189,10 @@ public ModelStateEntry? this[string key] // Flag that indicates if TooManyModelErrorException has already been added to this dictionary. private bool HasRecordedMaxModelError { get; set; } + internal int? MaxValidationDepth { get; set; } + + internal int? MaxStateDepth { get; set; } + /// /// Adds the specified to the instance /// that is associated with the specified . If the maximum number of allowed @@ -217,7 +236,6 @@ public bool TryAddModelException(string key, Exception exception) return false; } - ErrorCount++; AddModelErrorCore(key, exception); return true; } @@ -327,7 +345,6 @@ public bool TryAddModelError(string key, Exception exception, ModelMetadata meta return TryAddModelError(key, exception.Message); } - ErrorCount++; AddModelErrorCore(key, exception); return true; } @@ -385,13 +402,13 @@ public bool TryAddModelError(string key, string errorMessage) return false; } - ErrorCount++; var modelState = GetOrAddNode(key); Count += !modelState.IsContainerNode ? 0 : 1; modelState.ValidationState = ModelValidationState.Invalid; modelState.MarkNonContainerNode(); modelState.Errors.Add(errorMessage); + ErrorCount++; return true; } @@ -411,7 +428,7 @@ public ModelValidationState GetFieldValidationState(string key) } var item = GetNode(key); - return GetValidity(item) ?? ModelValidationState.Unvalidated; + return GetValidity(item, currentDepth: 0) ?? ModelValidationState.Unvalidated; } /// @@ -611,11 +628,18 @@ private ModelStateNode GetOrAddNode(string key) var current = _root; if (key.Length > 0) { + var currentDepth = 0; var match = default(MatchResult); do { + if (MaxStateDepth != null && currentDepth >= MaxStateDepth) + { + throw new InvalidOperationException(Resources.FormatModelStateDictionary_MaxModelStateDepth(MaxStateDepth)); + } + var subKey = FindNext(key, ref match); current = current.GetOrAddNode(subKey); + currentDepth++; } while (match.Type != Delimiter.None); @@ -661,9 +685,10 @@ private static StringSegment FindNext(string key, ref MatchResult currentMatch) return new StringSegment(key, keyStart, index - keyStart); } - private static ModelValidationState? GetValidity(ModelStateNode? node) + private ModelValidationState? GetValidity(ModelStateNode? node, int currentDepth) { - if (node == null) + if (node == null || + (MaxValidationDepth != null && currentDepth >= MaxValidationDepth)) { return null; } @@ -686,9 +711,11 @@ private static StringSegment FindNext(string key, ref MatchResult currentMatch) if (node.ChildNodes != null) { + currentDepth++; + for (var i = 0; i < node.ChildNodes.Count; i++) { - var entryState = GetValidity(node.ChildNodes[i]); + var entryState = GetValidity(node.ChildNodes[i], currentDepth); if (entryState == ModelValidationState.Unvalidated) { @@ -712,7 +739,6 @@ private void EnsureMaxErrorsReachedRecorded() var exception = new TooManyModelErrorsException(Resources.ModelStateDictionary_MaxModelStateErrors); AddModelErrorCore(string.Empty, exception); HasRecordedMaxModelError = true; - ErrorCount++; } } @@ -723,6 +749,8 @@ private void AddModelErrorCore(string key, Exception exception) modelState.ValidationState = ModelValidationState.Invalid; modelState.MarkNonContainerNode(); modelState.Errors.Add(exception); + + ErrorCount++; } /// diff --git a/src/Mvc/Mvc.Abstractions/src/Resources.resx b/src/Mvc/Mvc.Abstractions/src/Resources.resx index c4159218e799..5d38b2bdae14 100644 --- a/src/Mvc/Mvc.Abstractions/src/Resources.resx +++ b/src/Mvc/Mvc.Abstractions/src/Resources.resx @@ -180,4 +180,7 @@ Record type '{0}' has validation metadata defined on property '{1}' that will be ignored. '{1}' is a parameter in the record primary constructor and validation metadata must be associated with the constructor parameter. - + + The specified key exceeded the maximum ModelState depth: {0} + + \ No newline at end of file diff --git a/src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs index 229457d71006..750ada389f97 100644 --- a/src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs +++ b/src/Mvc/Mvc.Abstractions/test/ModelBinding/ModelStateDictionaryTest.cs @@ -1601,6 +1601,163 @@ public void GetModelStateForProperty_ReturnsModelStateForIndexedChildren() Assert.Equal("value1", property.RawValue); } + + [Fact] + public void GetFieldValidationState_ReturnsUnvalidated_IfTreeHeightIsGreaterThanLimit() + { + // Arrange + var stackLimit = 5; + var dictionary = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stackLimit + 1)); + dictionary.MaxValidationDepth = stackLimit; + dictionary.MaxStateDepth = null; + dictionary.MarkFieldValid(key); + + // Act + var validationState = dictionary.GetFieldValidationState("foo"); + + // Assert + Assert.Equal(ModelValidationState.Unvalidated, validationState); + } + + [Fact] + public void IsValidProperty_ReturnsTrue_IfTreeHeightIsGreaterThanLimit() + { + // Arrange + var stackLimit = 5; + var dictionary = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stackLimit + 1)); + dictionary.MaxValidationDepth = stackLimit; + dictionary.MaxStateDepth = null; + dictionary.AddModelError(key, "some error"); + + // Act + var isValid = dictionary.IsValid; + var validationState = dictionary.ValidationState; + + // Assert + Assert.True(isValid); + Assert.Equal(ModelValidationState.Valid, validationState); + } + + [Fact] + public void TryAddModelException_Throws_IfKeyHasTooManySegments() + { + // Arrange + var exception = new TestException(); + + var stateDepth = 5; + var dictionary = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stateDepth + 1)); + dictionary.MaxStateDepth = stateDepth; + + // Act + var invalidException = Assert.Throws(() => dictionary.TryAddModelException(key, exception)); + + // Assert + Assert.Equal( + $"The specified key exceeded the maximum ModelState depth: {dictionary.MaxStateDepth}", + invalidException.Message); + } + + [Fact] + public void TryAddModelError_Throws_IfKeyHasTooManySegments() + { + // Arrange + var stateDepth = 5; + var dictionary = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stateDepth + 1)); + dictionary.MaxStateDepth = stateDepth; + + // Act + var invalidException = Assert.Throws(() => dictionary.TryAddModelError(key, "errorMessage")); + + // Assert + Assert.Equal( + $"The specified key exceeded the maximum ModelState depth: {dictionary.MaxStateDepth}", + invalidException.Message); + } + + [Fact] + public void SetModelValue_Throws_IfKeyHasTooManySegments() + { + var stateDepth = 5; + var dictionary = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stateDepth + 1)); + dictionary.MaxStateDepth = stateDepth; + + // Act + var invalidException = Assert.Throws(() => dictionary.SetModelValue(key, string.Empty, string.Empty)); + + // Assert + Assert.Equal( + $"The specified key exceeded the maximum ModelState depth: {dictionary.MaxStateDepth}", + invalidException.Message); + } + + [Fact] + public void MarkFieldValid_Throws_IfKeyHasTooManySegments() + { + // Arrange + var stateDepth = 5; + var source = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stateDepth + 1)); + source.MaxStateDepth = stateDepth; + + // Act + var exception = Assert.Throws(() => source.MarkFieldValid(key)); + + // Assert + Assert.Equal( + $"The specified key exceeded the maximum ModelState depth: {source.MaxStateDepth}", + exception.Message); + } + + [Fact] + public void MarkFieldSkipped_Throws_IfKeyHasTooManySegments() + { + // Arrange + var stateDepth = 5; + var source = new ModelStateDictionary(); + var key = string.Join(".", Enumerable.Repeat("foo", stateDepth + 1)); + source.MaxStateDepth = stateDepth; + + // Act + var exception = Assert.Throws(() => source.MarkFieldSkipped(key)); + + // Assert + Assert.Equal( + $"The specified key exceeded the maximum ModelState depth: {source.MaxStateDepth}", + exception.Message); + } + + [Fact] + public void Constructor_SetsDefaultRecursionDepth() + { + // Arrange && Act + var dictionary = new ModelStateDictionary(); + + // Assert + Assert.Equal(ModelStateDictionary.DefaultMaxRecursionDepth, dictionary.MaxValidationDepth); + Assert.Equal(ModelStateDictionary.DefaultMaxRecursionDepth, dictionary.MaxStateDepth); + } + + [Fact] + public void CopyConstructor_PreservesRecursionDepth() + { + // Arrange + var dictionary = new ModelStateDictionary(); + dictionary.MaxValidationDepth = 5; + dictionary.MaxStateDepth = 4; + + // Act + var newDictionary = new ModelStateDictionary(dictionary); + + // Assert + Assert.Equal(dictionary.MaxValidationDepth, newDictionary.MaxValidationDepth); + Assert.Equal(dictionary.MaxStateDepth, newDictionary.MaxStateDepth); + } + private class OptionsAccessor : IOptions { public MvcOptions Value { get; } = new MvcOptions(); diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs index dd576bf2c8ad..c1a8f07877f8 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/ControllerActionInvokerProvider.cs @@ -20,6 +20,8 @@ internal class ControllerActionInvokerProvider : IActionInvokerProvider private readonly ControllerActionInvokerCache _controllerActionInvokerCache; private readonly IReadOnlyList _valueProviderFactories; private readonly int _maxModelValidationErrors; + private readonly int? _maxValidationDepth; + private readonly int _maxModelBindingRecursionDepth; private readonly ILogger _logger; private readonly DiagnosticListener _diagnosticListener; private readonly IActionResultTypeMapper _mapper; @@ -46,6 +48,8 @@ public ControllerActionInvokerProvider( _controllerActionInvokerCache = controllerActionInvokerCache; _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray(); _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors; + _maxValidationDepth = optionsAccessor.Value.MaxValidationDepth; + _maxModelBindingRecursionDepth = optionsAccessor.Value.MaxModelBindingRecursionDepth; _logger = loggerFactory.CreateLogger(); _diagnosticListener = diagnosticListener; _mapper = mapper; @@ -70,6 +74,8 @@ public void OnProvidersExecuting(ActionInvokerProviderContext context) ValueProviderFactories = new CopyOnWriteList(_valueProviderFactories) }; controllerContext.ModelState.MaxAllowedErrors = _maxModelValidationErrors; + controllerContext.ModelState.MaxValidationDepth = _maxValidationDepth; + controllerContext.ModelState.MaxStateDepth = _maxModelBindingRecursionDepth; var (cacheEntry, filters) = _controllerActionInvokerCache.GetCachedResult(controllerContext); diff --git a/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs b/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs index 74d84f8541e4..d62237dbfb92 100644 --- a/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs +++ b/src/Mvc/Mvc.Core/src/Routing/ControllerRequestDelegateFactory.cs @@ -21,6 +21,8 @@ internal class ControllerRequestDelegateFactory : IRequestDelegateFactory private readonly ControllerActionInvokerCache _controllerActionInvokerCache; private readonly IReadOnlyList _valueProviderFactories; private readonly int _maxModelValidationErrors; + private readonly int? _maxValidationDepth; + private readonly int _maxModelBindingRecursionDepth; private readonly ILogger _logger; private readonly DiagnosticListener _diagnosticListener; private readonly IActionResultTypeMapper _mapper; @@ -48,6 +50,8 @@ public ControllerRequestDelegateFactory( _controllerActionInvokerCache = controllerActionInvokerCache; _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray(); _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors; + _maxValidationDepth = optionsAccessor.Value.MaxValidationDepth; + _maxModelBindingRecursionDepth = optionsAccessor.Value.MaxModelBindingRecursionDepth; _enableActionInvokers = optionsAccessor.Value.EnableActionInvokers; _logger = loggerFactory.CreateLogger(); _diagnosticListener = diagnosticListener; @@ -86,6 +90,8 @@ public ControllerRequestDelegateFactory( }; controllerContext.ModelState.MaxAllowedErrors = _maxModelValidationErrors; + controllerContext.ModelState.MaxValidationDepth = _maxValidationDepth; + controllerContext.ModelState.MaxStateDepth = _maxModelBindingRecursionDepth; var (cacheEntry, filters) = _controllerActionInvokerCache.GetCachedResult(controllerContext); diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerProviderTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerProviderTest.cs new file mode 100644 index 000000000000..c278f8ba7f24 --- /dev/null +++ b/src/Mvc/Mvc.Core/test/Infrastructure/ControllerActionInvokerProviderTest.cs @@ -0,0 +1,97 @@ +// 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 System.Reflection; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc.Abstractions; +using Microsoft.AspNetCore.Mvc.Controllers; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.Extensions.Options; +using Moq; + +namespace Microsoft.AspNetCore.Mvc.Infrastructure +{ + public class ControllerActionInvokerProviderTest + { + [Fact] + public void OnExecuting_ConfiguresModelState_WithMvcOptions() + { + // Arrange + var provider = CreateInvokerProvider(new MvcOptions() { MaxValidationDepth = 1, MaxModelBindingRecursionDepth = 2, MaxModelValidationErrors = 3 }); + + var context = new ActionInvokerProviderContext(new ActionContext() + { + ActionDescriptor = GetControllerActionDescriptor(), + HttpContext = new DefaultHttpContext(), + RouteData = new RouteData(), + }); + + // Act + provider.OnProvidersExecuting(context); + + // Assert + var invoker = Assert.IsType(context.Result); + Assert.Equal(1, invoker.ControllerContext.ModelState.MaxValidationDepth); + Assert.Equal(2, invoker.ControllerContext.ModelState.MaxStateDepth); + Assert.Equal(3, invoker.ControllerContext.ModelState.MaxAllowedErrors); + + } + + private static ControllerActionDescriptor GetControllerActionDescriptor() + { + var method = typeof(TestActions).GetMethod(nameof(TestActions.GetAction)); + var actionDescriptor = new ControllerActionDescriptor + { + MethodInfo = method, + FilterDescriptors = new List(), + ControllerTypeInfo = typeof(TestActions).GetTypeInfo(), + }; + + foreach (var filterAttribute in method.GetCustomAttributes().OfType()) + { + actionDescriptor.FilterDescriptors.Add(new FilterDescriptor(filterAttribute, FilterScope.Action)); + } + + return actionDescriptor; + } + + private static ControllerActionInvokerProvider CreateInvokerProvider(MvcOptions mvcOptions = null) + { + var modelMetadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); + var modelBinderFactory = TestModelBinderFactory.CreateDefault(); + mvcOptions ??= new MvcOptions(); + + var parameterBinder = new ParameterBinder( + modelMetadataProvider, + TestModelBinderFactory.CreateDefault(), + Mock.Of(), + Options.Create(mvcOptions), + NullLoggerFactory.Instance); + + var cache = new ControllerActionInvokerCache( + parameterBinder, + modelBinderFactory, + modelMetadataProvider, + new[] { new DefaultFilterProvider() }, + Mock.Of(), + Options.Create(mvcOptions)); + + return new( + cache, + Options.Create(mvcOptions), + NullLoggerFactory.Instance, + new DiagnosticListener("Microsoft.AspNetCore"), + new ActionResultTypeMapper()); + } + + private class TestActions : Controller + { + public IActionResult GetAction() => new OkResult(); + } + } +} From 73b4d7b765cbe70e3ba96af55c3c45def2cd9124 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 10 Aug 2022 00:28:27 +0000 Subject: [PATCH 15/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index a182a1908c20..ef80dce64d50 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fef1d18b3b5f..42e8e5f2fc69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1d9de696f0e1358bd8b7f3f8e1a7475d24c57129 + 71581b5846502a5b1aa00c2c94ec95cea0002bae https://github.com/dotnet/runtime From 8c88ece7d50702e11a870e04477b4e5df1cc1375 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 10 Aug 2022 13:23:51 +0000 Subject: [PATCH 16/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef80dce64d50..04c1a8a8be91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42e8e5f2fc69..92f8ec9a8f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 71581b5846502a5b1aa00c2c94ec95cea0002bae + 9692cb151f30aa633c7b1be277df4a691fef44dd https://github.com/dotnet/runtime From 0ff4af7801d841e8af89fcbd79d7d2b94553da53 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 20:08:04 +0000 Subject: [PATCH 17/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 04c1a8a8be91..d13f7bd6c538 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,8 @@ - + + @@ -30,7 +31,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92f8ec9a8f47..4394a2ff830d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 https://github.com/dotnet/runtime @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 76e8f81ae2e631e7f59d35521bacba98ed0a8a01 + 41db717d4a566577c1819b1690a454e4ce939f93 diff --git a/eng/Versions.props b/eng/Versions.props index 155f02606c03..10519f108c43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22403.2 + 6.0.9-servicing.22412.2 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22403.2 + 6.0.9-servicing.22412.2 6.0.0 6.0.0 6.0.1 From 0d0b1ea1361745d5c69c7715813dd5f03095d3a2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Aug 2022 22:15:40 +0000 Subject: [PATCH 18/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d13f7bd6c538..714d667638ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4394a2ff830d..d75b5c317e38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9692cb151f30aa633c7b1be277df4a691fef44dd + e856f287a08f329e50dbea63fec6282b66f0ba2f https://github.com/dotnet/runtime From 4a119bfb885de647e07eb977dde7e09153476074 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 15 Aug 2022 20:22:50 +0000 Subject: [PATCH 19/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 6 ++---- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 714d667638ef..de5f88f1a172 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,7 @@ - - + @@ -31,8 +30,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d75b5c317e38..92c362823692 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://github.com/dotnet/runtime @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41db717d4a566577c1819b1690a454e4ce939f93 + a3857767ed57ae348eb61fcbf64823db59f8b926 diff --git a/eng/Versions.props b/eng/Versions.props index 10519f108c43..12edcb7af6b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22412.2 + 6.0.9-servicing.22413.8 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22412.2 + 6.0.9-servicing.22413.8 6.0.0 6.0.0 6.0.1 From 2c0e137caac45e8c375f9984a8c95f79116394ba Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 15 Aug 2022 22:43:35 +0000 Subject: [PATCH 20/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index de5f88f1a172..71ba10bcabef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92c362823692..29107aad7a9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - e856f287a08f329e50dbea63fec6282b66f0ba2f + 33e3c950af2eb996c0b3c48e30eb4471138da675 https://github.com/dotnet/runtime From abb99233280e21bda68bebef4524f2296c8268d9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Aug 2022 00:49:13 +0000 Subject: [PATCH 21/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 71ba10bcabef..612d3b068c35 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29107aad7a9f..82d510a18a37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://github.com/dotnet/runtime @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a3857767ed57ae348eb61fcbf64823db59f8b926 + ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 diff --git a/eng/Versions.props b/eng/Versions.props index 12edcb7af6b2..c743119aae26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.4 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22413.8 + 6.0.9-servicing.22415.4 6.0.0 6.0.0 6.0.1 From 5b90864476094db35fe1192e9efa7c1f1a1a0fe2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Aug 2022 08:39:24 +0000 Subject: [PATCH 22/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 612d3b068c35..3fc53ea006ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82d510a18a37..72147a2ba192 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -129,9 +129,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -233,9 +233,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7cca709db2944a09b4db6ca7b20c457ff260fb5a + b114055b16ac8213ce47891aae7de2f7ccda93ab https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ff0f0ebfb2250a11a5c36bb5ec64e1501de90b47 + b114055b16ac8213ce47891aae7de2f7ccda93ab diff --git a/eng/Versions.props b/eng/Versions.props index c743119aae26..8f26e52bffa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.12 6.0.0 6.0.1 6.0.0 @@ -91,7 +91,7 @@ 6.0.0 6.0.1 6.0.0 - 6.0.1 + 6.0.2 6.0.0 6.0.0 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22415.4 + 6.0.9-servicing.22415.12 6.0.0 6.0.0 6.0.1 @@ -117,7 +117,7 @@ 6.0.1 6.0.0 6.0.0 - 6.0.5 + 6.0.6 6.0.0 6.0.5 From 162da039f19577980666f14b5d317b828de583ff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Aug 2022 05:48:15 +0000 Subject: [PATCH 23/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3fc53ea006ce..d51b0aaf58b0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72147a2ba192..d9dddc310988 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,7 +131,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://github.com/dotnet/runtime @@ -235,7 +235,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + ca2f1756cdf3a0f6224a0ce94614be877f765318 diff --git a/eng/Versions.props b/eng/Versions.props index 8f26e52bffa4..21bea0b03f8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22415.12 + 6.0.9-servicing.22416.9 6.0.0 6.0.0 6.0.1 From d656a592f211bf88a47ed154ff6f22c65f35e468 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 17 Aug 2022 16:45:39 +0000 Subject: [PATCH 24/27] Merged PR 25055: Fix sha for System.Security.Cryptography.Xml # {PR title} Summary of the changes (Less than 80 chars) ## Description {Detail} Fixes #{bug number} (in this specific format) ## Customer Impact {Justification} ## Regression? - [ ] Yes - [ ] No [If yes, specify the version the behavior has regressed from] ## Risk - [ ] High - [ ] Medium - [ ] Low [Justify the selection above] ## Verification - [ ] Manual (required) - [ ] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props Fix sha for System.Security.Cryptography.Xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9dddc310988..f4f7f398ead1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -223,7 +223,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b114055b16ac8213ce47891aae7de2f7ccda93ab + 55fb7ef977e7d120dc12f0960edcff0739d7ee0e https://github.com/dotnet/runtime From d7028999dec2febc64a5dd51af7f778a2fa2ba82 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 Aug 2022 03:50:58 +0000 Subject: [PATCH 25/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index d51b0aaf58b0..1b6f3028d141 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f4f7f398ead1..2bfde77682b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,7 +131,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://github.com/dotnet/runtime @@ -235,7 +235,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ca2f1756cdf3a0f6224a0ce94614be877f765318 + 947179143367866676c4fe5167a01c8db1f00374 diff --git a/eng/Versions.props b/eng/Versions.props index 21bea0b03f8c..f5abc7fdde22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22418.14 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22416.9 + 6.0.9-servicing.22418.14 6.0.0 6.0.0 6.0.1 From 066f1bc6167dea415744d2ac4c2ecc6fa572cc0c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 Aug 2022 21:27:40 +0000 Subject: [PATCH 26/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b6f3028d141..d0c360fec82c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bfde77682b1..db59c9e565a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,7 +131,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://github.com/dotnet/runtime @@ -235,7 +235,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 947179143367866676c4fe5167a01c8db1f00374 + 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 diff --git a/eng/Versions.props b/eng/Versions.props index f5abc7fdde22..88537db7f8fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22418.14 + 6.0.9-servicing.22419.1 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22418.14 + 6.0.9-servicing.22419.1 6.0.0 6.0.0 6.0.1 From 3fe12b935c03138f76364dc877a7e069e254b5b2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 20 Aug 2022 02:28:25 +0000 Subject: [PATCH 27/27] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0c360fec82c..63330d10bbf3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db59c9e565a7..bf05f45e33d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,7 +131,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -235,7 +235,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 18ddbe8adabf67a1cc1ca7ae35384872a789aa36 + 163a63591cf9e9b682063cf3995948c2b885a042 diff --git a/eng/Versions.props b/eng/Versions.props index 88537db7f8fc..bc3e57278226 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.9 6.0.9 6.0.9 - 6.0.9-servicing.22419.1 + 6.0.9-servicing.22419.5 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.9-servicing.22419.1 + 6.0.9-servicing.22419.5 6.0.0 6.0.0 6.0.1