chore(deps): update .net dotnext

Signed-off-by: noreply@rainote.dev

.gitea/workflows/release.yaml

@@ -1,11 +1,11 @@
-name: Release Rai.PacketMediator
+name: Release Rai.PacketMediator
 run-name: ${{ gitea.actor }} is building the Server application
 on:
   push:
     tags:
-      - 'v*.*.*'
+    - v*.*.*
     paths-ignore:
-      - .run/**
+    - .run/**
 
 jobs:
   preprocess:
@@ -13,75 +13,75 @@ jobs:
     outputs:
       sanitized_branch_name: ${{ steps.sanitize.outputs.sanitized_branch_name }}
     steps:
-      - name: Sanitize branch name
+    - name: Sanitize branch name
-        id: sanitize
+      id: sanitize
-        run: echo "::set-output name=sanitized_branch_name::$(echo ${{ github.ref_name }} | sed 's/\//-/g')"
+      run: echo "::set-output name=sanitized_branch_name::$(echo ${{ github.ref_name }} | sed 's/\//-/g')"
 
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - name: Setup dotnet
+    - name: Setup dotnet
-        uses: https://github.com/actions/setup-dotnet@v3
+      uses: https://github.com/actions/setup-dotnet@v3
-        with:
+      with:
-          global-json-file: global.json
+        global-json-file: global.json
-      - name: Install dependencies
+    - name: Install dependencies
-        run: dotnet restore
+      run: dotnet restore
-      - name: Build
+    - name: Build
-        run: |
+      run: |
-          cd RaiNote.PacketMediator
+        cd RaiNote.PacketMediator
-          dotnet build RaiNote.PacketMediator.csproj -c Release
+        dotnet build RaiNote.PacketMediator.csproj -c Release
 
   publish:
-    needs: [ build ]
+    needs: [build]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - name: Setup dotnet
+    - name: Setup dotnet
-        uses: https://github.com/actions/setup-dotnet@v3
+      uses: https://github.com/actions/setup-dotnet@v3
-        with:
+      with:
-          global-json-file: global.json
+        global-json-file: global.json
-      - name: Install dependencies
+    - name: Install dependencies
-        run: dotnet restore
+      run: dotnet restore
-      - name: Extract Version
+    - name: Extract Version
-        run: |
+      run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
+        VERSION=${GITHUB_REF#refs/tags/v}
-          echo "Extracted version is $VERSION"
+        echo "Extracted version is $VERSION"
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
-        shell: bash
+      shell: bash
-      - name: Pack nuget package
+    - name: Pack nuget package
-        run: |
+      run: |
-          cd RaiNote.PacketMediator
+        cd RaiNote.PacketMediator
-          dotnet build RaiNote.PacketMediator.csproj -c Release -p:PackageVersion=${{env.VERSION}}
+        dotnet build RaiNote.PacketMediator.csproj -c Release -p:PackageVersion=${{env.VERSION}}
-          dotnet pack -c Release -p:PackageVersion=${{env.VERSION}} --output .
+        dotnet pack -c Release -p:PackageVersion=${{env.VERSION}} --output .
-      - name: Push to NuGet
+    - name: Push to NuGet
-        run: |
+      run: |
-          cd RaiNote.PacketMediator
+        cd RaiNote.PacketMediator
-          dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://forge.rainote.dev/api/packages/rainote/nuget/index.json
+        dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://forge.rainote.dev/api/packages/rainote/nuget/index.json
 
   generate-licences:
-    needs: [ build, preprocess ]
+    needs: [build, preprocess]
     runs-on: ubuntu-latest
     container: catthehacker/ubuntu:act-latest@sha256:efe7d859ca6f98a21b3b0471ab48455af597a064d719f65332d0f105aadcad65
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - name: Setup dotnet
+    - name: Setup dotnet
-        uses: https://github.com/actions/setup-dotnet@v3
+      uses: https://github.com/actions/setup-dotnet@v3
-        with:
+      with:
-          dotnet-version: |
+        dotnet-version: |
-            7.0
+          7.0
-            8.0
+          8.0
-      - name: Install dependencies
+    - name: Install dependencies
-        run: |
+      run: |
-          dotnet restore
+        dotnet restore
-          echo "::add-path::$HOME/.dotnet/tools"
+        echo "::add-path::$HOME/.dotnet/tools"
-      - name: Install nuget-license
+    - name: Install nuget-license
-        run: dotnet tool install --global dotnet-project-licenses
+      run: dotnet tool install --global dotnet-project-licenses
-      - name: Export licenses
+    - name: Export licenses
-        run: dotnet-project-licenses -i . -u --projects-filter projects_ignore_licenses.json -m -j -e -f licenses
+      run: dotnet-project-licenses -i . -u --projects-filter projects_ignore_licenses.json -m -j -e -f licenses
-      - name: Upload licenses
+    - name: Upload licenses
-        uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v3
-        with:
+      with:
-          name: licenses
+        name: licenses
-          path: licenses
+        path: licenses
-          retention-days: 31
+        retention-days: 31

.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 repos:
-  - repo: local
+- repo: local
-    hooks:
+  hooks:
       #Use dotnet format already installed on your machine
-      - id: dotnet-format
+  - id: dotnet-format
-        name: dotnet-format
+    name: dotnet-format
-        language: system
+    language: system
-        entry: dotnet format --include
+    entry: dotnet format --include
-        types_or: [ c#, vb ]
+    types_or: [c#, vb]
-  - repo: https://github.com/Mateusz-Grzelinski/actionlint-py
+- repo: https://github.com/Mateusz-Grzelinski/actionlint-py
-    rev: v1.6.26.11
+  rev: v1.7.1.15
-    hooks:
+  hooks:
-      - id: actionlint
+  - id: actionlint
-        additional_dependencies: [ pyflakes>=3.0.1, shellcheck-py>=0.9.0.5 ]
+    additional_dependencies: [pyflakes>=3.0.1, shellcheck-py>=0.9.0.5]
-  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-    rev: v2.12.0
+  rev: v2.14.0
-    hooks:
+  hooks:
-      - id: pretty-format-yaml
+  - id: pretty-format-yaml
-        args: [ --autofix, --indent, '2' ]
+    args: [--autofix, --indent, '2']

PacketMediator.Samples/Program.cs

@@ -0,0 +1,3 @@
+// Licensed to Timothy Schenk under the Apache 2.0 License.
+
+Console.WriteLine("Hello World!");

PacketMediator.Samples/Sample.cs

@@ -0,0 +1,8 @@
+// Licensed to Timothy Schenk under the Apache 2.0 License.
+
+namespace PacketMediator.Samples;
+
+public class Sample
+{
+
+}

PacketMediator.Tests/PacketMediator.Tests.csproj

@@ -15,9 +15,9 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="xunit" Version="2.7.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

RaiNote.PacketMediator/PacketDistributor.cs

@@ -23,12 +23,14 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
     public PacketDistributor(IServiceProvider serviceProvider,
         IEnumerable<Assembly> sourcesContainingPackets, IEnumerable<Assembly> sourcesContainingPacketHandlers)
     {
-        _channel = Channel.CreateUnbounded<ValueTuple<byte[], TPacketIdEnum, TSession>>(new UnboundedChannelOptions
+        _channel = Channel.CreateUnbounded<ValueTuple<byte[], TPacketIdEnum, TSession>>(
-        {
+            new UnboundedChannelOptions
-            AllowSynchronousContinuations = false,
+            {
-            SingleReader = false,
+                AllowSynchronousContinuations = false,
-            SingleWriter = false
+                SingleReader = false,
-        });
+                SingleWriter = false
+            }
+        );
         var containingPackets = sourcesContainingPackets as Assembly[] ?? sourcesContainingPackets.ToArray();
         var allIncomingPackets = GetAllPackets(containingPackets, typeof(IIncomingPacket));
         var allOutgoingPackets = GetAllPackets(containingPackets, typeof(IOutgoingPacket));
@@ -42,27 +44,32 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
             new ConcurrentDictionary<TPacketIdEnum, Func<byte[], IIncomingPacket>>();
         _packetHandlersInstantiation = new ConcurrentDictionary<TPacketIdEnum, IPacketHandler<TSession>?>();
         packetHandlers.ForEach(packetHandlerPair =>
-        {
-            var packetHandler =
-                ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider,
-                    packetHandlerPair.Value);
-            _packetHandlersInstantiation.TryAdd(packetHandlerPair.Key, packetHandler as IPacketHandler<TSession>);
-        });
-        allIncomingPackets.ForEach(packetsType =>
-        {
-            var lambda = CodeGenerator.Lambda<Func<byte[], IIncomingPacket>>(fun =>
             {
-                var argPacketData = fun[0];
+                var packetHandler =
-                var newPacket = packetsType.Value.New();
+                    ActivatorUtilities.GetServiceOrCreateInstance(serviceProvider,
+                        packetHandlerPair.Value
+                    );
+                _packetHandlersInstantiation.TryAdd(packetHandlerPair.Key, packetHandler as IPacketHandler<TSession>);
+            }
+        );
+        allIncomingPackets.ForEach(packetsType =>
+            {
+                var lambda = CodeGenerator.Lambda<Func<byte[], IIncomingPacket>>(fun =>
+                        {
+                            var argPacketData = fun[0];
+                            var newPacket = packetsType.Value.New();
 
-                var packetVariable = CodeGenerator.DeclareVariable(packetsType.Value, "packet");
+                            var packetVariable = CodeGenerator.DeclareVariable(packetsType.Value, "packet");
-                CodeGenerator.Assign(packetVariable, newPacket);
+                            CodeGenerator.Assign(packetVariable, newPacket);
-                CodeGenerator.Call(packetVariable, nameof(IIncomingPacket.Deserialize), argPacketData);
+                            CodeGenerator.Call(packetVariable, nameof(IIncomingPacket.Deserialize), argPacketData);
 
-                CodeGenerator.Return(packetVariable);
+                            CodeGenerator.Return(packetVariable);
-            }).Compile();
+                        }
-            tempDeserializationMap.TryAdd(packetsType.Key, lambda);
+                    )
-        });
+                    .Compile();
+                tempDeserializationMap.TryAdd(packetsType.Key, lambda);
+            }
+        );
 
         _deserializationMap = tempDeserializationMap.ToImmutableDictionary();
     }
@@ -74,11 +81,13 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
     {
         var packetsWithId = sourcesContainingPackets.SelectMany(a => a.GetTypes()
                 .Where(type => type is { IsInterface: false, IsAbstract: false } &&
-                               type.GetInterfaces().Contains(packetType)
+                               type.GetInterfaces().Contains(packetType) &&
-                               && type.GetCustomAttributes<PacketIdAttribute<TPacketIdEnum>>().Any()
+                               type.GetCustomAttributes<PacketIdAttribute<TPacketIdEnum>>().Any()
-                ))
+                )
+            )
             .Select(type =>
-                new { Type = type, Attribute = type.GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>() })
+                new { Type = type, Attribute = type.GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>() }
+            )
             .Select(x => new KeyValuePair<TPacketIdEnum, Type>(x.Attribute!.Code, x.Type));
 
         return packetsWithId;
@@ -89,20 +98,32 @@ public class PacketDistributor<TPacketIdEnum, TSession> where TPacketIdEnum : En
     {
         var packetHandlersWithId = sourcesContainingPacketHandlers.SelectMany(assembly => assembly.GetTypes()
                 .Where(t =>
-                    t is { IsClass: true, IsAbstract: false } && Array.Exists(t
+                    t is { IsClass: true, IsAbstract: false } &&
-                        .GetInterfaces(), i =>
+                    Array.Exists(t
-                        i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)))
+                            .GetInterfaces(),
+                        i =>
+                            i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)
+                    )
+                )
                 .Select(packetHandlerType => new
                 {
                     Type = packetHandlerType,
                     PacketId = packetHandlerType
-                        .GetInterfaces().First(t1 =>
+                            .GetInterfaces()
-                            t1 is { IsGenericType: true } &&
+                            .First(t1 =>
-                            t1.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)).GetGenericArguments()
+                                t1 is { IsGenericType: true } &&
-                        .First(genericType => genericType.GetInterfaces().Any(packetType =>
+                                t1.GetGenericTypeDefinition() == typeof(IPacketHandler<,>)
-                            packetType == typeof(IPacket)))
+                            )
-                        .GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>()
+                            .GetGenericArguments()
-                }))
+                            .First(genericType => genericType.GetInterfaces()
+                                .Any(packetType =>
+                                    packetType == typeof(IPacket)
+                                )
+                            )
+                            .GetCustomAttribute<PacketIdAttribute<TPacketIdEnum>>()
+                }
+                )
+            )
             .Where(x => x.PacketId != null)
             .Select(x => new KeyValuePair<TPacketIdEnum, Type>(x.PacketId!.Code, x.Type));
 

RaiNote.PacketMediator/PacketDistributorService.cs

@@ -13,13 +13,15 @@ public class PacketDistributorService<TPacketIdEnum, TSession> : IHostedService
     public PacketDistributorService(IServiceProvider serviceProvider,
         IEnumerable<Assembly> sourcesContainingPackets, IEnumerable<Assembly> sourcesContainingPacketHandlers)
     {
-        _packetDistributor = new PacketDistributor<TPacketIdEnum, TSession>(serviceProvider, sourcesContainingPackets,
+        _packetDistributor = new PacketDistributor<TPacketIdEnum, TSession>(serviceProvider,
-            sourcesContainingPacketHandlers);
+            sourcesContainingPackets,
+            sourcesContainingPacketHandlers
+        );
     }
 
-    public Task StartAsync(CancellationToken cancellationToken)
+    public async Task StartAsync(CancellationToken cancellationToken)
     {
-        return _packetDistributor.DequeuePacketAsync(cancellationToken);
+        await _packetDistributor.DequeuePacketAsync(cancellationToken);
     }
 
     public Task StopAsync(CancellationToken cancellationToken)
@@ -32,15 +34,10 @@ public class PacketDistributorService<TPacketIdEnum, TSession> : IHostedService
         return _packetDistributor.AddPacketAsync(packetData, operationCode, session);
     }
 
-    public TPacketIdEnum GetOperationCodeByPacketType(IPacket packet)
+    public DotNext.Optional<TPacketIdEnum> GetOperationCodeByPacketType(IPacket packet)
     {
         var type = packet.GetType();
         _packetDistributor.PacketIdMap.TryGetValue(type, out var value);
-        if (value is null)
+        return value ?? DotNext.Optional<TPacketIdEnum>.None;
-        {
-            throw new ArgumentOutOfRangeException(type.Name);
-        }
-
-        return value;
     }
 }

RaiNote.PacketMediator/RaiNote.PacketMediator.csproj

@@ -20,20 +20,21 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="../README.md" Pack="true" PackagePath="\"/>
-    <PackageReference Include="DotNext" Version="5.3.1"/>
+    <PackageReference Include="DotNext" Version="5.11.0"/>
-    <PackageReference Include="DotNext.Metaprogramming" Version="5.3.0"/>
+    <PackageReference Include="DotNext.Metaprogramming" Version="5.7.0"/>
-    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0"/>
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0"/>
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.146">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1"/>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.9.28">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.203",
+    "version": "8.0.303",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }