Skip to content

Commit 7c18f51

Browse files
christophwillechristophwille
committed
Add net10.0 instead of net6.0
1 parent 862415d commit 7c18f51

File tree

5 files changed

+29
-28
lines changed

5 files changed

+29
-28
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ jobs:
1616
env:
1717
Solution: '**/ICSharpCode.AvalonEdit.sln'
1818
BuildPlatform: 'Any CPU'
19-
BuildVersion: '6.3.1'
19+
BuildVersion: '6.3.2'
20+
2021
steps:
21-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2223
- name: Update project version
2324
uses: roryprimrose/set-vs-sdk-project-version@v1
2425
with:
@@ -27,15 +28,15 @@ jobs:
2728
assemblyVersion: ${{ env.BuildVersion }}.${{ github.run_number }}
2829
fileVersion: ${{ env.BuildVersion }}.${{ github.run_number }}
2930

30-
- name: Setup .NET 8.0
31-
uses: actions/setup-dotnet@v4
31+
- name: Setup .NET LTS Current
32+
uses: actions/setup-dotnet@v5
3233
with:
33-
dotnet-version: 8.0.x
34+
dotnet-version: '10.0.x'
3435

35-
- name: Setup LTS .NET
36-
uses: actions/setup-dotnet@v4
36+
- name: Setup .NET LTS Previous
37+
uses: actions/setup-dotnet@v5
3738
with:
38-
dotnet-version: 6.0.x
39+
dotnet-version: '8.0.x'
3940

4041
- name: Add msbuild to PATH
4142
uses: microsoft/setup-msbuild@v2
@@ -48,12 +49,12 @@ jobs:
4849
- name: Setup VSTest
4950
uses: Malcolmnixon/Setup-VSTest@v4
5051

51-
- name: net6.0-windows Unit Tests
52+
- name: LTS Current Unit Tests
5253
run: vstest.console $env:TestAssembly
5354
env:
54-
TestAssembly: ICSharpCode.AvalonEdit.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ICSharpCode.AvalonEdit.Tests.dll
55+
TestAssembly: ICSharpCode.AvalonEdit.Tests\bin\${{ matrix.configuration }}\net10.0-windows\ICSharpCode.AvalonEdit.Tests.dll
5556

56-
- name: net8.0-windows Unit Tests
57+
- name: LTS Previous Unit Tests
5758
run: vstest.console $env:TestAssembly
5859
env:
5960
TestAssembly: ICSharpCode.AvalonEdit.Tests\bin\${{ matrix.configuration }}\net8.0-windows\ICSharpCode.AvalonEdit.Tests.dll
@@ -71,15 +72,15 @@ jobs:
7172

7273
- name: Upload NuGet
7374
if: matrix.configuration == 'release'
74-
uses: actions/upload-artifact@v4
75+
uses: actions/upload-artifact@v5
7576
with:
7677
name: AvalonEdit NuGet Package (${{ matrix.configuration }})
7778
path: ICSharpCode.AvalonEdit/bin/Release/AvalonEdit*.nupkg
7879
if-no-files-found: error
7980

8081
- name: Upload Snupkg Artifact
8182
if: matrix.configuration == 'release'
82-
uses: actions/upload-artifact@v4
83+
uses: actions/upload-artifact@v5
8384
with:
8485
name: AvalonEdit Snupkg (${{ matrix.configuration }})
8586
path: ICSharpCode.AvalonEdit/bin/Release/AvalonEdit*.snupkg

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFrameworks>net6.0-windows;net8.0-windows;net472</TargetFrameworks>
4+
<TargetFrameworks>net10.0-windows;net8.0-windows;net472</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<DefineConstants>TRACE</DefineConstants>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.snk</AssemblyOriginatorKeyFile>
1010
<RootNamespace>AvalonEdit.Sample</RootNamespace>
1111
<Company>ic#code</Company>
12-
<Copyright>2000-2022 AlphaSierraPapa for the SharpDevelop Team</Copyright>
12+
<Copyright>2000-2025 AlphaSierraPapa for the SharpDevelop Team</Copyright>
1313
<Description>Sample for WPF-based extensible text editor</Description>
1414
<IsPackable>false</IsPackable>
1515
</PropertyGroup>
1616

17-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
17+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0-windows' ">
1818
<DefineConstants>TRACE</DefineConstants>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' ">

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

Lines changed: 6 additions & 6 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;net8.0-windows;net462</TargetFrameworks>
4+
<TargetFrameworks>net8.0-windows;net10.0-windows;net462</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<DefineConstants>TRACE</DefineConstants>
@@ -13,7 +13,7 @@
1313
<IsPackable>false</IsPackable>
1414
</PropertyGroup>
1515

16-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
16+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0-windows' ">
1717
<DefineConstants>TRACE</DefineConstants>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' ">
@@ -24,10 +24,10 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
28-
<PackageReference Include="NUnit" Version="4.3.2" />
29-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
27+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
28+
<PackageReference Include="NUnit" Version="4.4.0" />
29+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3131
</ItemGroup>
3232
<ItemGroup>
3333
<ProjectReference Include="..\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj" />

‎ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj‎

Lines changed: 5 additions & 5 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;net8.0-windows;net462</TargetFrameworks>
4+
<TargetFrameworks>net8.0-windows;net10.0-windows;net462</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<DefineConstants>TRACE</DefineConstants>
@@ -10,9 +10,9 @@
1010
<Company>ic#code</Company>
1111
<Copyright>2000-2025 AlphaSierraPapa for the SharpDevelop Team</Copyright>
1212
<Description>AvalonEdit is the WPF-based text editor used in SharpDevelop.</Description>
13-
<Version>6.3.1</Version>
14-
<AssemblyVersion>6.3.1.0</AssemblyVersion>
15-
<FileVersion>6.3.1.0</FileVersion>
13+
<Version>6.3.2</Version>
14+
<AssemblyVersion>6.3.2.0</AssemblyVersion>
15+
<FileVersion>6.3.2.0</FileVersion>
1616
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1717
</PropertyGroup>
1818

@@ -40,7 +40,7 @@
4040
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4141
</PropertyGroup>
4242

43-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
43+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net10.0-windows' ">
4444
<DefineConstants>TRACE</DefineConstants>
4545
</PropertyGroup>
4646
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' ">

‎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": "8.0.100",
3+
"version": "10.0.100",
44
"rollForward": "major",
55
"allowPrerelease": true
66
}

0 commit comments

Comments
 (0)