Merge branch 'develop'

fintermobilityas · Nov 15, 2023 · d87fc1e · d87fc1e
2 parents 5ab107b + 37a7856
commit d87fc1e
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 20 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -15,9 +15,9 @@ env:
   GITVERSION_VERSION: 5.12.0
   MSVS_TOOLSET_VERSION: 16
   SNAPX_DOTNET_FRAMEWORK_VERSION: net8.0
-  DOTNET_NET60_VERSION: 6.0.415
-  DOTNET_NET70_VERSION: 7.0.402
-  DOTNET_NET80_VERSION: 8.0.100-rc.2.23502.2
+  DOTNET_NET60_VERSION: 6.0.417
+  DOTNET_NET70_VERSION: 7.0.404
+  DOTNET_NET80_VERSION: 8.0.100
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: 1

diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,16 @@
+name: fossa
+
+on:
+  push:
+    branches: [develop]
+  pull_request:
+    branches: [develop]
+
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: fossas/fossa-action@main # Use a specific version if locking is preferred
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 5.2.4
+next-version: 5.2.5
 mode: ContinuousDeployment
 continuous-delivery-fallback-tag: ''
 branches:

diff --git a/build.ps1 b/build.ps1
@@ -8,7 +8,7 @@ param(
     [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)]
 	[string] $DockerImageName = "snapx",
 	[Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)]
-	[string] $DockerVersion = "28.0",
+	[string] $DockerVersion = "29.0",
 	[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
     [switch] $DockerLocal,
     [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -3,9 +3,9 @@ FROM ubuntu:20.04 as env-build
 ENV DEBIAN_FRONTEND=noninteractive
 ENV SNAPX_DOCKER_WORKING_DIR /build/snapx
 
-ARG DOTNET_60_SDK_VERSION=6.0.414
-ARG DOTNET_70_SDK_VERSION=7.0.401
-ARG DOTNET_80_SDK_VERSION=8.0.100-rc.1.23455.8
+ARG DOTNET_60_SDK_VERSION=6.0.417
+ARG DOTNET_70_SDK_VERSION=7.0.404
+ARG DOTNET_80_SDK_VERSION=8.0.100
 ARG DOTNET_RID=linux-x64
 
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <AvaloniaVersion>11.0.4</AvaloniaVersion>
+    <AvaloniaVersion>11.0.5</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
@@ -11,22 +11,22 @@
     <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="Jetbrains.Annotations" Version="2023.2.0" />
+    <PackageVersion Include="Jetbrains.Annotations" Version="2023.3.0" />
     <PackageVersion Include="LibLog" Version="5.0.8" />
     <PackageVersion Include="LightInject" Version="6.6.4" />
     <PackageVersion Include="MessagePack" Version="2.5.129" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="Moq" Version="4.20.69" />
-    <PackageVersion Include="NLog" Version="5.2.4" />
+    <PackageVersion Include="NLog" Version="5.2.5" />
     <PackageVersion Include="NuGet.Packaging.Core" Version="6.7.0" />
     <PackageVersion Include="NuGet.Protocol" Version="6.7.0" />
     <PackageVersion Include="SharpCompress" Version="0.34.1" />
-    <PackageVersion Include="System.CodeDom" Version="7.0.0" />
-    <PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
-    <PackageVersion Include="xunit" Version="2.5.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
+    <PackageVersion Include="System.CodeDom" Version="8.0.0" />
+    <PackageVersion Include="System.Security.Permissions" Version="8.0.0" />
+    <PackageVersion Include="xunit" Version="2.6.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
     <PackageVersion Include="XunitXml.TestLogger" Version="3.1.17" />
-    <PackageVersion Include="YamlDotNet" Version="13.7.0" />
+    <PackageVersion Include="YamlDotNet" Version="13.7.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Snapx.Tests/Core/DistributedMutexTests.cs b/src/Snapx.Tests/Core/DistributedMutexTests.cs
@@ -8,7 +8,7 @@
 
 namespace Snapx.Tests.Core;
 
-public class DistributedMutexTests 
+public sealed class DistributedMutexTests 
 {
     [Fact]
     public async Task TestAcquireAsync()
@@ -52,7 +52,7 @@ public async Task TestAcquireAsync_ReturnsInvalidChallengeValue()
 
         await using var distributedMutex = new DistributedMutex(distributedMutexClientMock.Object, new LogProvider.NoOpLogger(), mutexName, CancellationToken.None);
 
-        var ex = await Assert.ThrowsAsync<DistributedMutexUnknownException>(async () => await distributedMutex.TryAquireAsync());
+        var ex = await Assert.ThrowsAsync<DistributedMutexUnknownException>(() => distributedMutex.TryAquireAsync());
         Assert.Equal($"Challenge should not be null or empty. Mutex: {mutexName}. Challenge: {expectedChallenge}", ex.Message);
 
         Assert.False(distributedMutex.Acquired);
@@ -198,4 +198,4 @@ public async Task TestDisposeAsync_Mutex_Is_Not_Acquired()
         distributedMutexClientMock.Verify(x => x
             .ReleaseLockAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<TimeSpan?>()), Times.Never);
     }
-}
+}