diff --git a/NuGet.config b/NuGet.config index 25788976f9cc..266cc16542c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,10 @@ + + @@ -20,6 +22,7 @@ + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 00cdc1685bc3..b5513e6d2ec3 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - - + + + @@ -37,108 +37,108 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -146,110 +146,110 @@ - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - - + + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 @@ -257,86 +257,86 @@ - 5.0.4 + 5.0.5 - + - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 @@ -383,86 +383,86 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - - + + - + - - + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - - + + - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 @@ -474,185 +474,185 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - + + - - + + - - + + - 5.0.4 + 5.0.5 - - + + - - + + - 5.0.4 + 5.0.5 - + - + - + - + - + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - - - - + + + + - 5.0.4 + 5.0.5 @@ -661,65 +661,65 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -735,42 +735,42 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - - + + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 @@ -780,73 +780,73 @@ - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 @@ -867,11 +867,11 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -889,13 +889,13 @@ - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index dc276a967c75..6f97d867229d 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e95770fccd2..b9ec285e5249 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 https://github.com/dotnet/runtime @@ -145,9 +145,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/runtime @@ -173,9 +173,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/runtime @@ -268,11 +268,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + e6b30911ce808668d81d926b0744f1dd02a43840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/runtime @@ -294,24 +294,24 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1ed1774f4eb9..3e8296a36718 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 6 - false + true @@ -59,10 +59,10 @@ 5.0.0 - 5.0.4-servicing.21116.14 + 5.0.5-servicing.21166.9 5.0.0 - 5.0.4 - 5.0.4-servicing.21116.14 + 5.0.5 + 5.0.5-servicing.21166.9 5.0.0 5.0.0 5.0.0 @@ -91,14 +91,14 @@ 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.0 5.0.0 5.0.0 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.0-rtm.20519.4 5.0.0 5.0.1 @@ -121,20 +121,20 @@ 5.0.0 5.0.0 5.0.1 - 5.0.1 + 5.0.2 5.0.0 5.0.0 - 5.0.1 + 5.0.2 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 + 5.0.5 + 5.0.5 + 5.0.5 + 5.0.5 + 5.0.5 + 5.0.5 + 5.0.5 + 5.0.5 5.0.0-beta.21160.3 @@ -182,6 +182,8 @@ $(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0 $(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0 $(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[0]).$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[1]).0 + $(SystemTextJsonPackageVersion.Split('.')[0]).$(SystemTextJsonPackageVersion.Split('.')[1]).0 + $(SystemTextEncodingsWebPackageVersion.Split('.')[0]).$(SystemTextEncodingsWebPackageVersion.Split('.')[1]).0 $(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0 diff --git a/global.json b/global.json index 59a90a2d75ea..fcfeb734fdfe 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.104" + "version": "5.0.202" }, "tools": { - "dotnet": "5.0.104", + "dotnet": "5.0.202", "runtimes": { "dotnet/x64": [ - "2.1.26", + "2.1.27", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.13" + "3.1.14" ] }, "Git": "2.22.0", diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index 1fd19e6cc1a5..a4a14ce447e4 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit 1fd19e6cc1a58bce9153933324164ec80ed560cf +Subproject commit a4a14ce447e4ef694af1a485fb672db35e766111