From 24b938c5936e8e2ddc464caef2e013ebf1fce166 Mon Sep 17 00:00:00 2001
From: Ming Yau Lee <lee_mingyau@hotmail.com>
Date: Sun, 28 Nov 2021 12:55:29 +0800
Subject: [PATCH] Minor: Add .Net 6 as target framework

---
 .github/workflows/JsBind.Net-Build.yml                       | 2 +-
 .github/workflows/JsBind.Net-Release.yml                     | 2 +-
 .../JsBind.Net.Extensions.DependencyInjection.csproj         | 5 +++--
 src/JsBind.Net/JsBind.Net.csproj                             | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/JsBind.Net-Build.yml b/.github/workflows/JsBind.Net-Build.yml
index 0635d59..a08b3e7 100644
--- a/.github/workflows/JsBind.Net-Build.yml
+++ b/.github/workflows/JsBind.Net-Build.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
     - name: Setup Chrome and Chrome Driver
       uses: nanasess/setup-chromedriver@master
     - name: Checkout
diff --git a/.github/workflows/JsBind.Net-Release.yml b/.github/workflows/JsBind.Net-Release.yml
index c4067ac..05dd0c7 100644
--- a/.github/workflows/JsBind.Net-Release.yml
+++ b/.github/workflows/JsBind.Net-Release.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.7
       with:
diff --git a/src/JsBind.Net.Extensions.DependencyInjection/JsBind.Net.Extensions.DependencyInjection.csproj b/src/JsBind.Net.Extensions.DependencyInjection/JsBind.Net.Extensions.DependencyInjection.csproj
index 0ac6af8..565e109 100644
--- a/src/JsBind.Net.Extensions.DependencyInjection/JsBind.Net.Extensions.DependencyInjection.csproj
+++ b/src/JsBind.Net.Extensions.DependencyInjection/JsBind.Net.Extensions.DependencyInjection.csproj
@@ -3,7 +3,7 @@
   <!-- Build properties. -->
   <PropertyGroup>
     <LangVersion>9</LangVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net6.0;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -24,7 +24,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net5.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/JsBind.Net/JsBind.Net.csproj b/src/JsBind.Net/JsBind.Net.csproj
index d7a602e..12b2685 100644
--- a/src/JsBind.Net/JsBind.Net.csproj
+++ b/src/JsBind.Net/JsBind.Net.csproj
@@ -3,7 +3,7 @@
   <!-- Build properties. -->
   <PropertyGroup>
     <LangVersion>9</LangVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net6.0;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -35,7 +35,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.JSInterop" Version="5.0.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="Microsoft.JSInterop" Version="6.0.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net5.0'" Include="Microsoft.JSInterop" Version="5.0.0" />
   </ItemGroup>
 
 </Project>