From 5519968cbd44cf09f2d6b1b5de750f93191298cb Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 22 Jun 2020 11:49:52 -0700
Subject: [PATCH 1/4] Prepare for strict coherency Strict coherency means that
 if your repo declares a dependency with a CPD attribute, the CPD parent must
 have a direct dependency on that dependency. This means for aspnetcore that
 it should add a dependency on System.Resources.Extensions because
 aspnetcore-tooling needs it.

Reasons for this approach over the current approach:
- This eliminates some ambiguous tie-breaking scenarios that are very problematic and dangerous in servicing
- Those tie breaking scenarios require the use of BAR to break the ties. If the DB data were to be lost then the tie-breaking would do unexpected things.
---
 eng/Version.Details.xml | 4 ++++
 eng/Versions.props      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cc30482c95be..3f63ab1ac1a0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -312,5 +312,9 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>5911981d56de6afdaa84b26343ab915c5f9aca56</Sha>
     </Dependency>
+    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.7.20321.2">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>1f4d0db2339c37d75723d063827fd2a4c6e2ecef</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7c793eaa5f2c..377a2127293f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -116,6 +116,7 @@
     <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.7.20321.2</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.7.20321.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
     <SystemReflectionMetadataPackageVersion>5.0.0-preview.7.20321.2</SystemReflectionMetadataPackageVersion>
+    <SystemResourcesExtensionsVersion>5.0.0-preview.7.20321.2</SystemResourcesExtensionsVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.7.20321.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.7.20321.2</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.7.20321.2</SystemSecurityCryptographyPkcsPackageVersion>

From 1d550519cfd4156b50b569e1ec18fa10f0031500 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 22 Jun 2020 16:13:58 -0700
Subject: [PATCH 2/4] Fixup property name

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 377a2127293f..b10ff3631492 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -116,7 +116,7 @@
     <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.7.20321.2</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.7.20321.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
     <SystemReflectionMetadataPackageVersion>5.0.0-preview.7.20321.2</SystemReflectionMetadataPackageVersion>
-    <SystemResourcesExtensionsVersion>5.0.0-preview.7.20321.2</SystemResourcesExtensionsVersion>
+    <SystemReflectionMetadataPackageVersion>5.0.0-preview.7.20321.2</SystemReflectionMetadataPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.7.20321.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.7.20321.2</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.7.20321.2</SystemSecurityCryptographyPkcsPackageVersion>

From 35717534e85d7007e91b5ada41f4d8f2b82a9d9b Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 23 Jun 2020 07:59:54 -0700
Subject: [PATCH 3/4] Fixup property name

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index b10ff3631492..c7f4d0b65f84 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -116,7 +116,7 @@
     <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.7.20321.2</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.7.20321.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
     <SystemReflectionMetadataPackageVersion>5.0.0-preview.7.20321.2</SystemReflectionMetadataPackageVersion>
-    <SystemReflectionMetadataPackageVersion>5.0.0-preview.7.20321.2</SystemReflectionMetadataPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>5.0.0-preview.7.20321.2</SystemResourcesExtensionsPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.7.20321.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.7.20321.2</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.7.20321.2</SystemSecurityCryptographyPkcsPackageVersion>

From 9ed9d4888c3df8457a533cbd42050144da4c1524 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 24 Jun 2020 09:24:44 -0700
Subject: [PATCH 4/4] Update version details xml

---
 eng/Version.Details.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 78fe32937344..134dc2811625 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -225,6 +225,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>d908270add914db0e9fb3ce72e93c410e8f0f95a</Sha>
     </Dependency>
+    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.8.20323.9">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>d908270add914db0e9fb3ce72e93c410e8f0f95a</Sha>
+    </Dependency>
     <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.8.20323.9">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>d908270add914db0e9fb3ce72e93c410e8f0f95a</Sha>
@@ -312,9 +316,5 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>5911981d56de6afdaa84b26343ab915c5f9aca56</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.7.20321.2">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>1f4d0db2339c37d75723d063827fd2a4c6e2ecef</Sha>
-    </Dependency>
   </ToolsetDependencies>
 </Dependencies>