From af0f484c7e9ceee5f58d0c9a6313dd294ce9a90c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 3 Mar 2021 21:32:47 +0000 Subject: [PATCH 1/7] Merged PR 13281: [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**: 20210303.5 - **Date Produced**: 3/3/2021 8:27 PM - **Commit**: 9876229d920ba6f8a3ecab07c189cdba03b57343 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.13 to 3.1.14][1] - **Microsoft.CodeAnalysis.Razor**: [from 3.1.13 to 3.1.14][1] - **Microsoft.NET.Sdk.Razor**: [from 3.1.13 to 3.1.14][1] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.13 to 3.1.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GC1756aa6&targetVersion=GC9876229&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 26 +++++++++++++++++++++++++- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 9 ++++----- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index c402dfc51404..a5d9d12c7b4b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,6 +34,12 @@ + + + + + + @@ -41,16 +47,34 @@ + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70d48e7c7ee6..bf686395f662 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,21 +17,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 620cea9ccf0359993e803c900059932966399584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 1756aa62b0ee24952b064aabf88f240da51179b1 + 9876229d920ba6f8a3ecab07c189cdba03b57343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 1756aa62b0ee24952b064aabf88f240da51179b1 + 9876229d920ba6f8a3ecab07c189cdba03b57343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 1756aa62b0ee24952b064aabf88f240da51179b1 + 9876229d920ba6f8a3ecab07c189cdba03b57343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 1756aa62b0ee24952b064aabf88f240da51179b1 + 9876229d920ba6f8a3ecab07c189cdba03b57343 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore diff --git a/eng/Versions.props b/eng/Versions.props index 530bcbb1e8c0..73d278ad8eb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,6 @@ 1 14 false - 0 3 2 @@ -171,10 +170,10 @@ 3.1.13 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 - + - + - + - + @@ -28,7 +28,7 @@ - + @@ -41,11 +41,23 @@ + + + + + + + + + + + + @@ -57,6 +69,12 @@ + + + + + + @@ -68,6 +86,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf686395f662..ddd6d8dca622 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 9876229d920ba6f8a3ecab07c189cdba03b57343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5b7fc584fa25b1132a5459c9d65bb678dbc159a1 + 21ecf9996892f38d276d0a430a70c69d62874097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -363,7 +363,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e + 9f21c83298820c9c42f14ed2bd3af5f6203d75ec https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -390,17 +390,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-core-setup - 64df28ec4a52d6cc23efffbb918eab87ee42600f + d0e340e1edfe0e72077fe263d50593a044f9d423 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 64df28ec4a52d6cc23efffbb918eab87ee42600f + d0e340e1edfe0e72077fe263d50593a044f9d423 @@ -412,11 +412,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e + 9f21c83298820c9c42f14ed2bd3af5f6203d75ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade 251249a04a9686ca2660e2acaa3094446a48f10d - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f + 56ad317cd71ed799c435569f8bd324c8b0583227 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 73d278ad8eb5..cf1b50b4a25a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,9 +68,9 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.13-servicing.21116.2 + 3.1.14-servicing.21153.1 3.1.0 - 3.1.13 + 3.1.14 2.1.0 1.1.1 @@ -101,74 +101,74 @@ 3.2.0 - 3.1.13-servicing.21116.4 - 3.1.13-servicing.21116.4 - 3.1.13-servicing.21116.4 - 3.1.13-servicing.21116.4 - 3.1.13-servicing.21116.4 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13-servicing.21116.4 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13-servicing.21116.4 - 3.1.13 - 3.1.13 - 3.1.13-servicing.21116.4 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13-servicing.21116.4 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13-servicing.21116.4 - 3.1.13 - 3.1.13-servicing.21116.4 - 3.1.13-servicing.21116.4 - 3.1.13 + 3.1.14-servicing.21153.3 + 3.1.14-servicing.21153.3 + 3.1.14-servicing.21153.3 + 3.1.14-servicing.21153.3 + 3.1.14-servicing.21153.3 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14-servicing.21153.3 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14-servicing.21153.3 + 3.1.14 + 3.1.14 + 3.1.14-servicing.21153.3 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14-servicing.21153.3 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14-servicing.21153.3 + 3.1.14 + 3.1.14-servicing.21153.3 + 3.1.14-servicing.21153.3 + 3.1.14 3.1.8-servicing.20420.4 - 3.1.13 + 3.1.14 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 - 3.1.13 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 + 3.1.14 3.1.14 3.1.14 From ad5e0c22e7ea6274ece88f2ff4bca1978611b559 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Mar 2021 15:33:38 +0000 Subject: [PATCH 3/7] Merged PR 13460: [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://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113 - **Build**: 20210312.6 - **Date Produced**: 3/12/2021 8:17 PM - **Commit**: cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.EntityFrameworkCore.Tools**: [from 3.1.14 to 3.1.14][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 3.1.14 to 3.1.14][1] - **dotnet-ef**: [from 3.1.14 to 3.1.14][1] - **Microsoft.EntityFrameworkCore**: [from 3.1.14 to 3.1.14][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 3.1.14 to 3.1.14][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 3.1.14 to 3.1.14][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 3.1.14 to 3.1.14][1] - **Microsoft.Extensions.Logging**: [from 3.1.14 to 3.1.14][2] - **Microsoft.AspNetCore.Analyzer.Testing**: [from 3.1.14-servicing.21153.3 to 3.1.14-servicing.21162.3][2] - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.14-servicing.21153.3 to 3.1.14-servicing.21162.3][2] - **Microsoft.Extensions.ActivatorUtilities.Sources**: [from 3.1.14-servicing.21153.3 to 3.1.14-servicing.21162.3][2] - **Microsoft.Extensions.Caching.Abstractions**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Caching.Memory**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Caching.SqlServer**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Caching.StackExchangeRedis**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.14-servicing.21153.3 to 3.1.14-servicing.21162.3][2] - **Microsoft.Extensions.Configuration.Abstractions**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.AzureKeyVault**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.Binder**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.CommandLine**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.FileExtensions**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.Ini**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.Json**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.KeyPerFile**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration.Xml**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.Configuration**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.DependencyInjection**: [from 3.1.14 to 3.1.14][2] - **Microsoft.Extensions.DiagnosticAdapter**: [f... --- NuGet.config | 22 ++++-- eng/Version.Details.xml | 156 ++++++++++++++++++++-------------------- eng/Versions.props | 24 +++---- 3 files changed, 108 insertions(+), 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index be91a0311061..54e4308a9978 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,15 @@ - - + - + @@ -29,13 +28,18 @@ - + + + + + + @@ -53,6 +57,11 @@ + + + + + @@ -71,6 +80,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65b06eab6188..83975d478328 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 21ecf9996892f38d276d0a430a70c69d62874097 + cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -414,9 +414,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-corefx 9f21c83298820c9c42f14ed2bd3af5f6203d75ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade ab42d248928f65dd174a2383f3256e68d9379bb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 56ad317cd71ed799c435569f8bd324c8b0583227 + c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 876604e25203..4cf498811736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -101,16 +101,16 @@ 3.2.0 - 3.1.14-servicing.21153.3 - 3.1.14-servicing.21153.3 - 3.1.14-servicing.21153.3 - 3.1.14-servicing.21153.3 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 + 3.1.14-servicing.21162.3 + 3.1.14-servicing.21162.3 + 3.1.14-servicing.21162.3 + 3.1.14-servicing.21162.3 3.1.14 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 3.1.14 3.1.14 3.1.14 @@ -133,10 +133,10 @@ 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 3.1.14 3.1.14 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 3.1.14 3.1.14 3.1.14 @@ -148,16 +148,16 @@ 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 3.1.14 3.1.14 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 3.1.14 - 3.1.14-servicing.21153.3 - 3.1.14-servicing.21153.3 + 3.1.14-servicing.21162.3 + 3.1.14-servicing.21162.3 3.1.14 3.1.8-servicing.20420.4 3.1.14 From 88e2770cf0dc207c1278ea1ef5896b02fdbd777b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Mar 2021 17:06:19 +0000 Subject: [PATCH 4/7] Merged PR 13461: [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**: 20210315.8 - **Date Produced**: 3/16/2021 4:24 AM - **Commit**: aec2954c62f9ca32403ef572f8e64b417c6b67e8 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 3.1.14 to 3.1.14][1] - **Microsoft.AspNetCore.Razor.Language**: [from 3.1.14 to 3.1.14][1] - **Microsoft.CodeAnalysis.Razor**: [from 3.1.14 to 3.1.14][1] - **Microsoft.NET.Sdk.Razor**: [from 3.1.14 to 3.1.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling/branches?baseVersion=GC9876229&targetVersion=GCaec2954&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d) --- NuGet.config | 9 +++++---- eng/Version.Details.xml | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 54e4308a9978..3a1e5acd9a7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,6 +34,8 @@ + + @@ -63,6 +65,8 @@ + + @@ -82,9 +86,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83975d478328..c3dbc4a5c315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,19 +19,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 9876229d920ba6f8a3ecab07c189cdba03b57343 + aec2954c62f9ca32403ef572f8e64b417c6b67e8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 9876229d920ba6f8a3ecab07c189cdba03b57343 + aec2954c62f9ca32403ef572f8e64b417c6b67e8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 9876229d920ba6f8a3ecab07c189cdba03b57343 + aec2954c62f9ca32403ef572f8e64b417c6b67e8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling - 9876229d920ba6f8a3ecab07c189cdba03b57343 + aec2954c62f9ca32403ef572f8e64b417c6b67e8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore From 8616aa9e3d176aee39cba75f430b2bef59eb99cc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Mar 2021 17:06:53 +0000 Subject: [PATCH 5/7] Merged PR 13662: [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Extensions.Logging**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.14 to 3.1.14 (parent: Microsoft.Extensions.Logging) - **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.14-servicing.21162.3 to 3.1.14-servicing.21165.9 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.14-servicing.21162.3 to 3.1.14-servicing.21165.9 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.14-servicing.21162.3 to 3.1.14-servicing.21165.9 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Abstractions**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.Memory**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.SqlServer**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Caching.StackExchangeRedis**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.14-servicing.21162.3 to 3.1.14-servicing.21165.9 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Abstractions**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.AzureKeyVault**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Binder**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.CommandLine**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.EnvironmentVariables**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.FileExtensions**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Ini**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.Json**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.KeyPerFile**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configuration.UserSecrets**: from 3.1.14 to 3.1.14 (parent: Microsoft.EntityFrameworkCore) - **Microsoft.Extensions.Configura... --- NuGet.config | 13 +++- eng/Version.Details.xml | 166 ++++++++++++++++++++-------------------- eng/Versions.props | 28 +++---- 3 files changed, 106 insertions(+), 101 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a1e5acd9a7d..36d8ba20f4e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,16 @@ + - + - + - + @@ -28,7 +29,7 @@ - + @@ -42,6 +43,7 @@ + @@ -59,6 +61,7 @@ + @@ -83,6 +86,7 @@ + @@ -102,6 +106,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3dbc4a5c315..5e8674144079 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,259 +35,259 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - cc1281b40a68d8b6a5fa56e0055efb025e1c0f92 + 986705d060bc4f0dee3c07dda068d09ade582932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -392,15 +392,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - d0e340e1edfe0e72077fe263d50593a044f9d423 + 826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - d0e340e1edfe0e72077fe263d50593a044f9d423 + 826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c @@ -410,13 +410,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-corefx - 9f21c83298820c9c42f14ed2bd3af5f6203d75ec + 6e37696a5420057596d61119614574db9037c652 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://github.com/dotnet/arcade @@ -430,9 +430,9 @@ https://github.com/dotnet/arcade ab42d248928f65dd174a2383f3256e68d9379bb7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c1f83576df40bbfe3f25e727fc69f3f6fccc2a54 + 1c79cde92ca66a991b25a5ed9cbd570e289df47e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 4cf498811736..1eaa67180a57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 3.4.1-beta4-20127-10 3.1.6 - 3.1.14-servicing.21153.1 + 3.1.14-servicing.21165.2 3.1.0 3.1.14 2.1.0 @@ -97,20 +97,20 @@ 4.7.1 4.7.0 - 3.1.5 + 3.1.6 3.2.0 - 3.1.14-servicing.21162.3 - 3.1.14-servicing.21162.3 - 3.1.14-servicing.21162.3 - 3.1.14-servicing.21162.3 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 + 3.1.14-servicing.21165.9 + 3.1.14-servicing.21165.9 + 3.1.14-servicing.21165.9 + 3.1.14-servicing.21165.9 3.1.14 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 3.1.14 3.1.14 3.1.14 @@ -133,10 +133,10 @@ 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 3.1.14 3.1.14 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 3.1.14 3.1.14 3.1.14 @@ -148,16 +148,16 @@ 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 3.1.14 3.1.14 3.1.14 3.1.14 3.1.14 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 3.1.14 - 3.1.14-servicing.21162.3 - 3.1.14-servicing.21162.3 + 3.1.14-servicing.21165.9 + 3.1.14-servicing.21165.9 3.1.14 3.1.8-servicing.20420.4 3.1.14 From 440dadc05b2bed38e6a726c2492db90e77d43c62 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 16 Mar 2021 17:25:54 +0000 Subject: [PATCH 6/7] Set cab name for TargetingPack.wixproj --- src/Installers/Windows/TargetingPack/TargetingPack.wixproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 869112ea43dc..759f7f80fd61 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -8,6 +8,7 @@ Microsoft ASP.NET Core Targeting Pack AspNetCore.TargetingPack Package + targeting_pack_$(Platform).cab true true 0AC34F1B-8056-4FFB-A398-E6BB7D67B48D From cc50f38a1494a51ff45120a166002501926247f2 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 13 Apr 2021 11:43:08 -0700 Subject: [PATCH 7/7] Code merge, Baseline and SDK updates --- eng/Baseline.Designer.props | 430 +++++++++--------- eng/Baseline.xml | 148 +++--- eng/Versions.props | 2 +- global.json | 4 +- .../clients/ts/FunctionalTests/yarn.lock | 10 + 5 files changed, 302 insertions(+), 292 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 334ff5659219..c3e7fab57d0a 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.13 + 3.1.14 @@ -14,7 +14,7 @@ - 3.1.13 + 3.1.14 @@ -25,83 +25,83 @@ - 3.1.13 + 3.1.14 - - - + + + - + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 @@ -109,97 +109,97 @@ - 3.1.13 + 3.1.14 - - - + + + - - - + + + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - - - + + + - - - + + + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - - + + - - + + - 3.1.13 + 3.1.14 - + - + - 3.1.13 + 3.1.14 - - - - + + + + - - - - + + + + @@ -244,215 +244,215 @@ - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - + - + - + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - + - + - + - 3.1.13 + 3.1.14 - - - - - - + + + + + + - - - - - - + + + + + + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - - + + - - + + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - - - + + + - - - + + + - 3.1.13 + 3.1.14 - + - + - 3.1.13 + 3.1.14 - + - + - 3.1.13 + 3.1.14 - - + + - - + + - 3.1.13 + 3.1.14 - - - + + + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 @@ -460,236 +460,236 @@ - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - + - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - + - - + + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - - + + - - + + - - - - + + + + - 3.1.13 + 3.1.14 - - + + - - + + - 3.1.13 + 3.1.14 - + - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - - - - + + + + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - + - 3.1.13 + 3.1.14 - - + + - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - 3.1.13 + 3.1.14 - - - + + + - 3.1.13 + 3.1.14 - - - + + + - - - + + + - 3.1.13 + 3.1.14 - - - + + + - - - + + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 1f5ea586ec40..a9beaf42a68b 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. --> - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 1656b6c134a2..4b59935a0fec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 3 1 15 - false + true 0 3 2 diff --git a/global.json b/global.json index 7015ff4c765a..986a552debdd 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.113" + "version": "3.1.114" }, "tools": { - "dotnet": "3.1.113", + "dotnet": "3.1.114", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" diff --git a/src/SignalR/clients/ts/FunctionalTests/yarn.lock b/src/SignalR/clients/ts/FunctionalTests/yarn.lock index 670ad9b9c7cc..eea56ecc3d10 100644 --- a/src/SignalR/clients/ts/FunctionalTests/yarn.lock +++ b/src/SignalR/clients/ts/FunctionalTests/yarn.lock @@ -1250,6 +1250,16 @@ msgpack5@^4.0.2: readable-stream "^2.3.6" safe-buffer "^5.1.2" +msgpack5@^4.5.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/msgpack5/-/msgpack5-4.5.1.tgz#2da4dba4ea20c09fd4309c9c04f046e38cb4975e" + integrity sha512-zC1vkcliryc4JGlL6OfpHumSYUHWFGimSI+OgfRCjTFLmKA2/foR9rMTOhWiqfOrfxJOctrpWPvrppf8XynJxw== + dependencies: + bl "^2.0.1" + inherits "^2.0.3" + readable-stream "^2.3.6" + safe-buffer "^5.1.2" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"