Skip to content

Commit 7243877

Browse files
christophwillechristophwille
authored
Merge pull request #380 from icsharpcode/feature/net7insteadof31
Support .NET 7 (non-LTS) instead of no longer supported .NET Core 3.1
2 parents 78656fc + 5659ec6 commit 7243877

8 files changed

Lines changed: 32 additions & 21 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
assemblyVersion: ${{ env.BuildVersion }}.${{ github.run_number }}
2828
fileVersion: ${{ env.BuildVersion }}.${{ github.run_number }}
2929

30-
- name: Setup .NET 3.1 (for unit tests only)
30+
- name: Setup .NET 7
3131
uses: actions/setup-dotnet@v3
3232
with:
33-
dotnet-version: 3.1.x
33+
dotnet-version: 7.0.x
3434

35-
- name: Setup .NET
35+
- name: Setup LTS .NET
3636
uses: actions/setup-dotnet@v3
3737
with:
3838
dotnet-version: 6.0.x
@@ -53,10 +53,10 @@ jobs:
5353
env:
5454
TestAssembly: ICSharpCode.AvalonEdit.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ICSharpCode.AvalonEdit.Tests.dll
5555

56-
- name: netcoreapp3.1 Unit Tests
56+
- name: net7.0-windows Unit Tests
5757
run: vstest.console $env:TestAssembly
5858
env:
59-
TestAssembly: ICSharpCode.AvalonEdit.Tests\bin\${{ matrix.configuration }}\netcoreapp3.1\ICSharpCode.AvalonEdit.Tests.dll
59+
TestAssembly: ICSharpCode.AvalonEdit.Tests\bin\${{ matrix.configuration }}\net7.0-windows\ICSharpCode.AvalonEdit.Tests.dll
6060

6161
- name: net462 Unit Tests
6262
run: vstest.console $env:TestAssembly

‎ICSharpCode.AvalonEdit.Sample/ICSharpCode.AvalonEdit.Sample.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net472</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net7.0-windows;net472</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<DefineConstants>TRACE</DefineConstants>
@@ -17,7 +17,7 @@
1717
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
1818
<DefineConstants>TRACE</DefineConstants>
1919
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
20+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0-windows' ">
2121
<DefineConstants>TRACE</DefineConstants>
2222
</PropertyGroup>
2323
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">

‎ICSharpCode.AvalonEdit.Sample/app.net35.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net7.0-windows;net462</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<DefineConstants>TRACE</DefineConstants>
@@ -16,7 +16,7 @@
1616
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
1717
<DefineConstants>TRACE</DefineConstants>
1818
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
19+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0-windows' ">
2020
<DefineConstants>TRACE</DefineConstants>
2121
</PropertyGroup>
2222
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">

‎ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<OutputType>Library</OutputType>
4-
<TargetFrameworks>net6.0-windows;netcoreapp3.1;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net7.0-windows;net462</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<DefineConstants>TRACE</DefineConstants>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>ICSharpCode.AvalonEdit.snk</AssemblyOriginatorKeyFile>
1010
<Company>ic#code</Company>
1111
<Copyright>2000-2022 AlphaSierraPapa for the SharpDevelop Team</Copyright>
12-
<Description>AvalonEdit is the WPF-based text editor used in SharpDevelop. There are five builds of AvalonEdit included in this package: .NET Framework 4.5 and 4.0, .NET Core 3.1, .NET 5.0 for Windows, .NET 6.0 for Windows.</Description>
12+
<Description>AvalonEdit is the WPF-based text editor used in SharpDevelop.</Description>
1313
<Version>6.2</Version>
1414
<AssemblyVersion>6.2.0.0</AssemblyVersion>
1515
<FileVersion>6.2.0.0</FileVersion>
@@ -29,18 +29,27 @@
2929
<PackageIcon>images\AvalonEditNuGetPackageIcon.png</PackageIcon>
3030
<PackageTags>WPF Text Editor SharpDevelop AvalonEdit</PackageTags>
3131
<PackageReleaseNotes>Changes are detailed at https://github.com/icsharpcode/AvalonEdit/blob/master/ChangeLog.md</PackageReleaseNotes>
32+
<PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
33+
</PropertyGroup>
34+
35+
<ItemGroup>
36+
<None Include="docs\PackageReadme.md" Pack="true" PackagePath="\" />
37+
</ItemGroup>
38+
39+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
40+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3241
</PropertyGroup>
3342

3443
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
3544
<DefineConstants>TRACE</DefineConstants>
3645
</PropertyGroup>
37-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
46+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0-windows' ">
3847
<DefineConstants>TRACE</DefineConstants>
3948
</PropertyGroup>
4049
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
4150
<DefineConstants>TRACE</DefineConstants>
4251
</PropertyGroup>
43-
52+
4453
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
4554
<Reference Include="System.Windows.Forms" />
4655
</ItemGroup>

‎ICSharpCode.AvalonEdit/docs/PackageReadme.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## About
2+
3+
Check out the [official documentation](http://avalonedit.net/documentation/) and the
4+
[samples and articles wiki page](https://github.com/icsharpcode/AvalonEdit/wiki/Samples-and-Articles)
5+
6+
Make sure to try the AvalonEdit sample application in the repository - its project has additional documentation included.
7+
8+
OSS projects using AvalonEdit are listed on the repository main page.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ can be found on the [AvalonEdit homepage](http://avalonedit.net/)
1212
How to build
1313
-------
1414

15-
AvalonEdit is targeting net6.0-windows, net5.0-windows, netcoreapp3.1, net40 and net45 TFMs. Because of net6.0-windows you must have the .NET 6.0 SDK installed
15+
AvalonEdit is targeting net6.0-windows and net462 TFMs. Because of net6.0-windows you must have the .NET 6.0 SDK installed
1616
on your machine. Visual Studio 2022 Community and up is required for working with the solution (global.json will select the proper SDK to use for building for you).
1717

1818

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.200",
3+
"version": "7.0.100",
44
"rollForward": "major",
55
"allowPrerelease": true
66
}

0 commit comments

Comments
 (0)