Migrate to dotnet 9.0

.github/workflows/cd.yml

@@ -21,11 +21,11 @@ jobs:
     name: "Deploy binaries"
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.x
+          dotnet-version: 9.x
       - name: Install dependencies
         run: dotnet restore "${{ github.workspace }}/BanchoSharp/BanchoSharp.csproj"
       - name: Build
@@ -47,7 +47,7 @@ jobs:
 
       - name: Publish to NuGet on version change
         id: publish_nuget
-        uses: brandedoutcast/publish-nuget@v2.5.2
+        uses: brandedoutcast/publish-nuget@v2.5.5
         with:
           NUGET_KEY: "${{ secrets.NUGET_API_KEY }}"
           PROJECT_FILE_PATH: "BanchoSharp/BanchoSharp.csproj"

.github/workflows/tests.yml

@@ -6,11 +6,11 @@ jobs:
   test-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 9.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

BanchoSharp/BanchoSharp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -12,7 +12,7 @@
         <PackageProjectUrl>https://github.com/hburn7/BanchoSharp</PackageProjectUrl>
         <RepositoryUrl>https://github.com/hburn7/BanchoSharp</RepositoryUrl>
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-        <PackageVersion>1.4.4</PackageVersion>
+        <PackageVersion>1.5.0</PackageVersion>
     </PropertyGroup>
 
     <ItemGroup>

BanchoSharp/Messaging/SlashCommandHandler.cs

@@ -49,7 +49,7 @@ private bool IsSlashCommand() => !string.IsNullOrWhiteSpace(_prompt) &&
                                      _prompt.StartsWith("/") &&
                                      _prompt.Length > 1;
 
