Merge pull request #2 from polyadic/support-ef-core-5

Add support for EF Core 5.x
polyadic · Dec 10, 2020 · cd48bdb · cd48bdb
2 parents 1b96185 + 5be1bda
commit cd48bdb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        efcore: ['3.1.0', '3.1.8']
+        efcore: ['lowestSupported', '3.1.8', '5.0.0']
     env:
       EntityFrameworkCoreVersion: ${{matrix.efcore}}
     steps:

diff --git a/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj b/Funcky.EntityFrameworkCore/Funcky.EntityFrameworkCore.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk; Microsoft.Build.CentralPackageVersions">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework Condition="'$(EntityFrameworkCoreVersion)' == '5.0.0'">netstandard2.1</TargetFramework>
         <LangVersion>8.0</LangVersion>
         <Nullable>enable</Nullable>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/Packages.props b/Packages.props
@@ -2,8 +2,8 @@
 <Project>
 	<ItemGroup Label="Runtime Dependencies">
 		<PackageReference Update="Funcky" Version="[2.2.0, 3)" />
-		<PackageReference Update="Microsoft.EntityFrameworkCore" Version="[3.1.0, 4)" Condition="'$(EntityFrameworkCoreVersion)' == ''" />
-		<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" Condition="'$(EntityFrameworkCoreVersion)' != ''" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore" Version="[3.1.0, 6)" Condition="'$(EntityFrameworkCoreVersion)' == '' Or '$(EntityFrameworkCoreVersion)' == 'lowestSupported'" />
 	</ItemGroup>
 	<ItemGroup Label="Build Dependencies">
 		<PackageReference Update="Messerli.CodeStyle" Version="1.2.1" />
@@ -12,8 +12,8 @@
 	</ItemGroup>
 	<ItemGroup Label="Test Dependencies">
 		<PackageReference Update="Funcky.Xunit" Version="0.1.3" />
-		<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="[3.1.0, 4)" Condition="'$(EntityFrameworkCoreVersion)' == ''" />
-		<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCoreVersion)" Condition="'$(EntityFrameworkCoreVersion)' != ''" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCoreVersion)" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="[3.1.0, 6)" Condition="'$(EntityFrameworkCoreVersion)' == '' Or '$(EntityFrameworkCoreVersion)' == 'lowestSupported'" />
 		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.9.0" />
 		<PackageReference Update="xunit" Version="2.4.0" />
 		<PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />

diff --git a/global.json b/global.json
@@ -1,8 +1,9 @@
 {
-  "sdk": {
-    "version": "3.1.402"
-  },
-  "msbuild-sdks": {
-    "Microsoft.Build.CentralPackageVersions" : "2.0.79"
-  }
+    "sdk": {
+        "version": "3.1.402",
+        "rollForward": "latestFeature"
+    },
+    "msbuild-sdks": {
+        "Microsoft.Build.CentralPackageVersions": "2.0.79"
+    }
 }