Merge branch 'develop'

fintermobilityas · Jul 10, 2024 · c4da093 · c4da093
2 parents 28584fe + 337ea17
commit c4da093
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 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.421
-  DOTNET_NET70_VERSION: 7.0.408
-  DOTNET_NET80_VERSION: 8.0.204
+  DOTNET_NET60_VERSION: 6.0.424
+  DOTNET_NET70_VERSION: 7.0.410
+  DOTNET_NET80_VERSION: 8.0.303
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: 1
@@ -66,15 +66,15 @@ jobs:
           lfs: true
           submodules: true
 
-      - uses: azure/docker-login@v1
+      - uses: docker/login-action@v3.2.0
         name: Docker login github packages
         with:
-          login-server: ghcr.io
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.SNAPX_DOCKER_READ_PAT }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4.0.0
+        uses: actions/setup-dotnet@v4.0.1
         with:
           dotnet-version: |
             ${{ env.DOTNET_NET60_VERSION }}
@@ -140,7 +140,7 @@ jobs:
           submodules: true
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4.0.0
+        uses: actions/setup-dotnet@v4.0.1
         with:
           dotnet-version: |
             ${{ env.DOTNET_NET60_VERSION }}
@@ -222,7 +222,7 @@ jobs:
           path: ${{ github.workspace }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4.0.0
+        uses: actions/setup-dotnet@v4.0.1
         with:
           dotnet-version: |
             ${{ env.DOTNET_NET60_VERSION }}

diff --git a/README.md b/README.md
@@ -82,29 +82,35 @@ Run `init.ps1` and all dependencies will be built in `Debug` and `Release` mode.
   - Windows Server 2012 R2
   - Windows Server 2016 R2
   - Windows Server 2019 R2
-
+  - Windows Server 2022 R2
+
 - Ubuntu Desktop x64
 
   - 18.04
   - 20.04
   - 22.04
+  - 24.04
 
 - Ubuntu Server x64
 
   - 18.04
   - 20.04
   - 22.04
+  - 24.04
 
 - Ubuntu Desktop arm64
 
   - 18.04
   - 20.04
   - 22.04
+  - 24.04
 
 - Ubuntu Server arm64
   - 18.04
   - 20.04
   - 22.04
+  - 24.04
+
 - Raspberry Pi OS arm64
 
 ## Code of Conduct

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 = "32.0",
+	[string] $DockerVersion = "35.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.421
-ARG DOTNET_70_SDK_VERSION=7.0.408
-ARG DOTNET_80_SDK_VERSION=8.0.204
+ARG DOTNET_60_SDK_VERSION=6.0.424
+ARG DOTNET_70_SDK_VERSION=7.0.410
+ARG DOTNET_80_SDK_VERSION=8.0.303
 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.10</AvaloniaVersion>
+    <AvaloniaVersion>11.0.11</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
@@ -15,18 +15,18 @@
     <PackageVersion Include="LibLog" Version="5.0.8" />
     <PackageVersion Include="LightInject" Version="6.6.4" />
     <PackageVersion Include="MessagePack" Version="2.5.140" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="Moq" Version="4.20.70" />
     <PackageVersion Include="NLog" Version="5.3.2" />
     <PackageVersion Include="NuGet.Packaging.Core" Version="6.9.1" />
-    <PackageVersion Include="NuGet.Protocol" Version="6.9.1" />
+    <PackageVersion Include="NuGet.Protocol" Version="6.10.0" />
     <PackageVersion Include="SharpCompress" Version="0.37.2" />
     <PackageVersion Include="System.CodeDom" Version="8.0.0" />
     <PackageVersion Include="System.Security.Permissions" Version="8.0.0" />
     <PackageVersion Include="xunit" Version="2.8.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
     <PackageVersion Include="XunitXml.TestLogger" Version="3.1.20" />
-    <PackageVersion Include="YamlDotNet" Version="15.1.2" />
+    <PackageVersion Include="YamlDotNet" Version="15.1.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Snap/Core/SnapNetworkTimeProvider.cs b/src/Snap/Core/SnapNetworkTimeProvider.cs
@@ -63,6 +63,8 @@ public SnapNetworkTimeProvider(string ntpServer, int port)
         var tsc = new TaskCompletionSource<DateTime?>();
         ThreadPool.QueueUserWorkItem(_ =>
         {
+            var remainingRetries = 3;
+            retry:
             try
             {
                 var ntpData = new byte[48];
@@ -90,6 +92,11 @@ public SnapNetworkTimeProvider(string ntpServer, int port)
             }
             catch
             {
+                if(--remainingRetries > 0)
+                {
+                    goto retry;
+                }
+                
                 tsc.TrySetResult(null);
             }
         });