-    private string[]? GetParamsForCommand() => Command.ToLower() switch
+    private string[]? GetParamsForCommand() => Command?.ToLower() switch
     {
         "join" => GetFirstArgOrDefault(),
         "part" => GetFirstArgOrDefault(),

BanchoSharp/Multiplayer/MultiplayerLobby.cs

@@ -165,7 +165,9 @@ public MultiplayerLobby(IBanchoClient client, long id, string name) : base($"#mp
 	public event Action<int>? OnLobbyTimerStarted;
 	public event Action? OnLobbyTimerFinished;
 	public event Action<int>? OnMatchStartTimerStarted;
+#pragma warning disable CS0067
 	public event Action? OnMatchStartTimerFinished;
+#pragma warning restore CS0067
 	public event Action? OnMatchAborted;
 	public event Action? OnMatchStarted;
 	public event Action? OnMatchFinished;
@@ -942,7 +944,7 @@ private void UpdatePlayerJoinedInSlot(string banchoResponse)
 	private void UpdateBeatmapFromMpSettings(string banchoResponse)
 	{
 		int id = -1;
-		string difficulty, artist, title;
+		string? difficulty, artist, title;
 		difficulty = artist = title = null;
 
 		string[] splits = banchoResponse.Split(" - ");

BanchoSharpExample/BanchoSharpExample.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>

BanchoSharpExample/Program.cs

@@ -1,9 +1,17 @@
 using BanchoSharp;
 
-var client = new BanchoClient(new BanchoClientConfig(new IrcCredentials(Environment.GetEnvironmentVariable("IRC_USERNAME"),
-	Environment.GetEnvironmentVariable("IRC_PASS")), LogLevel.Trace));
+var username = Environment.GetEnvironmentVariable("IRC_USERNAME");
+var password = Environment.GetEnvironmentVariable("IRC_PASS");
 
-client.OnAuthenticated += async () =>
+if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
+{
+	Console.WriteLine("Please set IRC_USERNAME and IRC_PASS environment variables.");
+	return;
+}
+
+var client = new BanchoClient(new BanchoClientConfig(new IrcCredentials(username, password), LogLevel.Trace));
+
+client.OnAuthenticated += () =>
 {
 	client.BanchoBotEvents.OnTournamentLobbyCreated += lobby => Console.WriteLine($"Tournament lobby created: {lobby.Id}");
 };

BanchoSharpTests/BanchoSharpTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -11,11 +11,11 @@
 
     <ItemGroup>
         <PackageReference Include="Humanizer" Version="2.14.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="NUnit" Version="3.13.3" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
-        <PackageReference Include="coverlet.collector" Version="3.1.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="NUnit" Version="4.3.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+        <PackageReference Include="NUnit.Analyzers" Version="4.9.2" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4" />
     </ItemGroup>
 
     <ItemGroup>

BanchoSharpTests/ClientConfigTests.cs

@@ -12,6 +12,12 @@ public void Setup()
 		_client = new BanchoClient();
 	}
 
+	[TearDown]
+	public void TearDown()
+	{
+		_client?.Dispose();
+	}
+
 	[Test]
 	public async Task TestSaveMessagesConfig()
 	{

BanchoSharpTests/ClientTests.cs

@@ -12,6 +12,9 @@ public class ClientTests
 	[SetUp]
 	public void Setup() => _client = new BanchoClient();
 
+	[TearDown]
+	public void TearDown() => _client?.Dispose();
+
 	[Test]
 	public async Task TestJoinChannelAsync()
 	{

BanchoSharpTests/ExceptionTests.cs

@@ -3,10 +3,10 @@ namespace BanchoSharpTests;
 public class ExceptionTests
 {
 	[SetUp]
-	public async Task Setup() {}
+	public void Setup() {}
 
 	[Test]
-	public async Task TestNotConnectedException()
+	public void TestNotConnectedException()
 	{
 		BanchoClient client = new();
 		Assert.Multiple(() =>

BanchoSharpTests/MultiplayerTests.cs

@@ -46,6 +46,12 @@ public void Setup()
 		_lobby = DefaultLobby(_client);
 	}
 
+	[TearDown]
+	public void TearDown()
+	{
+		_client?.Dispose();
+	}
+
 	[TestCase("OWC 2021: (United States) vs. (Germany)", "https://osu.ppy.sh/mp/106275696", 106275696,
 		Mods.HalfTime | Mods.Freemod, 1096903, "Unmei no Dark Side -Rolling Gothic mix", "Kanpyohgo", "Satellite's Lunatic",
 		LobbyFormat.TagCoop, WinCondition.Score, TeamColor.None, true, PlayerState.NotReady,
@@ -79,13 +85,13 @@ public void TestMpSettingsUpdates(string lobbyName, string historyUrl, int match
 			Assert.That(_lobby.HistoryUrl, Is.EqualTo(historyUrl));
 			Assert.That(_lobby.Id, Is.EqualTo(matchId));
 			Assert.That(_lobby.Mods, Is.EqualTo(lobbyMods));
-			Assert.That(_lobby.CurrentBeatmap.Id, Is.EqualTo(beatmapId));
-			Assert.That(_lobby.CurrentBeatmap.Title, Is.EqualTo(beatmapTitle));
-			Assert.That(_lobby.CurrentBeatmap.Artist, Is.EqualTo(beatmapArtist));
-			Assert.That(_lobby.CurrentBeatmap.Difficulty, Is.EqualTo(beatmapDifficulty));
+			Assert.That(_lobby.CurrentBeatmap?.Id, Is.EqualTo(beatmapId));
+			Assert.That(_lobby.CurrentBeatmap?.Title, Is.EqualTo(beatmapTitle));
+			Assert.That(_lobby.CurrentBeatmap?.Artist, Is.EqualTo(beatmapArtist));
+			Assert.That(_lobby.CurrentBeatmap?.Difficulty, Is.EqualTo(beatmapDifficulty));
 			Assert.That(_lobby.Format, Is.EqualTo(format));
 			Assert.That(_lobby.WinCondition, Is.EqualTo(winCondition));
-			Assert.That(_lobby.Host.Equals(_lobby.Players[0]), Is.EqualTo(p1IsHost));
+			Assert.That(_lobby.Host?.Equals(_lobby.Players[0]), Is.EqualTo(p1IsHost));
 			Assert.That(_lobby.Players[0].Team, Is.EqualTo(p1TeamColor));
 			Assert.That(_lobby.Players[0].State, Is.EqualTo(p1State));
 			Assert.That(_lobby.Players[0].Id, Is.EqualTo(p1Id));