diff --git a/NuGet.config b/NuGet.config
index 3d19a63c4..1064db659 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,22 +7,31 @@
+<<<<<<< HEAD
+=======
+>>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
-
-
-
+<<<<<<< HEAD
+=======
+>>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
-
-
-
+
+
+
+
+
+
+<<<<<<< HEAD
+=======
+>>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
@@ -39,10 +48,19 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+>>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dfc4c364a..cc8272844 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,13 +5,13 @@
https://github.com/dotnet/windowsdesktop
ec2af60c1eb8b2665745750f6445b3ff133178fb
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 951b1ad8c1ade424930ec5697fd9b46d1d170db4
+ 297185fc6039237591fb28a8a09fc01d2ea69ae6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 951b1ad8c1ade424930ec5697fd9b46d1d170db4
+ 297185fc6039237591fb28a8a09fc01d2ea69ae6
https://github.com/dotnet/windowsdesktop
@@ -25,21 +25,21 @@
https://github.com/dotnet/runtime
cf258a14b70ad9069470a108f13765e0e5988f51
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2f740adc1457e8a28c1c072993b66f515977eb51
+ 478b2f8c0e480665f6c52c95cd57830784dc9560
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2f740adc1457e8a28c1c072993b66f515977eb51
+ 478b2f8c0e480665f6c52c95cd57830784dc9560
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2f740adc1457e8a28c1c072993b66f515977eb51
+ 478b2f8c0e480665f6c52c95cd57830784dc9560
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2f740adc1457e8a28c1c072993b66f515977eb51
+ 478b2f8c0e480665f6c52c95cd57830784dc9560
@@ -59,25 +59,25 @@
https://github.com/dotnet/aspnetcore
371a26f07b23ad77c636332c2dfc0cbd1d8137ba
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb
+ dc5e11abdb05b322f4b74b3afbcfb352fe984b2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb
+ dc5e11abdb05b322f4b74b3afbcfb352fe984b2e
-
+
https://github.com/dotnet/efcore
- 54203510db732a088a3e7e58d49b98ada7c14227
+ 42e81439158d5884dab24326c84ed95cd4baaa21
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb
+ dc5e11abdb05b322f4b74b3afbcfb352fe984b2e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb
+ dc5e11abdb05b322f4b74b3afbcfb352fe984b2e
https://github.com/dotnet/test-templates
@@ -87,26 +87,26 @@
https://github.com/dotnet/test-templates
a2b05d8171915c69ad97ab5d49bbb07d2c780a67
-
+
https://github.com/dotnet/templating
- 8470ff317250d761c72f920b8ea1c0700b230eb3
+ 50e1aa014b0b35cb9aa2c5157d054ee654949dff
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 51369266643769f9f0c1184e89715cd1045126d0
+ 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 51369266643769f9f0c1184e89715cd1045126d0
+ 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- b47cabfdc9c35f9b3305e5e11c2957d81fee26af
+ 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 2a2301468b4a483e4c11f763ff7f131c6ff70bc2
+ fe9dd395134709b5a53883b71c01447b5f132a06
https://github.com/dotnet/fsharp
@@ -116,9 +116,9 @@
https://github.com/microsoft/vstest
99b911a57a02fc5d2eeef23e9ab8cbea4505678b
-
+
https://github.com/mono/linker
- c43f981eec336c1dc4fd0ead84b5e09db9377d9e
+ 6a15056a9d71169bf04d007301edfd558afcfa6a
linker
diff --git a/eng/Versions.props b/eng/Versions.props
index bb8945d66..63ba0569e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
- 5.0.5-servicing.21167.1
+ 5.0.6-servicing.21221.3
- 5.0.5-servicing.21167.2
+ 5.0.6-servicing.21221.8
- 5.0.202
+ 5.0.203
@@ -43,39 +43,39 @@
- 5.0.5
+ 5.0.6
5.0.0
5.0.0-rtm.20526.5
- 5.0.5-servicing.21167.8
- 5.0.5-servicing.21167.8
- 5.0.5-servicing.21167.8
+ 5.0.6-servicing.21223.5
+ 5.0.6-servicing.21223.5
+ 5.0.6-servicing.21223.5
0.2.0
- 5.0.202-servicing.21201.17
- 5.0.202-servicing.21201.17
+ 5.0.203-servicing.21223.17
+ 5.0.203-servicing.21223.17
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 5.0.5-servicing.21166.9
- 5.0.5
- 5.0.5
+ 5.0.6-servicing.21220.11
+ 5.0.6
+ 5.0.6
5.0.0
- 5.0.5
+ 5.0.6
5.0.2
2.1.0
5.0.0-rtm.20519.4
- 5.0.5-servicing.21167.2
- 5.0.5
+ 5.0.6-servicing.21221.6
+ 5.0.6
5.0.0
5.0.0-rtm.20520.1