From 53595a952cfa0170f83bfb85e79f3c85c55367d1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Jun 2020 18:26:13 +0000 Subject: [PATCH 1/9] Merged PR 8353: [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**: 20200609.7 - **Date Produced**: 6/9/2020 9:34 PM - **Commit**: d2274a92d61afce64e4ee11b32e71a0476456703 - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.EntityFrameworkCore.Tools**: from 3.1.5 to 3.1.6 - **Microsoft.EntityFrameworkCore.InMemory**: from 3.1.5 to 3.1.6 - **Microsoft.EntityFrameworkCore**: from 3.1.5 to 3.1.6 - **Microsoft.EntityFrameworkCore.Relational**: from 3.1.5 to 3.1.6 - **Microsoft.EntityFrameworkCore.Sqlite**: from 3.1.5 to 3.1.6 - **dotnet-ef**: from 3.1.5 to 3.1.6 - **Microsoft.EntityFrameworkCore.SqlServer**: from 3.1.5 to 3.1.6 [marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113) --- NuGet.config | 5 + eng/Version.Details.xml | 282 ++++++++++++++++++++-------------------- eng/Versions.props | 140 ++++++++++---------- 3 files changed, 216 insertions(+), 211 deletions(-) diff --git a/NuGet.config b/NuGet.config index 389b3f7ed6..842d2c4386 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65f7223a7f..3afbf6f16b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,261 +33,261 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling 0e01666509ce785750e66cb5e2d2da219867c4fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5f01ecc8e61350a2f6a5381c5028ba3063be286f + 509fe041d6d740af8122cae870bf58f2c33c38f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -321,9 +321,9 @@ https://github.com/dotnet/corefx 8a3ffed558ddf943c1efa87d693227722d6af094 - - https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 620cea9ccf0359993e803c900059932966399584 + + https://github.com/dotnet/corefx + 0f7f38c4fd323b26da10cce95f857f77f0f09b48 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -377,25 +377,25 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3acd9b0cd16596bad450c82be08780875a73c05c https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 65cd7897774a464b5991c1962f7a0d476bb63101 + 3acd9b0cd16596bad450c82be08780875a73c05c @@ -413,9 +413,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 059a4a19e602494bfbed473dbbb18f2dbfbd0878 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://github.com/dotnet/arcade @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1a55276ab9d16792cec595ba870df39a9d97d5ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 877455ff72cbb5834c52c12ce962f1417f5477c8 + be18161fbed286d6fb7a7b1c7999ce70a50cf3eb https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a1520ede7d..a0e067cc33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,10 +69,10 @@ 3.4.1-beta4-20127-10 - 3.1.5 - 3.1.5-servicing.20270.5 + 3.1.6 + 3.1.6-servicing.20316.4 3.1.0 - 3.1.5 + 3.1.6 2.1.0 1.1.1 @@ -83,7 +83,7 @@ 4.7.0 4.7.0 4.7.1 - 4.7.2 + 4.7.0 4.7.1 1.8.1 4.7.1 @@ -103,74 +103,74 @@ 3.2.0 - 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.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6 + 3.1.6-servicing.20316.5 + 3.1.6-servicing.20316.5 + 3.1.6 3.1.0-rtm.19565.4 - 3.1.5 + 3.1.6 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 3.1.5 3.1.5 From 62c098bc170f50feca15916e81cb7f321ffc52ff Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Jun 2020 21:37:49 +0000 Subject: [PATCH 2/9] Merged PR 8358: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-aspnetcore-tooling This pull request updates the following dependencies [marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d - **Build**: 20200617.6 - **Date Produced**: 6/17/2020 7:54 PM - **Commit**: d63ec4a166a5c4f40fcbb823873cfa68cfd39eae - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.5 to 3.1.6 - **Microsoft.AspNetCore.Razor.Language**: from 3.1.5 to 3.1.6 - **Microsoft.CodeAnalysis.Razor**: from 3.1.5 to 3.1.6 - **Microsoft.NET.Sdk.Razor**: from 3.1.5 to 3.1.6 [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 842d2c4386..7bf84cb2c3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3afbf6f16b..3a9f5d77a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,21 +17,21 @@ https://github.com/dotnet/corefx 66409e392d64ed96e5d3a5fda712d9baf51196ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 0e01666509ce785750e66cb5e2d2da219867c4fb + d63ec4a166a5c4f40fcbb823873cfa68cfd39eae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 0e01666509ce785750e66cb5e2d2da219867c4fb + d63ec4a166a5c4f40fcbb823873cfa68cfd39eae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 0e01666509ce785750e66cb5e2d2da219867c4fb + d63ec4a166a5c4f40fcbb823873cfa68cfd39eae - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 0e01666509ce785750e66cb5e2d2da219867c4fb + d63ec4a166a5c4f40fcbb823873cfa68cfd39eae https://dev.azure.com/dnceng/internal/_git/dotnet-efcore diff --git a/eng/Versions.props b/eng/Versions.props index a0e067cc33..9fc0fffe2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,10 +172,10 @@ 3.1.6 3.1.6 - 3.1.5 - 3.1.5 - 3.1.5 - 3.1.5 + 3.1.6 + 3.1.6 + 3.1.6 + 3.1.6 - - - - - From 9cae8dc9bc61b567a440bf06a26f013aa21b2508 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 14 Jul 2020 12:44:25 -0700 Subject: [PATCH 4/9] Update branding 3.1.7 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9fc0fffe2e..745665acd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3 1 - 6 + 7 0 3 From aa8707d10c42d5cd26a20a3fbc09775ba2b2efb7 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 14 Jul 2020 12:46:44 -0700 Subject: [PATCH 5/9] Update baseline --- eng/Baseline.Designer.props | 464 ++++++++++++++++++------------------ eng/Baseline.xml | 162 ++++++------- 2 files changed, 313 insertions(+), 313 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 0e39a8143f..b80e51cdc8 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.5 + 3.1.6 @@ -16,99 +16,99 @@ - 3.1.5 + 3.1.6 - 3.2.0 + 3.2.1 - + - 3.1.5 + 3.1.6 - - - + + + - + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 @@ -116,356 +116,356 @@ - 3.1.5 + 3.1.6 - - - + + + - - - + + + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - - - + + + - - - + + + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - - + + - - + + - 3.1.5 + 3.1.6 - + - + - 3.1.5 + 3.1.6 - - - - + + + + - - - - + + + + - 3.2.0 + 3.2.1 - + + - - - + + - 3.2.0 + 3.2.1 - 3.2.0 + 3.2.1 - 3.2.0 + 3.2.1 - - + + - 3.2.0 + 3.2.1 - 3.2.0 + 3.2.1 - + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - + - + - + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - + - + - + - 3.1.5 + 3.1.6 - - - - - - + + + + + + - - - - - - + + + + + + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - - + + - - + + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - - - + + + - - - + + + - 3.1.5 + 3.1.6 - + - + - 3.1.5 + 3.1.6 - + - + - 3.1.5 + 3.1.6 - - + + - - + + - 3.1.5 + 3.1.6 - - - + + + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 @@ -473,239 +473,239 @@ - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - - - + + + - 3.1.5 + 3.1.6 - - - + + + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - + - - + + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - - + + - - + + - - - - + + + + - 3.1.5 + 3.1.6 - - + + - - + + - 3.1.5 + 3.1.6 - + - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - - - - + + + + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - + - 3.1.5 + 3.1.6 - - + + - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - 3.1.5 + 3.1.6 - - - + + + - 3.1.5 + 3.1.6 - - - + + + - - - + + + - 3.1.5 + 3.1.6 - - - + + + - - - + + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index ab96364fc1..650550d179 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,87 +4,87 @@ 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 From dd16bf56451050e9df2ed9f61e86a8b319084b27 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jul 2020 15:45:45 -0700 Subject: [PATCH 6/9] Fix Baseline.xml version updates (#23545) Use https://www.nuget.org/packages/Microsoft.AspNetCore.App.Runtime.win-x64/5.0.0-preview.6.20312.15 instead. --- eng/tools/BaselineGenerator/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs index f8ea164d53..d125bfdf71 100644 --- a/eng/tools/BaselineGenerator/Program.cs +++ b/eng/tools/BaselineGenerator/Program.cs @@ -177,7 +177,7 @@ namespace PackageBaselineGenerator var versionAttribute = document.Root.Attribute("Version"); hasChanged = await TryUpdateVersionAsync( versionAttribute, - "Microsoft.AspNetCore.App", + "Microsoft.AspNetCore.App.Runtime.win-x64", packageMetadataResource, logger, cacheContext); From d45e6b25f47c5349736bcfffc19820e60fe933d7 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jul 2020 17:15:12 -0700 Subject: [PATCH 7/9] Fix AzureAd options validation (#23096) --- ...zureADOpenIdConnectOptionsConfiguration.cs | 5 +++++ ...eADAuthenticationBuilderExtensionsTests.cs | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs index a991620aae..9b5be26438 100644 --- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs @@ -21,6 +21,11 @@ namespace Microsoft.AspNetCore.Authentication.AzureAD.UI public void Configure(string name, OpenIdConnectOptions options) { var azureADScheme = GetAzureADScheme(name); + if (azureADScheme is null) + { + return; + } + var azureADOptions = _azureADOptions.Get(azureADScheme); if (name != azureADOptions.OpenIdConnectSchemeName) { diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs index 07c0583c32..6a31d3477e 100644 --- a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs @@ -485,5 +485,25 @@ namespace Microsoft.AspNetCore.Authentication Assert.NotNull(jwtOptions.Get("other")); } + + [Fact] + public void AddAzureAD_SkipsOptionsValidationForNonAzureOpenIdConnect() + { + var services = new ServiceCollection(); + services.AddSingleton(new NullLoggerFactory()); + + services.AddAuthentication() + .AddAzureAD(o => { }) + .AddOpenIdConnect("other", null, o => + { + o.ClientId = "ClientId"; + o.Authority = "https://authority.com"; + }); + + var provider = services.BuildServiceProvider(); + var openIdConnectOptions = provider.GetService>(); + + Assert.NotNull(openIdConnectOptions.Get("other")); + } } } From d101de8d1c50e6e8528fadddc7dca24fc88ffa53 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jul 2020 17:17:04 -0700 Subject: [PATCH 8/9] Add sharedfx and targeting pack tests (#23045) (#23070) * Add sharedfx and targeting pack tests (#23045) * Add test for assembly versions * Add test for framework list * Add some hardcoded lists for sharedfx and targeting pack content * Fix failing tests * Fix targeting pack tests * Feedback --- .../Microsoft.AspNetCore.App.UnitTests.csproj | 2 +- src/Framework/test/SharedFxTests.cs | 25 +- src/Framework/test/TargetingPackTests.cs | 115 ++++++- src/Framework/test/TestData.cs | 281 ++++++++++++++++++ 4 files changed, 420 insertions(+), 3 deletions(-) diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index bd4037d360..8233dc1918 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -86,7 +86,7 @@ <_Parameter1>TargetingPackDependencies - <_Parameter2>@(_TargetingPackDependencies) + <_Parameter2>@(_TargetingPackDependencies->'%(FileName)') diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs index 2fc09b96b0..79a3ea66e1 100644 --- a/src/Framework/test/SharedFxTests.cs +++ b/src/Framework/test/SharedFxTests.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.IO; using System.Linq; using Newtonsoft.Json.Linq; @@ -26,6 +25,30 @@ namespace Microsoft.AspNetCore _sharedFxRoot = Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion")); } + [Fact] + public void SharedFrameworkContainsListedAssemblies() + { + var actualAssemblies = Directory.GetFiles(_sharedFxRoot, "*.dll") + .Select(Path.GetFileNameWithoutExtension) + .ToHashSet(); + + _output.WriteLine("==== actual assemblies ===="); + _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i))); + _output.WriteLine("==== expected assemblies ===="); + _output.WriteLine(string.Join('\n', TestData.ListedSharedFxAssemblies.OrderBy(i => i))); + + var missing = TestData.ListedSharedFxAssemblies.Except(actualAssemblies); + var unexpected = actualAssemblies.Except(TestData.ListedSharedFxAssemblies); + + _output.WriteLine("==== missing assemblies from the framework ===="); + _output.WriteLine(string.Join('\n', missing)); + _output.WriteLine("==== unexpected assemblies in the framework ===="); + _output.WriteLine(string.Join('\n', unexpected)); + + Assert.Empty(missing); + Assert.Empty(unexpected); + } + [Fact] public void SharedFrameworkContainsExpectedFiles() { diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 54da276513..f4015ecd23 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -9,7 +9,7 @@ using System.Reflection; using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Runtime.CompilerServices; -using Newtonsoft.Json.Linq; +using System.Xml.Linq; using Xunit; using Xunit.Abstractions; @@ -18,6 +18,7 @@ namespace Microsoft.AspNetCore public class TargetingPackTests { private readonly string _expectedRid; + private readonly string _targetingPackTfm; private readonly string _targetingPackRoot; private readonly ITestOutputHelper _output; private readonly bool _isTargetingPackBuilding; @@ -26,10 +27,66 @@ namespace Microsoft.AspNetCore { _output = output; _expectedRid = TestData.GetSharedFxRuntimeIdentifier(); + _targetingPackTfm = "netcoreapp" + TestData.GetSharedFxVersion().Substring(0, 3); _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion")); _isTargetingPackBuilding = bool.Parse(TestData.GetTestDataValue("IsTargetingPackBuilding")); } + [Fact] + public void TargetingPackContainsListedAssemblies() + { + if (!_isTargetingPackBuilding) + { + return; + } + + var actualAssemblies = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll") + .Select(Path.GetFileNameWithoutExtension) + .ToHashSet(); + var listedTargetingPackAssemblies = TestData.ListedTargetingPackAssemblies.Keys.ToHashSet(); + + _output.WriteLine("==== actual assemblies ===="); + _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i))); + _output.WriteLine("==== expected assemblies ===="); + _output.WriteLine(string.Join('\n', listedTargetingPackAssemblies.OrderBy(i => i))); + + var missing = listedTargetingPackAssemblies.Except(actualAssemblies); + var unexpected = actualAssemblies.Except(listedTargetingPackAssemblies); + + _output.WriteLine("==== missing assemblies from the framework ===="); + _output.WriteLine(string.Join('\n', missing)); + _output.WriteLine("==== unexpected assemblies in the framework ===="); + _output.WriteLine(string.Join('\n', unexpected)); + + Assert.Empty(missing); + Assert.Empty(unexpected); + } + + [Fact] + public void RefAssembliesHaveExpectedAssemblyVersions() + { + if (!_isTargetingPackBuilding) + { + return; + } + + IEnumerable dlls = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll", SearchOption.AllDirectories); + Assert.NotEmpty(dlls); + + Assert.All(dlls, path => + { + var fileName = Path.GetFileNameWithoutExtension(path); + var assemblyName = AssemblyName.GetAssemblyName(path); + using var fileStream = File.OpenRead(path); + using var peReader = new PEReader(fileStream, PEStreamOptions.Default); + var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default); + var assemblyDefinition = reader.GetAssemblyDefinition(); + + TestData.ListedTargetingPackAssemblies.TryGetValue(fileName, out var expectedVersion); + Assert.Equal(expectedVersion, assemblyDefinition.Version.ToString()); + }); + } + [Fact] public void AssembliesAreReferenceAssemblies() { @@ -131,5 +188,61 @@ namespace Microsoft.AspNetCore Assert.True(Version.TryParse(parts[3], out _), "File version must be convertable to System.Version"); }); } + + [Fact] + public void FrameworkListListsContainsCorrectEntries() + { + if (!_isTargetingPackBuilding) + { + return; + } + + var frameworkListPath = Path.Combine(_targetingPackRoot, "data", "FrameworkList.xml"); + var expectedAssemblies = TestData.GetTargetingPackDependencies() + .Split(';', StringSplitOptions.RemoveEmptyEntries) + .ToHashSet(); + expectedAssemblies.Remove("aspnetcorev2_inprocess"); + + AssertEx.FileExists(frameworkListPath); + + var frameworkListDoc = XDocument.Load(frameworkListPath); + var frameworkListEntries = frameworkListDoc.Root.Descendants(); + + _output.WriteLine("==== file contents ===="); + _output.WriteLine(string.Join('\n', frameworkListEntries.Select(i => i.Attribute("Path").Value).OrderBy(i => i))); + _output.WriteLine("==== expected assemblies ===="); + _output.WriteLine(string.Join('\n', expectedAssemblies.OrderBy(i => i))); + + var actualAssemblies = frameworkListEntries + .Select(i => + { + var fileName = i.Attribute("Path").Value; + return fileName.EndsWith(".dll", StringComparison.Ordinal) + ? fileName.Substring(0, fileName.Length - 4) + : fileName; + }) + .ToHashSet(); + + var missing = expectedAssemblies.Except(actualAssemblies); + var unexpected = actualAssemblies.Except(expectedAssemblies); + + _output.WriteLine("==== missing assemblies from the framework list ===="); + _output.WriteLine(string.Join('\n', missing)); + _output.WriteLine("==== unexpected assemblies in the framework list ===="); + _output.WriteLine(string.Join('\n', unexpected)); + + Assert.Empty(missing); + Assert.Empty(unexpected); + + Assert.All(frameworkListEntries, i => + { + var assemblyPath = i.Attribute("Path").Value; + var assemblyVersion = i.Attribute("AssemblyVersion").Value; + var fileVersion = i.Attribute("FileVersion").Value; + + Assert.True(Version.TryParse(assemblyVersion, out _), $"{assemblyPath} has assembly version {assemblyVersion}. Assembly version must be convertable to System.Version"); + Assert.True(Version.TryParse(fileVersion, out _), $"{assemblyPath} has file version {fileVersion}. File version must be convertable to System.Version"); + }); + } } } diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs index f087d9e16e..0e8cfd3df2 100644 --- a/src/Framework/test/TestData.cs +++ b/src/Framework/test/TestData.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -9,6 +10,286 @@ namespace Microsoft.AspNetCore { public class TestData { + public static List ListedSharedFxAssemblies; + public static SortedDictionary ListedTargetingPackAssemblies; + + static TestData() + { + ListedSharedFxAssemblies = new List() + { + "aspnetcorev2_inprocess", + "Microsoft.AspNetCore", + "Microsoft.AspNetCore.Antiforgery", + "Microsoft.AspNetCore.Authentication", + "Microsoft.AspNetCore.Authentication.Abstractions", + "Microsoft.AspNetCore.Authentication.Cookies", + "Microsoft.AspNetCore.Authentication.Core", + "Microsoft.AspNetCore.Authentication.OAuth", + "Microsoft.AspNetCore.Authorization", + "Microsoft.AspNetCore.Authorization.Policy", + "Microsoft.AspNetCore.Components", + "Microsoft.AspNetCore.Components.Authorization", + "Microsoft.AspNetCore.Components.Forms", + "Microsoft.AspNetCore.Components.Server", + "Microsoft.AspNetCore.Components.Web", + "Microsoft.AspNetCore.Connections.Abstractions", + "Microsoft.AspNetCore.CookiePolicy", + "Microsoft.AspNetCore.Cors", + "Microsoft.AspNetCore.Cryptography.Internal", + "Microsoft.AspNetCore.Cryptography.KeyDerivation", + "Microsoft.AspNetCore.DataProtection", + "Microsoft.AspNetCore.DataProtection.Abstractions", + "Microsoft.AspNetCore.DataProtection.Extensions", + "Microsoft.AspNetCore.Diagnostics", + "Microsoft.AspNetCore.Diagnostics.Abstractions", + "Microsoft.AspNetCore.Diagnostics.HealthChecks", + "Microsoft.AspNetCore.HostFiltering", + "Microsoft.AspNetCore.Hosting", + "Microsoft.AspNetCore.Hosting.Abstractions", + "Microsoft.AspNetCore.Hosting.Server.Abstractions", + "Microsoft.AspNetCore.Html.Abstractions", + "Microsoft.AspNetCore.Http", + "Microsoft.AspNetCore.Http.Abstractions", + "Microsoft.AspNetCore.Http.Connections", + "Microsoft.AspNetCore.Http.Connections.Common", + "Microsoft.AspNetCore.Http.Extensions", + "Microsoft.AspNetCore.Http.Features", + "Microsoft.AspNetCore.HttpOverrides", + "Microsoft.AspNetCore.HttpsPolicy", + "Microsoft.AspNetCore.Identity", + "Microsoft.AspNetCore.Localization", + "Microsoft.AspNetCore.Localization.Routing", + "Microsoft.AspNetCore.Metadata", + "Microsoft.AspNetCore.Mvc", + "Microsoft.AspNetCore.Mvc.Abstractions", + "Microsoft.AspNetCore.Mvc.ApiExplorer", + "Microsoft.AspNetCore.Mvc.Core", + "Microsoft.AspNetCore.Mvc.Cors", + "Microsoft.AspNetCore.Mvc.DataAnnotations", + "Microsoft.AspNetCore.Mvc.Formatters.Json", + "Microsoft.AspNetCore.Mvc.Formatters.Xml", + "Microsoft.AspNetCore.Mvc.Localization", + "Microsoft.AspNetCore.Mvc.Razor", + "Microsoft.AspNetCore.Mvc.RazorPages", + "Microsoft.AspNetCore.Mvc.TagHelpers", + "Microsoft.AspNetCore.Mvc.ViewFeatures", + "Microsoft.AspNetCore.Razor", + "Microsoft.AspNetCore.Razor.Runtime", + "Microsoft.AspNetCore.ResponseCaching", + "Microsoft.AspNetCore.ResponseCaching.Abstractions", + "Microsoft.AspNetCore.ResponseCompression", + "Microsoft.AspNetCore.Rewrite", + "Microsoft.AspNetCore.Routing", + "Microsoft.AspNetCore.Routing.Abstractions", + "Microsoft.AspNetCore.Server.HttpSys", + "Microsoft.AspNetCore.Server.IIS", + "Microsoft.AspNetCore.Server.IISIntegration", + "Microsoft.AspNetCore.Server.Kestrel", + "Microsoft.AspNetCore.Server.Kestrel.Core", + "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", + "Microsoft.AspNetCore.Session", + "Microsoft.AspNetCore.SignalR", + "Microsoft.AspNetCore.SignalR.Common", + "Microsoft.AspNetCore.SignalR.Core", + "Microsoft.AspNetCore.SignalR.Protocols.Json", + "Microsoft.AspNetCore.StaticFiles", + "Microsoft.AspNetCore.WebSockets", + "Microsoft.AspNetCore.WebUtilities", + "Microsoft.Extensions.Caching.Abstractions", + "Microsoft.Extensions.Caching.Memory", + "Microsoft.Extensions.Configuration", + "Microsoft.Extensions.Configuration.Abstractions", + "Microsoft.Extensions.Configuration.Binder", + "Microsoft.Extensions.Configuration.CommandLine", + "Microsoft.Extensions.Configuration.EnvironmentVariables", + "Microsoft.Extensions.Configuration.FileExtensions", + "Microsoft.Extensions.Configuration.Ini", + "Microsoft.Extensions.Configuration.Json", + "Microsoft.Extensions.Configuration.KeyPerFile", + "Microsoft.Extensions.Configuration.UserSecrets", + "Microsoft.Extensions.Configuration.Xml", + "Microsoft.Extensions.DependencyInjection", + "Microsoft.Extensions.DependencyInjection.Abstractions", + "Microsoft.Extensions.Diagnostics.HealthChecks", + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", + "Microsoft.Extensions.FileProviders.Abstractions", + "Microsoft.Extensions.FileProviders.Composite", + "Microsoft.Extensions.FileProviders.Embedded", + "Microsoft.Extensions.FileProviders.Physical", + "Microsoft.Extensions.FileSystemGlobbing", + "Microsoft.Extensions.Hosting", + "Microsoft.Extensions.Hosting.Abstractions", + "Microsoft.Extensions.Http", + "Microsoft.Extensions.Identity.Core", + "Microsoft.Extensions.Identity.Stores", + "Microsoft.Extensions.Localization", + "Microsoft.Extensions.Localization.Abstractions", + "Microsoft.Extensions.Logging", + "Microsoft.Extensions.Logging.Abstractions", + "Microsoft.Extensions.Logging.Configuration", + "Microsoft.Extensions.Logging.Console", + "Microsoft.Extensions.Logging.Debug", + "Microsoft.Extensions.Logging.EventLog", + "Microsoft.Extensions.Logging.EventSource", + "Microsoft.Extensions.Logging.TraceSource", + "Microsoft.Extensions.ObjectPool", + "Microsoft.Extensions.Options", + "Microsoft.Extensions.Options.ConfigurationExtensions", + "Microsoft.Extensions.Options.DataAnnotations", + "Microsoft.Extensions.Primitives", + "Microsoft.Extensions.WebEncoders", + "Microsoft.JSInterop", + "Microsoft.Net.Http.Headers", + "Microsoft.Win32.SystemEvents", + "System.Diagnostics.EventLog", + "System.Drawing.Common", + "System.IO.Pipelines", + "System.Security.Cryptography.Pkcs", + "System.Security.Cryptography.Xml", + "System.Security.Permissions", + "System.Windows.Extensions" + }; + ListedTargetingPackAssemblies = new SortedDictionary + { + { "Microsoft.AspNetCore", "3.1.0.0" }, + { "Microsoft.AspNetCore.Antiforgery", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authentication", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authentication.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authentication.Cookies", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authentication.Core", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authentication.OAuth", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authorization", "3.1.0.0" }, + { "Microsoft.AspNetCore.Authorization.Policy", "3.1.0.0" }, + { "Microsoft.AspNetCore.Components", "3.1.0.0" }, + { "Microsoft.AspNetCore.Components.Authorization", "3.1.0.0" }, + { "Microsoft.AspNetCore.Components.Forms", "3.1.0.0" }, + { "Microsoft.AspNetCore.Components.Server", "3.1.0.0" }, + { "Microsoft.AspNetCore.Components.Web", "3.1.0.0" }, + { "Microsoft.AspNetCore.Connections.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.CookiePolicy", "3.1.0.0" }, + { "Microsoft.AspNetCore.Cors", "3.1.0.0" }, + { "Microsoft.AspNetCore.Cryptography.Internal", "3.1.0.0" }, + { "Microsoft.AspNetCore.Cryptography.KeyDerivation", "3.1.0.0" }, + { "Microsoft.AspNetCore.DataProtection", "3.1.0.0" }, + { "Microsoft.AspNetCore.DataProtection.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.DataProtection.Extensions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Diagnostics", "3.1.0.0" }, + { "Microsoft.AspNetCore.Diagnostics.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Diagnostics.HealthChecks", "3.1.0.0" }, + { "Microsoft.AspNetCore.HostFiltering", "3.1.0.0" }, + { "Microsoft.AspNetCore.Hosting", "3.1.0.0" }, + { "Microsoft.AspNetCore.Hosting.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Hosting.Server.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Html.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Http", "3.1.0.0" }, + { "Microsoft.AspNetCore.Http.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Http.Connections", "3.1.0.0" }, + { "Microsoft.AspNetCore.Http.Connections.Common", "3.1.0.0" }, + { "Microsoft.AspNetCore.Http.Extensions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Http.Features", "3.1.0.0" }, + { "Microsoft.AspNetCore.HttpOverrides", "3.1.0.0" }, + { "Microsoft.AspNetCore.HttpsPolicy", "3.1.0.0" }, + { "Microsoft.AspNetCore.Identity", "3.1.0.0" }, + { "Microsoft.AspNetCore.Localization", "3.1.0.0" }, + { "Microsoft.AspNetCore.Localization.Routing", "3.1.0.0" }, + { "Microsoft.AspNetCore.Metadata", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.ApiExplorer", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Core", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Cors", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.DataAnnotations", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Formatters.Json", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Formatters.Xml", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Localization", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.Razor", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.RazorPages", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.TagHelpers", "3.1.0.0" }, + { "Microsoft.AspNetCore.Mvc.ViewFeatures", "3.1.0.0" }, + { "Microsoft.AspNetCore.Razor", "3.1.0.0" }, + { "Microsoft.AspNetCore.Razor.Runtime", "3.1.0.0" }, + { "Microsoft.AspNetCore.ResponseCaching", "3.1.0.0" }, + { "Microsoft.AspNetCore.ResponseCaching.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.ResponseCompression", "3.1.0.0" }, + { "Microsoft.AspNetCore.Rewrite", "3.1.0.0" }, + { "Microsoft.AspNetCore.Routing", "3.1.0.0" }, + { "Microsoft.AspNetCore.Routing.Abstractions", "3.1.0.0" }, + { "Microsoft.AspNetCore.Server.HttpSys", "3.1.0.0" }, + { "Microsoft.AspNetCore.Server.IIS", "3.1.0.0" }, + { "Microsoft.AspNetCore.Server.IISIntegration", "3.1.0.0" }, + { "Microsoft.AspNetCore.Server.Kestrel", "3.1.0.0" }, + { "Microsoft.AspNetCore.Server.Kestrel.Core", "3.1.0.0" }, + { "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "3.1.0.0" }, + { "Microsoft.AspNetCore.Session", "3.1.0.0" }, + { "Microsoft.AspNetCore.SignalR", "3.1.0.0" }, + { "Microsoft.AspNetCore.SignalR.Common", "3.1.0.0" }, + { "Microsoft.AspNetCore.SignalR.Core", "3.1.0.0" }, + { "Microsoft.AspNetCore.SignalR.Protocols.Json", "3.1.0.0" }, + { "Microsoft.AspNetCore.StaticFiles", "3.1.0.0" }, + { "Microsoft.AspNetCore.WebSockets", "3.1.0.0" }, + { "Microsoft.AspNetCore.WebUtilities", "3.1.0.0" }, + { "Microsoft.Extensions.Caching.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.Caching.Memory", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.Binder", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.CommandLine", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.EnvironmentVariables", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.FileExtensions", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.Ini", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.Json", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.KeyPerFile", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.UserSecrets", "3.1.0.0" }, + { "Microsoft.Extensions.Configuration.Xml", "3.1.0.0" }, + { "Microsoft.Extensions.DependencyInjection", "3.1.0.0" }, + { "Microsoft.Extensions.DependencyInjection.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.Diagnostics.HealthChecks", "3.1.0.0" }, + { "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.FileProviders.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.FileProviders.Composite", "3.1.0.0" }, + { "Microsoft.Extensions.FileProviders.Embedded", "3.1.0.0" }, + { "Microsoft.Extensions.FileProviders.Physical", "3.1.0.0" }, + { "Microsoft.Extensions.FileSystemGlobbing", "3.1.0.0" }, + { "Microsoft.Extensions.Hosting", "3.1.0.0" }, + { "Microsoft.Extensions.Hosting.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.Http", "3.1.0.0" }, + { "Microsoft.Extensions.Identity.Core", "3.1.0.0" }, + { "Microsoft.Extensions.Identity.Stores", "3.1.0.0" }, + { "Microsoft.Extensions.Localization", "3.1.0.0" }, + { "Microsoft.Extensions.Localization.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.Logging", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.Abstractions", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.Configuration", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.Console", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.Debug", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.EventLog", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.EventSource", "3.1.0.0" }, + { "Microsoft.Extensions.Logging.TraceSource", "3.1.0.0" }, + { "Microsoft.Extensions.ObjectPool", "3.1.0.0" }, + { "Microsoft.Extensions.Options", "3.1.0.0" }, + { "Microsoft.Extensions.Options.ConfigurationExtensions", "3.1.0.0" }, + { "Microsoft.Extensions.Options.DataAnnotations", "3.1.0.0" }, + { "Microsoft.Extensions.Primitives", "3.1.0.0" }, + { "Microsoft.Extensions.WebEncoders", "3.1.0.0" }, + { "Microsoft.JSInterop", "3.1.0.0" }, + { "Microsoft.Net.Http.Headers", "3.1.0.0" }, + { "Microsoft.Win32.Registry", "4.1.3.0" }, + { "System.Diagnostics.EventLog", "4.0.2.0" }, + { "System.IO.Pipelines", "4.0.2.0" }, + { "System.Security.AccessControl", "4.1.1.0" }, + { "System.Security.Cryptography.Cng", "4.3.3.0" }, + { "System.Security.Cryptography.Xml", "4.0.3.0" }, + { "System.Security.Permissions", "4.0.3.0" }, + { "System.Security.Principal.Windows", "4.1.1.0" }, + { "System.Windows.Extensions", "4.0.1.0" } + }; + + if (!VerifyAncmBinary()) + { + ListedSharedFxAssemblies.Remove("aspnetcorev2_inprocess"); + } + } + public static string GetSharedFxVersion() => GetTestDataValue("SharedFxVersion"); public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppRuntimeVersion"); From 028cb6b1081b96c2ab4e8b6a62b38634e7286b6a Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Jul 2020 01:01:04 -0700 Subject: [PATCH 9/9] Remove duplicate test added automatically by merge --- src/Framework/test/SharedFxTests.cs | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs index 2aae2c5a57..35955630c8 100644 --- a/src/Framework/test/SharedFxTests.cs +++ b/src/Framework/test/SharedFxTests.cs @@ -53,30 +53,6 @@ namespace Microsoft.AspNetCore Assert.Empty(unexpected); } - [Fact] - public void SharedFrameworkContainsListedAssemblies() - { - var actualAssemblies = Directory.GetFiles(_sharedFxRoot, "*.dll") - .Select(Path.GetFileNameWithoutExtension) - .ToHashSet(); - - _output.WriteLine("==== actual assemblies ===="); - _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i))); - _output.WriteLine("==== expected assemblies ===="); - _output.WriteLine(string.Join('\n', TestData.ListedSharedFxAssemblies.OrderBy(i => i))); - - var missing = TestData.ListedSharedFxAssemblies.Except(actualAssemblies); - var unexpected = actualAssemblies.Except(TestData.ListedSharedFxAssemblies); - - _output.WriteLine("==== missing assemblies from the framework ===="); - _output.WriteLine(string.Join('\n', missing)); - _output.WriteLine("==== unexpected assemblies in the framework ===="); - _output.WriteLine(string.Join('\n', unexpected)); - - Assert.Empty(missing); - Assert.Empty(unexpected); - } - [Fact] public void SharedFrameworkContainsExpectedFiles() {