Skip to content

Commit

Permalink
Update to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
Sejsel committed Mar 16, 2024
1 parent 52b168d commit 32c22b2
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 30 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
# This is required to avoid a breaking change in 6.0.2 https://github.com/dotnet/core/pull/7346/
dotnet-version: 6.0.101
dotnet-version: '8.0.x'
# This is a workaround for issue https://github.com/actions/virtual-environments/issues/1090,
# which causes to nuget restores to fail
- name: Clean NuGet cache
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/log-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: '8.0.x'
# This is a workaround for issue https://github.com/actions/virtual-environments/issues/1090,
# which causes to nuget restores to fail
- name: Clean NuGet cache
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/release-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup .NET 6
uses: actions/setup-dotnet@v1
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
# This is required to avoid a breaking change in 6.0.2 https://github.com/dotnet/core/pull/7346/
dotnet-version: 6.0.101
dotnet-version: '8.0.x'
# This is a workaround for issue https://github.com/actions/virtual-environments/issues/1090,
# which causes to nuget restores to fail
- name: Clean NuGet cache
Expand Down
2 changes: 1 addition & 1 deletion ArcdpsLogManager.Gtk/ArcdpsLogManager.Gtk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.ArcdpsLogManager.Gtk</RootNamespace>
<AssemblyName>GW2Scratch.ArcdpsLogManager.Gtk</AssemblyName>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ArcdpsLogManager.Wpf/ArcdpsLogManager.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<RootNamespace>GW2Scratch.ArcdpsLogManager.Wpf</RootNamespace>
<AssemblyName>GW2Scratch.ArcdpsLogManager.Wpf</AssemblyName>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion ArcdpsLogManager/ArcdpsLogManager.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.ArcdpsLogManager</RootNamespace>
<!--
Warning: Do not change the following assembly name without checking .csproj files of all platform launchers,
Expand Down
2 changes: 1 addition & 1 deletion ArcdpsLogManager/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# arcdps Log Manager
A manager for all your recorded logs. Filter logs, upload them with one click, find interesting statistics.

Runs on Windows and Linux, requires .NET 6
Runs on Windows and Linux, requires .NET 8

## Features

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.EVTCAnalytics.Benchmark</RootNamespace>
<AssemblyName>GW2Scratch.EVTCAnalytics.Benchmark</AssemblyName>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion EVTCAnalytics.Sample/EVTCAnalytics.Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EVTCInspector.Gtk/EVTCInspector.Gtk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.EVTCInspector.Gtk</RootNamespace>
<AssemblyName>GW2Scratch.EVTCInspector.Gtk</AssemblyName>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion EVTCInspector.Wpf/EVTCInspector.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<RootNamespace>GW2Scratch.EVTCInspector.Wpf</RootNamespace>
<AssemblyName>GW2Scratch.EVTCInspector.Wpf</AssemblyName>
<UseWPF>true</UseWPF>
Expand Down
2 changes: 1 addition & 1 deletion EVTCInspector/EVTCInspector.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.EVTCInspector</RootNamespace>
<AssemblyName>GW2Scratch.EVTCInspector</AssemblyName>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion LogEditor/LogEditor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<AssemblyName>GW2Scratch.LogEditor</AssemblyName>
<RootNamespace>GW2Scratch.LogEditor</RootNamespace>
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
This repository hosts multiple programs for analysis and management of EVTC logs generated by the [arcdps](https://www.deltaconnected.com/arcdps/) addon for Guild Wars 2. All programs are available for Windows/Linux.

#### Dependencies
- Running programs: .NET 6
- Running programs: .NET 8
- Development: .NET 8 SDK or newer

#### Programs
Expand Down Expand Up @@ -49,7 +49,6 @@ Reporting bugs is the most important way of contributing, it's hard to fix thing
not aware about. Either create an issue on GitHub or let us know in the `#bug-reports`
channel in our [Discord server](https://discord.gg/rNXRS6ZkYe).

Tiny fixes are always welcome, however do please discuss bigger changes first. Currently,
most of the projects are very much in early development and significant changes are planned.
Small changes are always welcome, however do please discuss bigger changes first.

In the future, this repository may get split up into smaller ones for the individual projects.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.EVTCAnalytics.LogTests.EliteInsights</RootNamespace>
<AssemblyName>GW2Scratch.EVTCAnalytics.LogTests.EliteInsights</AssemblyName>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.EVTCAnalytics.LogTests.LocalSets</RootNamespace>
<AssemblyName>GW2Scratch.EVTCAnalytics.LogTests.LocalSets</AssemblyName>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion Tests/EVTCAnalytics.Tests/EVTCAnalytics.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>GW2Scratch.EVTCAnalytics.Tests</RootNamespace>
<AssemblyName>GW2Scratch.EVTCAnalytics.Tests</AssemblyName>
<LangVersion>latest</LangVersion>
Expand Down

0 comments on commit 32c22b2

Please sign in to comment.