Drop support for EF Core 2.X

Eastrall · Eastrall · commit da464e186bc6 · 2020-11-04T12:58:49.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: csharp
 mono: none
-dotnet: 3.0.100
+dotnet: 3.1.403
 
 env:
   global:
diff --git a/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj b/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>EntityFrameworkCore.DataEncryption</AssemblyName>
     <RootNamespace>Microsoft.EntityFrameworkCore.DataEncryption</RootNamespace>
     <Version>2.0.0</Version>
@@ -23,8 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" Condition="'$(TargetFramework)' == 'netstandard2.1'" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCore.DataEncryption/ModelBuilderExtensions.cs b/src/EntityFrameworkCore.DataEncryption/ModelBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Microsoft.EntityFrameworkCore.DataEncryption.Internal;
+﻿using Microsoft.EntityFrameworkCore.DataEncryption.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using System;
 using System.ComponentModel.DataAnnotations;
diff --git a/test/EntityFrameworkCore.DataEncryption.Test/Context/DatabaseContextFactory.cs b/test/EntityFrameworkCore.DataEncryption.Test/Context/DatabaseContextFactory.cs
@@ -19,9 +19,6 @@ public DatabaseContextFactory()
         {
             _connection = new SqliteConnection(DatabaseConnectionString);
             _connection.Open();
-
-            using (var dbContext = new DatabaseContext(CreateOptions<DatabaseContext>()))
-                dbContext.Database.EnsureCreated();
         }
 
         /// <summary>
@@ -32,10 +29,11 @@ public DatabaseContextFactory()
         /// <returns></returns>
         public TContext CreateContext<TContext>(IEncryptionProvider provider = null) where TContext : DbContext
         {
-            if (provider == null)
-                return Activator.CreateInstance(typeof(TContext), CreateOptions<TContext>()) as TContext;
+            var context = Activator.CreateInstance(typeof(TContext), CreateOptions<TContext>(), provider) as TContext;
+
+            context.Database.EnsureCreated();
 
-            return Activator.CreateInstance(typeof(TContext), CreateOptions<TContext>(), provider) as TContext;
+            return context;
         }
 
         /// <summary>
diff --git a/test/EntityFrameworkCore.DataEncryption.Test/EntityFrameworkCore.DataEncryption.Test.csproj b/test/EntityFrameworkCore.DataEncryption.Test/EntityFrameworkCore.DataEncryption.Test.csproj
@@ -1,29 +1,22 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
-
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsPackable>false</IsPackable>
-
     <AssemblyName>Microsoft.EntityFrameworkCore.Encryption.Test</AssemblyName>
-
     <RootNamespace>Microsoft.EntityFrameworkCore.Encryption.Test</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.7.0">
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.*" Condition="'$(TargetFramework)' == 'netcoreapp3.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.*" Condition="'$(TargetFramework)' == 'netcoreapp3.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp2.2'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" Condition="'$(TargetFramework)' == 'netcoreapp2.2'" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/test/EntityFrameworkCore.DataEncryption.Test/Providers/AesProviderTest.cs b/test/EntityFrameworkCore.DataEncryption.Test/Providers/AesProviderTest.cs
@@ -1,6 +1,7 @@
 ﻿using Microsoft.EntityFrameworkCore.DataEncryption.Providers;
 using Microsoft.EntityFrameworkCore.DataEncryption.Test.Context;
 using Microsoft.EntityFrameworkCore.DataEncryption.Test.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -63,6 +64,15 @@ public void CompareTwoAesKeysInstancesTest(AesKeySize keySize)
             Assert.False(encryptionKeyInfo1.Equals(0));
         }
 
+        [Fact]
+        public void CreateDataContextWithoutProvider()
+        {
+            using (var contextFactory = new DatabaseContextFactory())
+            {
+                Assert.Throws<ArgumentNullException>(() => contextFactory.CreateContext<SimpleEncryptedDatabaseContext>());
+            }
+        }
+
         [Fact]
         public void EncryptUsingAes128Provider()
         {
@@ -137,5 +147,11 @@ public class Aes256EncryptedDatabaseContext : DatabaseContext
             public Aes256EncryptedDatabaseContext(DbContextOptions options, IEncryptionProvider encryptionProvider = null)
                 : base(options, encryptionProvider) { }
         }
+
+        public class SimpleEncryptedDatabaseContext : DatabaseContext
+        {
+            public SimpleEncryptedDatabaseContext(DbContextOptions options, IEncryptionProvider encryptionProvider = null)
+                : base(options, encryptionProvider) { }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ public DatabaseContextFactory()`
`19`	`19`	`{`
`20`	`20`	`_connection = new SqliteConnection(DatabaseConnectionString);`
`21`	`21`	`_connection.Open();`
`22`		`-`
`23`		`- using (var dbContext = new DatabaseContext(CreateOptions<DatabaseContext>()))`
`24`		`- dbContext.Database.EnsureCreated();`
`25`	`22`	`}`
`26`	`23`
`27`	`24`	`/// <summary>`
`@@ -32,10 +29,11 @@ public DatabaseContextFactory()`
`32`	`29`	`/// <returns></returns>`
`33`	`30`	`public TContext CreateContext<TContext>(IEncryptionProvider provider = null) where TContext : DbContext`
`34`	`31`	`{`
`35`		`- if (provider == null)`
`36`		`- return Activator.CreateInstance(typeof(TContext), CreateOptions<TContext>()) as TContext;`
	`32`	`+ var context = Activator.CreateInstance(typeof(TContext), CreateOptions<TContext>(), provider) as TContext;`
	`33`	`+`
	`34`	`+ context.Database.EnsureCreated();`
`37`	`35`
`38`		`- return Activator.CreateInstance(typeof(TContext), CreateOptions<TContext>(), provider) as TContext;`
	`36`	`+ return context;`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`/// <summary>`