Drop support for .NET 6/7 (#14695)

OrchardCMS · Nov 17, 2023 · 2329f54 · 2329f54
1 parent 0493ab0
commit 2329f54
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml
@@ -1,6 +1,6 @@
 name: Functional Tests - all Databases
 on:
-# manual trigger
+  # manual trigger
   workflow_dispatch:
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

diff --git a/.github/workflows/mac_unit_test_ci.yml b/.github/workflows/mac_unit_test_ci.yml
@@ -14,6 +14,4 @@ jobs:
     - name: Build and test
       run: |
         dotnet build -c Release -f net8.0
-        dotnet build -c Release -f net7.0
-        dotnet build -c Release -f net6.0
         dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -27,8 +27,6 @@ jobs:
     - name: Build
       run: |
         dotnet build -c Release -f net8.0
-        dotnet build -c Release -f net7.0
-        dotnet build -c Release -f net6.0
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj

diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -31,8 +31,6 @@ jobs:
     - name: Build
       run: |
         dotnet build -c Release -f net8.0
-        dotnet build -c Release -f net7.0
-        dotnet build -c Release -f net6.0
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 

diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -42,8 +42,6 @@ jobs:
     - name: Build
       run: |
         dotnet build -c Release -f net8.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
-        dotnet build -c Release -f net7.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
-        dotnet build -c Release -f net6.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 

diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props
@@ -9,7 +9,7 @@
 
     <!-- TFMs used to build the abstractions and modules, by convention the default TFM is at the first position -->
     <!-- In a cross-targeting build, some assets are only copied on the first TFM, by convention the default TFM -->
-    <CommonTargetFrameworks Condition="'$(CommonTargetFrameworks)' == ''">net8.0;net7.0;net6.0</CommonTargetFrameworks>
+    <CommonTargetFrameworks Condition="'$(CommonTargetFrameworks)' == ''">net8.0</CommonTargetFrameworks>
   </PropertyGroup>
 
   <!-- Detect if the solution is opened in VS to limit the TFMs that are analyzed by Roslyn for performance reasons -->
@@ -24,15 +24,12 @@
     <MicrosoftExtensionsPackagesVersion>8.0.0</MicrosoftExtensionsPackagesVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
+  <!-- When dual-targeting frameworks, add both of them to CommonTargetFrameworks above, when add PropertyGroups like
+  below. -->
+  <!--<PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
     <AspNetCorePackagesVersion>7.0.14</AspNetCorePackagesVersion>
     <MicrosoftExtensionsPackagesVersion>7.0.14</MicrosoftExtensionsPackagesVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
-    <AspNetCorePackagesVersion>6.0.25</AspNetCorePackagesVersion>
-    <MicrosoftExtensionsPackagesVersion>6.0.25</MicrosoftExtensionsPackagesVersion>
-  </PropertyGroup>
+  </PropertyGroup>-->
 
   <!-- 'Microsoft.AspNetCore' packages that are not included in the ASP.NET Core shared framework -->
   <ItemGroup>

diff --git a/src/docs/guides/decoupled-cms/README.md b/src/docs/guides/decoupled-cms/README.md
@@ -59,7 +59,7 @@ The newly created website should be able to run, and look like this:
 
 ```xml
 <PropertyGroup>
-  <TargetFramework>net6.0</TargetFramework>
+  <TargetFramework>net8.0</TargetFramework>
 </PropertyGroup>
 ```
 

diff --git a/src/docs/releases/1.8.0.md b/src/docs/releases/1.8.0.md
@@ -4,6 +4,10 @@ Release date: Not yet released
 
 ## Breaking Changes
 
+### .NET support
+
+This release removes support for `net6.0` and `net7.0`. Only `net8.0` is supported.
+
 ### TheAdmin Theme
 
 The `TheAdmin` theme was upgraded to Bootstrap 5.3.2. Here is a list of the breaking changes