From 5634f8f6fc1b65e4c53e560ea6f0b2e7fb03ad6c Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Mon, 27 Nov 2017 14:08:13 -0700
Subject: [PATCH] Cleanup dependencies.props (#669)

Keep packages grouped by the feed that provides them
---
 build/dependencies.props | 87 +++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 2220151957..6a7d68033f 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -32,6 +32,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ExternalDependency Include="Microsoft.CSharp" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-25711-01" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="2.1.0-preview2-25711-01" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" TargetFramework="netcoreapp2.1" Source="$(DotNetCoreFeed)" Mirror="true">
@@ -43,6 +44,7 @@
     <ExternalDependency Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-25831-01" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="Microsoft.Win32.Registry" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
@@ -68,10 +70,49 @@
     <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Buffers" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.CodeDom" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Collections.Immutable" Version="1.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.ComponentModel.Annotations" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Composition.AttributedModel" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Composition.Convention" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Composition.Hosting" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Composition.Runtime" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Composition.TypedParts" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Composition" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Configuration.ConfigurationManager" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Data.SqlClient" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true">
+      <!-- This version should be used by runtime packages. -->
+      <NoWarn>KRB2004</NoWarn>
+    </ExternalDependency>
+    <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.IO.FileSystem.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.IO.Packaging" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.IO.Pipes.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.IO.Ports" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Json" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Memory" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Numerics.Vectors" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Reflection.DispatchProxy" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Reflection.Metadata" Version="1.6.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Reflection.TypeExtensions" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.Cryptography.Cng" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.Cryptography.Pkcs" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.Cryptography.ProtectedData" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.Cryptography.Xml" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.Permissions" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Security.Principal.Windows" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.ServiceProcess.ServiceController" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Text.Encoding.CodePages" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Text.Encodings.Web" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Threading.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Threading.Channels" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Private="true" Mirror="true" />
+    <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="4.9.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="4.5.0-preview2-25707-02" Source="$(DotNetCoreFeed)" Mirror="true" />
+    <ExternalDependency Include="System.ValueTuple" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
   </ItemGroup>
 
   <!-- CoreFX labs -->
@@ -241,8 +282,6 @@
     <ExternalDependency Include="Microsoft.CodeAnalysis" Version="2.3.1" Source="$(DefaultNuGetFeed)">
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
-
-    <ExternalDependency Include="Microsoft.CSharp" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.14.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.2.0-preview2-41113220915" Source="$(DefaultNuGetFeed)" />
@@ -287,29 +326,24 @@
     <ExternalDependency Include="Microsoft.VisualStudio.Text.UI" Version="15.0.26606" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.Web.Administration" Version="7.0.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.Web.Xdt" Version="1.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.Win32.Registry" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="Mono.Addins" Version="1.3.7" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Moq" Version="4.7.49" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="MsgPack.Cli" Version="0.9.0-beta2" Source="$(DefaultNuGetFeed)" />
-
     <ExternalDependency Include="NETStandard.Library" Version="1.6.1" Source="$(DefaultNuGetFeed)">
       <!-- netstandard1.x -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>NETStandard16PackageVersion</VariableName>
     </ExternalDependency>
-
     <ExternalDependency Include="NETStandard.Library" Version="2.0.0" Source="$(DefaultNuGetFeed)">
       <!-- netstandard2.0 -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>NETStandard20PackageVersion</VariableName>
     </ExternalDependency>
-
     <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
       <!-- netstandard2.0.1 -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>NETStandard201PackageVersion</VariableName>
     </ExternalDependency>
-
     <ExternalDependency Include="Newtonsoft.Json.Bson" Version="1.0.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Newtonsoft.Json" Version="10.0.1" Source="$(DefaultNuGetFeed)">
       <!-- This version is used by runtime packages. -->
@@ -331,56 +365,17 @@
     <ExternalDependency Include="StackExchange.Redis.StrongName" Version="1.2.4" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="StreamJsonRpc" Version="1.1.92" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="StyleCop.Analyzers" Version="1.0.0" Source="$(DefaultNuGetFeed)" Private="true" />
-    <ExternalDependency Include="System.Buffers" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.CodeDom" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Collections.Immutable" Version="1.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.ComponentModel.Annotations" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Composition.AttributedModel" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Composition.Convention" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Composition.Hosting" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Composition.Runtime" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Composition.TypedParts" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Composition" Version="1.2.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Configuration.ConfigurationManager" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Data.SqlClient" Version="4.3.1" Source="$(DefaultNuGetFeed)" Private="true">
       <!-- This version is used by EF's 1.1 benchmark project -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>Benchmarks_11_SystemDataSqlClientPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="System.Data.SqlClient" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true">
-      <!-- This version should be used by runtime packages. -->
-      <NoWarn>KRB2004</NoWarn>
-    </ExternalDependency>
-    <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Interactive.Async" Version="3.1.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.IO.FileSystem.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.IO.Packaging" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.IO.Pipes.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.IO.Ports" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Json" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Management.Automation" Version="6.1.7601.17515" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Net.Http" Version="4.3.2" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Reactive.Linq" Version="3.1.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Reflection.DispatchProxy" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Reflection.Emit" Version="4.3.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Reflection.Metadata" Version="1.6.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Reflection.TypeExtensions" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Security.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Security.Cryptography.Cng" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Security.Cryptography.Pkcs" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Security.Cryptography.ProtectedData" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Security.Cryptography.Xml" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Security.Permissions" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Security.Principal.Windows" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.ServiceProcess.ServiceController" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Text.Encoding.CodePages" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Text.Encodings.Web" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Threading.AccessControl" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="4.9.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="4.5.0-preview2-25707-02" Source="$(DotNetCoreFeed)" Mirror="true" />
-    <ExternalDependency Include="System.ValueTuple" Version="4.5.0-preview1-25922-03" Source="$(DotNetCoreFeed)" Mirror="true" />
     <ExternalDependency Include="WindowsAzure.Storage" Version="8.1.4" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="xunit.abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="xunit.analyzers" Version="0.7.0" Source="$(DefaultNuGetFeed)" />