Skip to content

Commit 8e5ab34

Browse files
committed
[build] Drop .NET5 support; Update all package deps to 8.x versions; Remove SourceLink dep; Use .net8 for sample and tests.
1 parent 18d569d commit 8e5ab34

File tree

4 files changed

+20
-26
lines changed

4 files changed

+20
-26
lines changed

.github/workflows/dotnet.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
uses: actions/setup-dotnet@v4
2727
with:
2828
dotnet-version: |
29-
5.0
3029
6.0
3130
7.0
3231
8.0

TouchPortalSDK.Sample/TouchPortalSDK.Sample.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
@@ -35,7 +35,7 @@
3535
<Target Name="Copy_entry_File" BeforeTargets="Build">
3636
<Copy SourceFiles="entry.tp" DestinationFiles="$(AppData)\TouchPortal\plugins\TouchPortalSDK.Sample\entry.tp" />
3737
</Target>
38-
38+
3939
<Target Name="Start_TouchPortal_with_Logging" AfterTargets="Build">
4040
<Exec Command="&quot;$(MSBuildProgramFiles32)\Touch Portal\TouchPortal.exe&quot; -logPlugin"/>
4141
</Target>

TouchPortalSDK.Tests/TouchPortalSDK.Tests.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="AutoFixture" Version="4.17.0" />
11-
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
12-
<PackageReference Include="AutoFixture.NUnit3" Version="4.17.0" />
13-
<PackageReference Include="Moq" Version="4.17.1" />
14-
<PackageReference Include="NUnit" Version="3.13.2" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
10+
<PackageReference Include="AutoFixture" Version="4.18.1" />
11+
<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
12+
<PackageReference Include="AutoFixture.NUnit3" Version="4.18.1" />
13+
<PackageReference Include="Moq" Version="4.20.72" />
14+
<PackageReference Include="NUnit" Version="4.2.2" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

TouchPortalSDK/TouchPortalSDK.csproj

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<Version>1.46.1</Version>
66
<FileVersion>1.46.1.0</FileVersion>
77
<Authors>Maxim Paperno, Oddbjørn U. Bakke</Authors>
@@ -65,14 +65,9 @@
6565
</ItemGroup>
6666

6767
<ItemGroup>
68-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
69-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
70-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" Condition="'$(TargetFramework)' == 'net8.0'" />
71-
<PackageReference Include="System.Text.Json" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
72-
73-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0'" />
74-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0'" />
75-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="'$(TargetFramework)' != 'net8.0'" />
76-
<PackageReference Include="System.Text.Json" Version="6.0.2" Condition="'$(TargetFramework)' != 'net8.0'" />
68+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
69+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0" />
70+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
71+
<!--<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />-->
7772
</ItemGroup>
7873
</Project>

0 commit comments

Comments
 (0)