From 0aefc13f7220de61823fa5ca98935946e1ad8241 Mon Sep 17 00:00:00 2001
From: John Campion <john@brightshore.com>
Date: Fri, 20 Nov 2020 11:57:10 -0500
Subject: [PATCH 1/3] Add net 5.0 as a target, with updated dependencies

---
 ...ngoFramework.Profiling.MiniProfiler.csproj |  2 +-
 src/MongoFramework/MongoFramework.csproj      | 25 +++++++++++++++----
 .../MongoFramework.Tests.csproj               | 17 +++++++++++--
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj b/src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj
index 9303d01a..9e3bcc04 100644
--- a/src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj
+++ b/src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
     <AssemblyName>MongoFramework.Profiling.MiniProfiler</AssemblyName>
     <Title>MiniProfiler for MongoFramework</Title>
     <Description>MongoFramework integration for MiniProfiler</Description>
diff --git a/src/MongoFramework/MongoFramework.csproj b/src/MongoFramework/MongoFramework.csproj
index bb506e1b..37510992 100644
--- a/src/MongoFramework/MongoFramework.csproj
+++ b/src/MongoFramework/MongoFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
     <AssemblyName>MongoFramework</AssemblyName>
     <Title>MongoFramework</Title>
     <Description>An "Entity Framework"-like interface for the MongoDB C# Driver</Description>
@@ -11,10 +11,25 @@
 
   <ItemGroup>
     <PackageReference Include="MongoDB.Driver" Version="2.11.4" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
-    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
+      <ItemGroup>
+        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
+        <PackageReference Include="System.Linq.Async" Version="5.0.0" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
+        <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
 </Project>
diff --git a/tests/MongoFramework.Tests/MongoFramework.Tests.csproj b/tests/MongoFramework.Tests/MongoFramework.Tests.csproj
index e2578e35..8d46ff09 100644
--- a/tests/MongoFramework.Tests/MongoFramework.Tests.csproj
+++ b/tests/MongoFramework.Tests/MongoFramework.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>MongoFramework.Tests</AssemblyName>
     <RootNamespace>MongoFramework.Tests</RootNamespace>
-    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -12,7 +12,6 @@
     <PackageReference Include="Moq" Version="4.15.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
     <PackageReference Include="coverlet.collector" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -20,6 +19,20 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
+      <ItemGroup>
+        <PackageReference Include="System.Linq.Async" Version="5.0.0" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\MongoFramework.Profiling.MiniProfiler\MongoFramework.Profiling.MiniProfiler.csproj" />
     <ProjectReference Include="..\..\src\MongoFramework\MongoFramework.csproj" />

From ea74834f4050fae6ad367cf4abd66a2e90d6d64d Mon Sep 17 00:00:00 2001
From: John Campion <john@brightshore.com>
Date: Fri, 20 Nov 2020 12:14:22 -0500
Subject: [PATCH 2/3] First try at 5.0 testing in CI

---
 .github/workflows/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9fa71545..ad66f02e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,10 @@ jobs:
 
     - name: Checkout
       uses: actions/checkout@v2
-
+    - name: Setup Dot Net 5
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.x' 
     - name: Install dependencies
       run: dotnet restore
     - name: Build

From 768a63a52d3eb3f80071c20248b950908c3b8c08 Mon Sep 17 00:00:00 2001
From: John Campion <john@brightshore.com>
Date: Fri, 20 Nov 2020 12:31:38 -0500
Subject: [PATCH 3/3] Get all 3 versions side by side for full testing

---
 .github/workflows/build.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad66f02e..12acfaf0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,15 @@ jobs:
 
     - name: Checkout
       uses: actions/checkout@v2
-    - name: Setup Dot Net 5
+    - name: Setup dotnet 2.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '2.1.x'
+    - name: Setup dotnet 3.1
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+    - name: Setup dotnet 5.0
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '5.0.x'