Merge pull request #1740 from riganti/upgrade/net8

Samples and unit tests updated to .NET 8.0
riganti · Dec 1, 2023 · 7312ba8 · 7312ba8
2 parents 4a3b53e + 40c3633
commit 7312ba8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/setup/action.yml b/.github/setup/action.yml
@@ -35,7 +35,7 @@ runs:
   - uses: actions/setup-dotnet@v3
     with:
       dotnet-version: |
-        7.0.x
+        8.0.x
         6.0.x
         3.1.x
   - if: ${{ runner.os == 'Windows' }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -99,14 +99,14 @@ jobs:
       uses: ./.github/setup
       with:
         sln: src/DotVVM.Crossplatform.slnf
-    - name: Tests (net6.0)
+    - name: Tests (net8.0)
       uses: ./.github/unittest
       with:
         project: src/Tests
         name: framework-tests
         title: Framework Tests
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        target-framework: net6.0
+        target-framework: net8.0
     # - name: Tests (net7.0)
     #   uses: ./.github/unittest
     #   with:

diff --git a/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj b/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj b/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Tests/DotVVM.Framework.Tests.csproj b/src/Tests/DotVVM.Framework.Tests.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net6.0;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -30,7 +30,7 @@
     <ProjectReference Include="../Framework/Testing/DotVVM.Framework.Testing.csproj" />
     <ProjectReference Include="../AutoUI/Core/DotVVM.AutoUI.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <DefineConstants>$(DefineConstants);DotNetCore</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
@@ -40,7 +40,7 @@
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
     <Compile Remove="AspCore/CachingTests.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <ProjectReference Include="../Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj" />
     <PackageReference Include="CheckTestOutput" Version="0.6.3" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ runs: @@
       - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-.0.x
+.0.x
 .0.x
 .1.x
       - if: ${{ runner.os == 'Windows' }}
@@ Expand Down @@