From 58d29cc4a889a036707a16ac07223c328e2db774 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 3 Aug 2018 23:57:15 -0400
Subject: [PATCH] consolidate some deps

---
 src/Core/Core.csproj    |  2 +-
 src/Hub/Hub.csproj      |  2 +-
 util/Setup/Setup.csproj | 25 +------------------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index f5b3bcc7c8..5b0d584d61 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Hub/Hub.csproj b/src/Hub/Hub.csproj
index 5f862c07cc..a0fff01a66 100644
--- a/src/Hub/Hub.csproj
+++ b/src/Hub/Hub.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2"  />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index 8237cfde5f..bbfe2dc8ea 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -8,30 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="DbScripts\2018-04-02_00_Org2fa.sql" />
-    <None Remove="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
-    <None Remove="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
-    <None Remove="DbScripts\2018-07-28_00_DbTuning.sql" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="DbScripts\2018-07-28_00_DbTuning.sql" />
-    <EmbeddedResource Include="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
-    <EmbeddedResource Include="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
-    <EmbeddedResource Include="DbScripts\2018-04-02_00_Org2fa.sql" />
-    <EmbeddedResource Include="DbScripts\2018-03-21_00_AdminPortal.sql" />
-    <EmbeddedResource Include="DbScripts\2018-03-12_00_FixLoginUris.sql" />
-    <EmbeddedResource Include="DbScripts\2018-02-28_00_LoginUris.sql" />
-    <EmbeddedResource Include="DbScripts\2017-12-12_00_Events.sql" />
-    <EmbeddedResource Include="DbScripts\2017-11-24_00_UpdateProcs.sql" />
-    <EmbeddedResource Include="DbScripts\2017-11-13_00_IndexTuning.sql" />
-    <EmbeddedResource Include="DbScripts\2017-11-06_00_FamilyPlanAdjustments.sql" />
-    <EmbeddedResource Include="DbScripts\2017-10-25_00_OrgUserUpdates.sql" />
-    <EmbeddedResource Include="DbScripts\2017-09-08_00_OrgUserCounts.sql" />
-    <EmbeddedResource Include="DbScripts\2017-09-06_00_CipherDetails.sql" />
-    <EmbeddedResource Include="DbScripts\2017-08-30_00_CollectionWriteOnly.sql" />
-    <EmbeddedResource Include="DbScripts\2017-08-22_00_LicenseCheckScripts.sql" />
-    <EmbeddedResource Include="DbScripts\2017-08-19_00_InitialSetup.sql" />
+    <EmbeddedResource Include="DbScripts\**\*.sql" />
   </ItemGroup>
 
   <ItemGroup>