From f688f39111001b6b3ba8e9cf282b0f6c23260561 Mon Sep 17 00:00:00 2001
From: Ming Yau Lee <lee_mingyau@hotmail.com>
Date: Thu, 21 Apr 2022 16:27:54 +0800
Subject: [PATCH] Minor: Add .Net 7 preview as target framework

---
 .github/workflows/JsBind.Net-Build.yml                    | 5 +++--
 .github/workflows/JsBind.Net-Release.yml                  | 3 ++-
 .../JsBind.Net.Extensions.DependencyInjection.csproj      | 3 ++-
 src/JsBind.Net/JsBind.Net.csproj                          | 3 ++-
 test/JsBind.Net.Tests/JsBind.Net.Tests.csproj             | 8 ++++----
 test/JsBind.Net.TestsRunner/JsBind.Net.TestsRunner.csproj | 2 +-
 test/JsBind.Net.TestsRunner/Runner.cs                     | 2 +-
 test/TestBindings/TestBindings.csproj                     | 4 ++--
 8 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/JsBind.Net-Build.yml b/.github/workflows/JsBind.Net-Build.yml
index 606f041..e478ebf 100644
--- a/.github/workflows/JsBind.Net-Build.yml
+++ b/.github/workflows/JsBind.Net-Build.yml
@@ -36,7 +36,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
+        include-prerelease: true
     - name: Setup Chrome and Chrome Driver
       uses: nanasess/setup-chromedriver@master
     - name: Checkout
@@ -77,7 +78,7 @@ jobs:
       run: |
         .\.sonar\scanner\dotnet-sonarscanner begin /k:"JsBind.Net" /o:"mingyaulee" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /v:"v${{ needs.version.outputs.FullSemVer }}" /d:sonar.cs.vstest.reportsPaths="test/TestResults/*.trx" /d:sonar.cs.opencover.reportsPaths="test/TestResults/**/*.opencover.xml"
         dotnet build --no-restore --configuration Release
-        .\.coverlet\console\coverlet ./test/JsBind.Net.Tests/bin/Release/net6.0/wwwroot/_framework --include "[JsBind.Net*]*" --target "dotnet" --targetargs "test . --no-restore --no-build --configuration Release" --format opencover --output ./test/TestResults/coverage --verbosity detailed
+        .\.coverlet\console\coverlet ./test/JsBind.Net.Tests/bin/Release/net7.0/wwwroot/_framework --include "[JsBind.Net*]*" --target "dotnet" --targetargs "test . --no-restore --no-build --configuration Release" --format opencover --output ./test/TestResults/coverage --verbosity detailed
         .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
 
   tag:
diff --git a/.github/workflows/JsBind.Net-Release.yml b/.github/workflows/JsBind.Net-Release.yml
index 48ecefd..7fb3248 100644
--- a/.github/workflows/JsBind.Net-Release.yml
+++ b/.github/workflows/JsBind.Net-Release.yml
@@ -15,7 +15,8 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
+        include-prerelease: true
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.11
       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 565e109..4202837 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>
-    <TargetFrameworks>net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -24,6 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.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>
diff --git a/src/JsBind.Net/JsBind.Net.csproj b/src/JsBind.Net/JsBind.Net.csproj
index 12b2685..14e2e7b 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>
-    <TargetFrameworks>net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -35,6 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Condition="'$(TargetFramework)' == 'net7.0'" Include="Microsoft.JSInterop" Version="7.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>
diff --git a/test/JsBind.Net.Tests/JsBind.Net.Tests.csproj b/test/JsBind.Net.Tests/JsBind.Net.Tests.csproj
index 431a3af..0a9d89e 100644
--- a/test/JsBind.Net.Tests/JsBind.Net.Tests.csproj
+++ b/test/JsBind.Net.Tests/JsBind.Net.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <_JsBind_Package_Contents_Scripts_Directory>$(MSBuildThisFileDirectory)..\..\src\JsBind.Net\content\dist</_JsBind_Package_Contents_Scripts_Directory>
     <BlazorEnableCompression>false</BlazorEnableCompression>
     <!-- Disable caching so that we can skip integrity check. This is for coverlet to inject the hits counter into the assembly which will change the integrity hash. -->
@@ -10,9 +10,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-*" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="7.0.0-*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/JsBind.Net.TestsRunner/JsBind.Net.TestsRunner.csproj b/test/JsBind.Net.TestsRunner/JsBind.Net.TestsRunner.csproj
index b461c5e..6c52fd7 100644
--- a/test/JsBind.Net.TestsRunner/JsBind.Net.TestsRunner.csproj
+++ b/test/JsBind.Net.TestsRunner/JsBind.Net.TestsRunner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <OutDir>BuildOutput\$(Configuration)</OutDir>
   </PropertyGroup>
diff --git a/test/JsBind.Net.TestsRunner/Runner.cs b/test/JsBind.Net.TestsRunner/Runner.cs
index 3bcde41..f5152dc 100644
--- a/test/JsBind.Net.TestsRunner/Runner.cs
+++ b/test/JsBind.Net.TestsRunner/Runner.cs
@@ -28,7 +28,7 @@ public async Task RunTests()
             var configuration = "release";
 #endif
 
-            var testProjectOutput = $"{solutionDirectory}\\test\\JsBind.Net.Tests\\bin\\{configuration}\\net6.0\\wwwroot\\_framework";
+            var testProjectOutput = $"{solutionDirectory}\\test\\JsBind.Net.Tests\\bin\\{configuration}\\net7.0\\wwwroot\\_framework";
             // delete all gzip files to disable use of gzip and allow code coverage collection
             foreach (var gzipFile in Directory.GetFiles(testProjectOutput).Where(file => file.EndsWith(".gz")))
             {
diff --git a/test/TestBindings/TestBindings.csproj b/test/TestBindings/TestBindings.csproj
index 8e7a820..9276654 100644
--- a/test/TestBindings/TestBindings.csproj
+++ b/test/TestBindings/TestBindings.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <LangVersion>9</LangVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	  <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-*" />
   </ItemGroup>
 
   <ItemGroup>