Minor: Add .Net 7 as target framework

mingyaulee · Apr 21, 2022 · 53e7b44 · 53e7b44
1 parent 30c7827
commit 53e7b44
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/WebExtensions.Net-Build.yml b/.github/workflows/WebExtensions.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:"WebExtensions.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/WebExtensions.Net.BrowserExtensionIntegrationTest/bin/Release/net6.0/browserextension/framework --include "[WebExtensions.Net]*" --target "dotnet" --targetargs "test . --no-restore --no-build --configuration Release" --format opencover --output ./test/TestResults/coverage --verbosity detailed
+        .\.coverlet\console\coverlet ./test/WebExtensions.Net.BrowserExtensionIntegrationTest/bin/Release/net7.0/browserextension/framework --include "[WebExtensions.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/WebExtensions.Net-Release.yml b/.github/workflows/WebExtensions.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/[email protected]
       with:

diff --git a/...et.Extensions.DependencyInjection/WebExtensions.Net.Extensions.DependencyInjection.csproj b/...et.Extensions.DependencyInjection/WebExtensions.Net.Extensions.DependencyInjection.csproj
@@ -2,7 +2,7 @@
 
   <!-- Build properties. -->
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsShippingPackage>true</IsShippingPackage>
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsBind.Net.Extensions.DependencyInjection" Version="0.3.2" PrivateAssets="contentfiles" />
+    <PackageReference Include="JsBind.Net.Extensions.DependencyInjection" Version="0.4.0" PrivateAssets="contentfiles" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/WebExtensions.Net.Generator/WebExtensions.Net.Generator.csproj b/src/WebExtensions.Net.Generator/WebExtensions.Net.Generator.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!-- Change the default location where NuGet will put the build output -->
     <OutDir>BuildOutput</OutDir>
@@ -26,10 +26,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0-*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WebExtensions.Net/WebExtensions.Net.csproj b/src/WebExtensions.Net/WebExtensions.Net.csproj
@@ -2,7 +2,7 @@
 
   <!-- Build properties. -->
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsShippingPackage>true</IsShippingPackage>
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsBind.Net" Version="0.3.2" PrivateAssets="contentfiles" />
+    <PackageReference Include="JsBind.Net" Version="0.4.0" PrivateAssets="contentfiles" />
   </ItemGroup>
 
 </Project>
diff --git a/....BrowserExtensionIntegrationTest/WebExtensions.Net.BrowserExtensionIntegrationTest.csproj b/....BrowserExtensionIntegrationTest/WebExtensions.Net.BrowserExtensionIntegrationTest.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <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. -->
     <BlazorCacheBootResources>false</BlazorCacheBootResources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazor.BrowserExtension" Version="0.7.*" />
+    <PackageReference Include="Blazor.BrowserExtension" Version="0.8.*" />
     <PackageReference Include="FluentAssertions" Version="5.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.*" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.*-*" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="7.*-*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/WebExtensions.Net.IntegrationTestsRunner/Runner.cs b/test/WebExtensions.Net.IntegrationTestsRunner/Runner.cs
@@ -26,7 +26,7 @@ public async Task RunTests()
             var configuration = "release";
 #endif
 
-            var extensionPath = $"{solutionDirectory}\\test\\WebExtensions.Net.BrowserExtensionIntegrationTest\\bin\\{configuration}\\net6.0\\browserextension";
+            var extensionPath = $"{solutionDirectory}\\test\\WebExtensions.Net.BrowserExtensionIntegrationTest\\bin\\{configuration}\\net7.0\\browserextension";
 
             if (!Directory.Exists(resultsPath))
             {

diff --git a/.../WebExtensions.Net.IntegrationTestsRunner/WebExtensions.Net.IntegrationTestsRunner.csproj b/.../WebExtensions.Net.IntegrationTestsRunner/WebExtensions.Net.IntegrationTestsRunner.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>