From 844a82e37cae48af2ab2ee4f39b41283e6bb4f0e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 May 2020 19:47:40 +0000 Subject: [PATCH] Merged PR 8040: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113) ## From https://github.com/dotnet/efcore - **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113 - **Build**: 20200520.1 - **Date Produced**: 5/20/2020 5:36 PM - **Commit**: 85b57af827aa71b77d673e813e046d081c8027ed - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.EntityFrameworkCore.Tools**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.InMemory**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.Relational**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.Sqlite**: from 3.1.4 to 3.1.5 - **dotnet-ef**: from 3.1.4 to 3.1.5 - **Microsoft.EntityFrameworkCore.SqlServer**: from 3.1.4 to 3.1.5 [marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113) --- NuGet.config | 7 +- eng/Version.Details.xml | 282 +++++++++--------- eng/Versions.props | 140 ++++----- .../content/Angular-CSharp/appsettings.json | 6 +- .../content/React-CSharp/appsettings.json | 6 +- 5 files changed, 221 insertions(+), 220 deletions(-) diff --git a/NuGet.config b/NuGet.config index 56a1f8e6b7..ee9b0f6393 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,10 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204bd33a37..bbbac19f2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,261 +29,261 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling 0e01666509ce785750e66cb5e2d2da219867c4fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0e7e329a24deae8d22ccf9829957dc8cb10152c5 + 5f01ecc8e61350a2f6a5381c5028ba3063be286f - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -317,9 +317,9 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - - https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx + 620cea9ccf0359993e803c900059932966399584 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -373,25 +373,25 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 65cd7897774a464b5991c1962f7a0d476bb63101 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 65cd7897774a464b5991c1962f7a0d476bb63101 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0c2e69caa609d5164e16df91d6d646eb9ed74640 + 65cd7897774a464b5991c1962f7a0d476bb63101 @@ -409,9 +409,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 059a4a19e602494bfbed473dbbb18f2dbfbd0878 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://github.com/dotnet/arcade @@ -425,9 +425,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb + 877455ff72cbb5834c52c12ce962f1417f5477c8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 969eac73ab..3c6763dcb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,10 +66,10 @@ 3.4.1-beta4-20127-10 - 3.1.4 - 3.1.4-servicing.20221.3 + 3.1.5 + 3.1.5-servicing.20270.5 3.1.0 - 3.1.4 + 3.1.5 2.1.0 1.1.1 @@ -80,7 +80,7 @@ 4.7.0 4.7.0 4.7.1 - 4.7.0 + 4.7.2 4.7.1 1.8.1 4.7.1 @@ -99,74 +99,74 @@ 3.1.0-preview4.19605.1 - 3.1.4-servicing.20221.11 - 3.1.4-servicing.20221.11 - 3.1.4-servicing.20221.11 - 3.1.4-servicing.20221.11 - 3.1.4-servicing.20221.11 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4 - 3.1.4-servicing.20221.11 - 3.1.4-servicing.20221.11 - 3.1.4 + 3.1.5-servicing.20270.9 + 3.1.5-servicing.20270.9 + 3.1.5-servicing.20270.9 + 3.1.5-servicing.20270.9 + 3.1.5-servicing.20270.9 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5-servicing.20270.9 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5-servicing.20270.9 + 3.1.5 + 3.1.5 + 3.1.5-servicing.20270.9 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5-servicing.20270.9 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5-servicing.20270.9 + 3.1.5 + 3.1.5-servicing.20270.9 + 3.1.5-servicing.20270.9 + 3.1.5 3.1.0-rtm.19565.4 - 3.1.4 + 3.1.5 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 - 3.1.4 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 + 3.1.5 3.1.5 3.1.5 diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json index 8861bc9d6c..7bed5bd8f8 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/appsettings.json @@ -10,9 +10,9 @@ ////#endif "Logging": { "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, ////#if (IndividualLocalAuth) diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json index 8861bc9d6c..7bed5bd8f8 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/appsettings.json @@ -10,9 +10,9 @@ ////#endif "Logging": { "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } }, ////#if (IndividualLocalAuth)