From ed19aa6c11a7080012535c8f335536ec2d8e8f7a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 7 Jul 2021 00:55:02 +0000 Subject: [PATCH 1/7] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 89f6ea6f1279..2ffd642194a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,13 @@ - + + + + + @@ -23,9 +27,13 @@ + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 436008b82163..772a2707b821 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1af30fd9b4752ab36eff63d9bc75888d41c85657 + 9667f7422737585dd452902593261d799138d99e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 236d26bbdac8..92f3068e8b09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,14 +127,14 @@ 5.0.2 - 5.0.8 - 5.0.8 - 5.0.8 - 5.0.8 - 5.0.8 - 5.0.8 - 5.0.8 - 5.0.8 + 5.0.9 + 5.0.9 + 5.0.9 + 5.0.9 + 5.0.9 + 5.0.9 + 5.0.9 + 5.0.9 5.0.0-beta.21262.2 From df36d984636e9c3667e9873f64a2fa54c057fa66 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 7 Jul 2021 20:51:23 +0000 Subject: [PATCH 2/7] [internal/release/5.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 2ffd642194a2..6ebae8a76642 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 47b85bbcb816..fd07a3a2f72d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 9667f7422737585dd452902593261d799138d99e + 0ae66f8622436542036c1a38409a2ec34545e55a https://github.com/dotnet/runtime From 45a120ee105e3e70cca7cfc988d8dd926e12fdd4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 8 Jul 2021 02:21:56 +0000 Subject: [PATCH 3/7] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 2 ++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6ebae8a76642..f0da54f3460c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,6 +12,7 @@ + @@ -26,6 +27,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd07a3a2f72d..2a183c296fa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -294,17 +294,17 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 35964c9215613d66a687ebcb2d7fcd9496390ee7 + 1f3e841303d92954a855d9d039b23671af7e24e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 35964c9215613d66a687ebcb2d7fcd9496390ee7 + 1f3e841303d92954a855d9d039b23671af7e24e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 35964c9215613d66a687ebcb2d7fcd9496390ee7 + 1f3e841303d92954a855d9d039b23671af7e24e0 diff --git a/eng/Versions.props b/eng/Versions.props index b8e0da136d97..1d08d9ffd9f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.8-servicing.21315.4 + 5.0.9-servicing.21357.12 5.0.0 - 5.0.8 - 5.0.8-servicing.21315.4 + 5.0.9 + 5.0.9-servicing.21357.12 5.0.0 5.0.0 5.0.0 From b6532d45511e7dea06534cd138c9696649d86b12 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 9 Jul 2021 21:35:41 +0000 Subject: [PATCH 4/7] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index f0da54f3460c..97c6e10b33cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a183c296fa9..ce257c125cc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1f3e841303d92954a855d9d039b23671af7e24e0 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1f3e841303d92954a855d9d039b23671af7e24e0 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1f3e841303d92954a855d9d039b23671af7e24e0 + 208e377a5329ad6eb1db5e5fb9d4590fa50beadd diff --git a/eng/Versions.props b/eng/Versions.props index 1d08d9ffd9f3..53fe15f16340 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.9-servicing.21357.12 + 5.0.9-servicing.21359.8 5.0.0 5.0.9 - 5.0.9-servicing.21357.12 + 5.0.9-servicing.21359.8 5.0.0 5.0.0 5.0.0 From 3aeeedcb084e1c1c6ac7fe3fe32079d5c7bc2596 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 13 Jul 2021 22:05:34 +0000 Subject: [PATCH 5/7] [internal/release/5.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 97c6e10b33cb..eae9defda853 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce257c125cc3..df3efbc3169a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0ae66f8622436542036c1a38409a2ec34545e55a + 780af7091b186e1e0af288ebda44404accd4ea63 https://github.com/dotnet/runtime From c663adee8e64ba5d379fa0edfb8201984a7df7d0 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 15 Jul 2021 17:42:11 +0000 Subject: [PATCH 6/7] Merged PR 15469: Clean up logging Clean up logging --- src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs b/src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs index 0ad6c8308e2f..fc217fb0643d 100644 --- a/src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs +++ b/src/Security/Authentication/JwtBearer/src/JwtBearerHandler.cs @@ -178,7 +178,7 @@ protected override async Task HandleAuthenticateAsync() return AuthenticateResult.Fail(authenticationFailedContext.Exception); } - return AuthenticateResult.Fail("No SecurityTokenValidator available for token: " + token ?? "[null]"); + return AuthenticateResult.Fail("No SecurityTokenValidator available for token."); } catch (Exception ex) { From ae5ddd5bb4b9fe9adc11e3fcd75899d181972cfe Mon Sep 17 00:00:00 2001 From: Brennan Date: Tue, 10 Aug 2021 14:54:08 -0700 Subject: [PATCH 7/7] Update baseline and SDK --- NuGet.config | 34 +-- eng/Baseline.Designer.props | 416 ++++++++++++++++++------------------ eng/Baseline.xml | 200 ++++++++--------- eng/Version.Details.xml | 12 +- eng/Versions.props | 6 +- global.json | 12 +- 6 files changed, 345 insertions(+), 335 deletions(-) diff --git a/NuGet.config b/NuGet.config index eae9defda853..c7e31be4b8e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,14 +4,19 @@ - + + + + + + - - - - - + + + + + @@ -28,14 +33,19 @@ - - - - - + + + + + - + + + + + + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index dd848a575e81..6d4815cdf5b5 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - - - + + + @@ -37,108 +37,108 @@ - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 @@ -146,110 +146,110 @@ - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - - - + + + - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 @@ -257,86 +257,86 @@ - 5.0.8 + 5.0.9 - + - + - + - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - + - + - 5.0.8 + 5.0.9 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 @@ -383,50 +383,50 @@ - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 @@ -442,27 +442,27 @@ - 5.0.8 + 5.0.9 - - + + - - + + - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 @@ -474,185 +474,185 @@ - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - - + + - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - - + + - - + + - - + + - 5.0.8 + 5.0.9 - - + + - - + + - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - + - + - 5.0.8 + 5.0.9 - + - + - 5.0.8 + 5.0.9 - - - - + + + + - 5.0.8 + 5.0.9 @@ -661,65 +661,65 @@ - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 @@ -735,42 +735,42 @@ - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - - - + + + - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 @@ -780,73 +780,73 @@ - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 - + - + - + - 5.0.8 + 5.0.9 @@ -867,11 +867,11 @@ - 5.0.8 + 5.0.9 - 5.0.8 + 5.0.9 @@ -889,13 +889,13 @@ - 5.0.8 + 5.0.9 - + - 5.0.8 + 5.0.9 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 2b5f6cf2d21a..ef51a10ffab1 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97938d3e9463..b1d51ac416f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -313,17 +313,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://github.com/dotnet/arcade - 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a + 9a3b3c3c9609e06f4a350b17274a086b800ca7bf - + https://github.com/dotnet/arcade - 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a + 9a3b3c3c9609e06f4a350b17274a086b800ca7bf - + https://github.com/dotnet/arcade - 7b8e78dced9b93e5d69fabb9fbc9a2eb5de8e95a + 9a3b3c3c9609e06f4a350b17274a086b800ca7bf diff --git a/eng/Versions.props b/eng/Versions.props index d69701cd7c65..3bf704942de6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 10 - false + true @@ -136,7 +136,7 @@ 5.0.9 5.0.9 - 5.0.0-beta.21409.4 + 5.0.0-beta.21410.2 2.1.1 2.2.0 - 3.1.17-servicing-21318-8 + 3.1.18-servicing-21365-4 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) diff --git a/global.json b/global.json index 2baca36c22b2..09d41c74c7b1 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.205" + "version": "5.0.206" }, "tools": { - "dotnet": "5.0.205", + "dotnet": "5.0.206", "runtimes": { "dotnet/x64": [ - "2.1.28", + "2.1.29", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.17" + "3.1.18" ] }, "Git": "2.22.0", @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21409.4", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21409.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21410.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21410.2" } }