From a1a6736f40f2a467fe8605bfb92120f9b68f5904 Mon Sep 17 00:00:00 2001
From: FreddyD <FreddyD@GIT>
Date: Fri, 21 Feb 2020 14:43:25 -0500
Subject: [PATCH] Update references to EF Core 3.1

---
 src/EFCore.Jet/EFCore.Jet.csproj                            | 2 +-
 .../EFCore.Jet.Design.FunctionalTests.csproj                | 5 ++++-
 .../EFCore.Jet.Integration.Test.csproj                      | 6 +++---
 test/EFCore.Jet.Integration.Test/Helpers.cs                 | 5 +++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/EFCore.Jet/EFCore.Jet.csproj b/src/EFCore.Jet/EFCore.Jet.csproj
index 6924ed6..d9725b5 100644
--- a/src/EFCore.Jet/EFCore.Jet.csproj
+++ b/src/EFCore.Jet/EFCore.Jet.csproj
@@ -57,7 +57,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Data.Jet\System.Data.Jet.csproj" />
diff --git a/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj b/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj
index 492ffb3..fc810df 100644
--- a/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj
+++ b/test/EFCore.Jet.Design.FunctionalTest/EFCore.Jet.Design.FunctionalTests.csproj
@@ -18,7 +18,10 @@
     <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Version="2.0.3" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.7.0" />
diff --git a/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj b/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj
index ff39387..0814ca0 100644
--- a/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj
+++ b/test/EFCore.Jet.Integration.Test/EFCore.Jet.Integration.Test.csproj
@@ -99,14 +99,14 @@
       <Version>2.2.0.5</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite">
-      <Version>2.2.0</Version>
+      <Version>3.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer">
-      <Version>2.2.0</Version>
+      <Version>3.1.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />    
     <PackageReference Include="SQLitePCLRaw.core">
-      <Version>1.1.12</Version>
+      <Version>2.0.2</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.DiagnosticSource">
       <Version>4.7.0</Version>
diff --git a/test/EFCore.Jet.Integration.Test/Helpers.cs b/test/EFCore.Jet.Integration.Test/Helpers.cs
index 2965936..ba9d883 100644
--- a/test/EFCore.Jet.Integration.Test/Helpers.cs
+++ b/test/EFCore.Jet.Integration.Test/Helpers.cs
@@ -174,7 +174,12 @@ namespace EFCore.Jet.Integration.Test
 
         public static DbConnection GetSqlServerConnection()
         {
+#if NETFRAMEWORK
             DbConnection connection = new System.Data.SqlClient.SqlConnection("Data Source=(local);Initial Catalog=JetEfProviderComparativeTest;Integrated Security=true");
+#else
+            DbConnection connection = new Microsoft.Data.SqlClient.SqlConnection("Data Source=(local);Initial Catalog=JetEfProviderComparativeTest;Integrated Security=true");
+
+#endif
             return connection;
         }