Merge pull request #4 from davidtimovski/dev

Upgrade to .NET 8

src/TeamSketch.Benchmarks/Benchmarks/PayloadConverterBenchmarks.cs

@@ -5,7 +5,7 @@
 
 namespace TeamSketch.Benchmarks
 {
-    [SimpleJob(launchCount: 5, warmupCount: 5, targetCount: 5)]
+    [SimpleJob(launchCount: 5, warmupCount: 5)]
     [MemoryDiagnoser]
     public class PayloadConverterPointBenchmarks
     {
@@ -23,7 +23,7 @@ public PayloadConverterPointBenchmarks()
         public void PointToBytes() => PayloadConverter.ToBytes(x1, y1, ThicknessEnum.SemiThin, ColorsEnum.Blue);
     }
 
-    [SimpleJob(launchCount: 5, warmupCount: 5, targetCount: 5)]
+    [SimpleJob(launchCount: 5, warmupCount: 5)]
     [MemoryDiagnoser]
     public class PayloadConverterLineBenchmarks
     {

src/TeamSketch.Benchmarks/Benchmarks/RendererBenchmarks.cs

@@ -6,7 +6,7 @@
 
 namespace TeamSketch.Benchmarks
 {
-    [SimpleJob(launchCount: 5, warmupCount: 5, targetCount: 5)]
+    [SimpleJob(launchCount: 5, warmupCount: 5)]
     [MemoryDiagnoser]
     public class RendererBenchmarks
     {

src/TeamSketch.Benchmarks/TeamSketch.Benchmarks.csproj

@@ -1,18 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.1.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\TeamSketch\TeamSketch.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\TeamSketch\TeamSketch.csproj" />
+	</ItemGroup>
 
 </Project>

src/TeamSketch.Common/TeamSketch.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/TeamSketch.Web/Config/DatabaseSettings.cs

@@ -2,5 +2,5 @@
 
 public class DatabaseSettings
 {
-    public string? ConnectionString { get; set; }
+    public required string ConnectionString { get; init; }
 }

src/TeamSketch.Web/Controllers/LiveViewController.cs

@@ -1,24 +1,23 @@
 using Microsoft.AspNetCore.Mvc;
 using TeamSketch.Web.Services;
 
-namespace TeamSketch.Web.Controllers
+namespace TeamSketch.Web.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class LiveViewController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    public class LiveViewController : ControllerBase
-    {
-        private readonly ILiveViewService _liveLiveService;
+    private readonly ILiveViewService _liveLiveService;
 
-        public LiveViewController(ILiveViewService liveViewService)
-        {
-            _liveLiveService = liveViewService;
-        }
+    public LiveViewController(ILiveViewService liveViewService)
+    {
+        _liveLiveService = liveViewService;
+    }
 
-        [HttpGet]
-        public IActionResult Get()
-        {
-            var locations = _liveLiveService.GetDistinctLocations();
-            return Ok(locations);
-        }
+    [HttpGet]
+    public IActionResult Get()
+    {
+        var locations = _liveLiveService.GetDistinctLocations();
+        return Ok(locations);
     }
 }

src/TeamSketch.Web/Controllers/RoomsController.cs

@@ -2,57 +2,56 @@
 using TeamSketch.Common.ApiModels;
 using TeamSketch.Web.Persistence;
 
-namespace TeamSketch.Web.Controllers
+namespace TeamSketch.Web.Controllers;
+
+[Route("api/[controller]")]
+[ApiController]
+public class RoomsController : ControllerBase
 {
-    [Route("api/[controller]")]
-    [ApiController]
-    public class RoomsController : ControllerBase
+    private readonly IRepository _repository;
+
+    public RoomsController(IRepository repository)
     {
-        private readonly IRepository _repository;
+        _repository = repository;
+    }
 
-        public RoomsController(IRepository repository)
+    [HttpGet("{room}/validate-join/{nickname}")]
+    public async Task<IActionResult> ValidateJoin(string room, string nickname)
+    {
+        if (string.IsNullOrEmpty(room) || string.IsNullOrEmpty(nickname))
         {
-            _repository = repository;
+            return BadRequest();
         }
 
-        [HttpGet("{room}/validate-join/{nickname}")]
-        public async Task<IActionResult> ValidateJoin(string room, string nickname)
+        var exists = await _repository.RoomExistsAsync(room);
+        if (!exists)
         {
-            if (string.IsNullOrEmpty(room) || string.IsNullOrEmpty(nickname))
-            {
-                return BadRequest();
-            }
-
-            var exists = await _repository.RoomExistsAsync(room);
-            if (!exists)
-            {
-                return Ok(new JoinRoomValidationResult { RoomExists = false });
-            }
-
-            var participantsInRoom = await _repository.GetActiveParticipantsInRoomAsync(room);
-            if (participantsInRoom.Count > 4)
-            {
-                return Ok(new JoinRoomValidationResult { RoomExists = true, RoomIsFull = true });
-            }
-
-            if (participantsInRoom.Contains(nickname))
-            {
-                return Ok(new JoinRoomValidationResult { RoomExists = true, RoomIsFull = false, NicknameIsTaken = true });
-            }
-
-            return Ok(new JoinRoomValidationResult { RoomExists = true });
+            return Ok(new JoinRoomValidationResult { RoomExists = false });
         }
 
-        [HttpGet("{room}/participants")]
-        public async Task<IActionResult> GetParticipantsInRoom(string room)
+        var participantsInRoom = await _repository.GetActiveParticipantsInRoomAsync(room);
+        if (participantsInRoom.Count > 4)
         {
-            if (string.IsNullOrEmpty(room))
-            {
-                return BadRequest();
-            }
+            return Ok(new JoinRoomValidationResult { RoomExists = true, RoomIsFull = true });
+        }
 
-            var participantsInRoom = await _repository.GetActiveParticipantsInRoomAsync(room);
-            return Ok(participantsInRoom);
+        if (participantsInRoom.Contains(nickname))
+        {
+            return Ok(new JoinRoomValidationResult { RoomExists = true, RoomIsFull = false, NicknameIsTaken = true });
         }
+
+        return Ok(new JoinRoomValidationResult { RoomExists = true });
+    }
+
+    [HttpGet("{room}/participants")]
+    public async Task<IActionResult> GetParticipantsInRoom(string room)
+    {
+        if (string.IsNullOrEmpty(room))
+        {
+            return BadRequest();
+        }
+
+        var participantsInRoom = await _repository.GetActiveParticipantsInRoomAsync(room);
+        return Ok(participantsInRoom);
     }
 }

src/TeamSketch.Web/Pages/Index.cshtml.cs

@@ -1,15 +1,9 @@
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace TeamSketch.Web.Pages
 {
-    public class IndexModel : PageModel
+    public class IndexModel(IConfiguration configuration) : PageModel
     {
-        public IndexModel(IConfiguration configuration)
-        {
-            BaseUrl = configuration["BaseUrl"];
-        }
-
-        public string BaseUrl { get; private set; }
+        public string BaseUrl { get; private set; } = configuration["BaseUrl"]!;
     }
 }

src/TeamSketch.Web/Persistence/Models/ConnectionRoom.cs

@@ -1,10 +1,9 @@
-namespace TeamSketch.Web.Persistence
+namespace TeamSketch.Web.Persistence;
+
+public class ConnectionRoom
 {
-    public class ConnectionRoom
-    {
-        public int ConnectionId { get; set; }
-        public string Nickname { get; set; }
-        public int RoomId { get; set; }
-        public string Room { get; set; }
-    }
+    public required int ConnectionId { get; init; }
+    public required string Nickname { get; init; }
+    public required int RoomId { get; init; }
+    public required string Room { get; init; }
 }

src/TeamSketch.Web/Persistence/Models/EventType.cs

@@ -1,8 +1,7 @@
-namespace TeamSketch.Web.Persistence
+namespace TeamSketch.Web.Persistence;
+
+public enum EventType
 {
-    public enum EventType
-    {
-        Joined,
-        Disconnected
-    }
+    Joined,
+    Disconnected
 }

src/TeamSketch.Web/Persistence/Repository.cs

@@ -16,14 +16,9 @@ public interface IRepository
     Task DisconnectAllAsync();
 }
 
-public class Repository : IRepository
+public class Repository(IOptions<DatabaseSettings> databaseSettings) : IRepository
 {
-    private readonly string? _connectionString;
-
-    public Repository(IOptions<DatabaseSettings> databaseSettings)
-    {
-        _connectionString = databaseSettings.Value.ConnectionString;
-    }
+    private readonly string _connectionString = databaseSettings.Value.ConnectionString;
 
     public async Task<bool> RoomExistsAsync(string room)
     {
@@ -126,7 +121,7 @@ public async Task DisconnectAllAsync()
         await conn.ExecuteScalarAsync<int>(@"UPDATE connections SET is_connected = FALSE, modified = @modified", new { modified = DateTime.UtcNow });
     }
 
-    private IDbConnection OpenConnection()
+    private NpgsqlConnection OpenConnection()
     {
         var conn = new NpgsqlConnection(_connectionString);
         conn.Open();

src/TeamSketch.Web/Program.cs

@@ -38,7 +38,7 @@
 
 app.Lifetime.ApplicationStarted.Register(async () =>
 {
-    var repository = app.Services.GetService<IRepository>();
+    var repository = app.Services.GetRequiredService<IRepository>();
     await repository.DisconnectAllAsync();
 });
 

src/TeamSketch.Web/TeamSketch.Web.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.0" />
-    <PackageReference Include="Npgsql" Version="7.0.0" />
+    <PackageReference Include="Dapper" Version="2.1.28" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/TeamSketch.Web/Utils/RoomNameGenerator.cs

@@ -1,31 +1,30 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace TeamSketch.Web.Utils
+namespace TeamSketch.Web.Utils;
+
+public static class RoomNameGenerator
 {
-    public static class RoomNameGenerator
-    {
-        private static readonly char[] chars = "abcdefghkmnprstuvwxyz123456789".ToCharArray();
-        private const int Length = 7;
+    private static readonly char[] chars = "abcdefghkmnprstuvwxyz123456789".ToCharArray();
+    private const int Length = 7;
 
-        public static string Generate()
+    public static string Generate()
+    {
+        var data = new byte[4 * Length];
+        using (var crypto = RandomNumberGenerator.Create())
         {
-            var data = new byte[4 * Length];
-            using (var crypto = RandomNumberGenerator.Create())
-            {
-                crypto.GetBytes(data);
-            }
-
-            var result = new StringBuilder(Length);
-            for (int i = 0; i < Length; i++)
-            {
-                var random = BitConverter.ToUInt32(data, i * 4);
-                var index = random % chars.Length;
+            crypto.GetBytes(data);
+        }
 
-                result.Append(chars[index]);
-            }
+        var result = new StringBuilder(Length);
+        for (int i = 0; i < Length; i++)
+        {
+            var random = BitConverter.ToUInt32(data, i * 4);
+            var index = random % chars.Length;
 
-            return result.ToString();
+            result.Append(chars[index]);
         }
+
+        return result.ToString();
     }
 }