Skip to content

Commit

Permalink
Update to NET 9
Browse files Browse the repository at this point in the history
  • Loading branch information
Manu098vm committed Nov 19, 2024
1 parent 5ab4a26 commit 019ba98
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v2
Expand All @@ -54,9 +54,9 @@ jobs:
run: |
$NuGetPackageFolder = Join-Path -Path $env:USERPROFILE -ChildPath ".nuget\packages\pkhex.core"
$LatestVersion = (Get-ChildItem $NuGetPackageFolder | Sort-Object -Property LastWriteTime -Descending)[0].Name
$PkhexCoreDllSource = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "PKHeX/PKHeX.Core/bin/Release/net8.0/PKHeX.Core.dll"
$PkhexCoreDllDest = Join-Path -Path $NuGetPackageFolder -ChildPath "$LatestVersion/lib/net8.0/PKHeX.Core.dll"
Copy-Item -Path $PkhexCoreDllSource -Destination $PkhexCoreDllDest
$PkhexCoreDllSource = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "PKHeX/PKHeX.Core/bin/Release/net9.0-windows/PKHeX.Core.dll"
$PkhexCoreDllDest = Join-Path -Path $NuGetPackageFolder -ChildPath "$LatestVersion/lib/net9.0/PKHeX.Core.dll"
Copy-Item -Path $PkhexCoreDllSource -Destination $PkhexCoreDllDest
- name: Execute unit tests
run: dotnet test
Expand All @@ -75,4 +75,4 @@ jobs:
name: HomeLive.Plugins
path: |
HomeLive.Plugins/bin
!HomeLive.Plugins/bin/Release/net8.0-windows7.0/PKHeX.Core.dll
!HomeLive.Plugins/bin/Release/net9.0-windows7.0/PKHeX.Core.dll
4 changes: 2 additions & 2 deletions HomeLive.Core/HomeLive.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ApplicationIcon>Resources\icon.ico</ApplicationIcon>
Expand Down Expand Up @@ -44,7 +44,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="PKHeX.Core" Version="24.11.11" />
<PackageReference Include="PKHeX.Core" Version="24.11.12" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions HomeLive.DeviceExecutor/DeviceExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public override string GetSummary()

public override void SoftStop() => Config.Pause();
public override Task HardStop() => Task.CompletedTask;
public override Task RebootAndStop(CancellationToken token) => Task.CompletedTask;

public override async Task MainLoop(CancellationToken token)
{
Expand Down
4 changes: 2 additions & 2 deletions HomeLive.DeviceExecutor/HomeLive.DeviceExecutor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Title>Home Live Device Executor</Title>
Expand All @@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLog" Version="5.1.4" />
<PackageReference Include="NLog" Version="5.3.4" />
</ItemGroup>

<ItemGroup>
Expand Down
Binary file modified HomeLive.DeviceExecutor/deps/SysBot.Base.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion HomeLive.Plugins/HomeLive.Plugins.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net9.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down

0 comments on commit 019ba98

Please sign in to comment.