Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop support for .NET 6/7 (Lombiq Technologies: OCORE-128) #14695

Merged
merged 12 commits into from
Nov 17, 2023
Merged

Drop support for .NET 6/7 (Lombiq Technologies: OCORE-128) #14695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e522e06
Moving CI workflows to the released .NET 8 version
Piedone Nov 14, 2023
fc0c94a
Removing .NET 6/7 support
Piedone Nov 14, 2023
a684923
Adding .NET support changes to release notes
Piedone Nov 14, 2023
00fbcdf
Temporarily enabling functional tests on push
Piedone Nov 14, 2023
239ac9a
YML formatting fix
Piedone Nov 14, 2023
8d139f1
Let's run functional tests during PRs too for now
Piedone Nov 14, 2023
7b856a3
Removing .NET 6/7 CI builds
Piedone Nov 14, 2023
34fb105
Floating .NET 8.0.x version for CI builds
Piedone Nov 14, 2023
2a360e3
Removing temporary functional tests workflow trigger
Piedone Nov 14, 2023
819ed65
Merge remote-tracking branch 'official/main' into issue/OCORE-128
Piedone Nov 16, 2023
532543c
Merge remote-tracking branch 'official/main' into issue/OCORE-128
Piedone Nov 17, 2023
ada5b1d
Re-adding PropertyGroup for targeting a second framework version as a…
Piedone Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/functional_all_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Functional Tests - all Databases
on:
# manual trigger
# manual trigger
workflow_dispatch:
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/mac_unit_test_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions .github/workflows/pr_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ jobs:
- name: Build
run: |
dotnet build -c Release -f net8.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if not setting -f would have just built all tfms.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but when multiple tfms are built concurrently there are some issues when it outputs files.

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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/preview_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions src/OrchardCore.Build/Dependencies.AspNetCore.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -24,15 +24,12 @@
<MicrosoftExtensionsPackagesVersion>8.0.0</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WE need to keep it commented as an example, otherwise we'll forget how to do that when net9.0 ships. We had this problem last time and the templates got broken.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-added it with a comment.

<!-- 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>
Expand Down
2 changes: 1 addition & 1 deletion src/docs/guides/decoupled-cms/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
```

Expand Down
4 changes: 4 additions & 0 deletions src/docs/releases/1.8.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down