Merge branch 'develop'

fintermobilityas · Sep 12, 2023 · 6739702 · 6739702
2 parents c54d61f + 9ddd2c2
commit 6739702
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 31 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: net7.0
-  DOTNET_NET60_VERSION: 6.0.408
-  DOTNET_NET70_VERSION: 7.0.203
-  DOTNET_NET80_VERSION: 8.0.100-preview.3.23178.7
+  DOTNET_NET60_VERSION: 6.0.414
+  DOTNET_NET70_VERSION: 7.0.401
+  DOTNET_NET80_VERSION: 8.0.100-rc.1.23455.8
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: 1
@@ -32,7 +32,7 @@ jobs:
       SNAPX_VERSION: ${{ steps.set-version.outputs.SNAPX_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -61,7 +61,7 @@ jobs:
       SNAPX_VERSION: ${{ needs.setup.outputs.SNAPX_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: true
           submodules: true
@@ -74,7 +74,7 @@ jobs:
           password: ${{ secrets.SNAPX_DOCKER_READ_PAT }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: |
             ${{ env.DOTNET_NET60_VERSION }}
@@ -134,13 +134,13 @@ jobs:
       SNAPX_VERSION: ${{ needs.setup.outputs.SNAPX_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: true
           submodules: true
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: |
             ${{ env.DOTNET_NET60_VERSION }}
@@ -185,15 +185,15 @@ jobs:
           path: ${{ github.workspace }}/artifacts/**/*
 
   publish:
-    if: success() 
+    if: success()
     runs-on: ubuntu-latest
     name: Nupkg
     needs: [setup, windows, linux] # todo: enable me when github actions supports arm64: test-linux-arm64
     env:
       SNAPX_VERSION: ${{ needs.setup.outputs.SNAPX_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: true
 
@@ -222,7 +222,7 @@ jobs:
           path: ${{ github.workspace }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3.0.3
+        uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: |
             ${{ env.DOTNET_NET60_VERSION }}

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 5.2.2
+next-version: 5.2.3
 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 = "22.0",
+	[string] $DockerVersion = "28.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.408
-ARG DOTNET_70_SDK_VERSION=7.0.203
-ARG DOTNET_80_SDK_VERSION=8.0.100-preview.3.23178.7
+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_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.0-preview7</AvaloniaVersion>
+    <AvaloniaVersion>11.0.4</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="2022.3.1" />
+    <PackageVersion Include="Jetbrains.Annotations" Version="2023.2.0" />
     <PackageVersion Include="LibLog" Version="5.0.8" />
-    <PackageVersion Include="LightInject" Version="6.6.3" />
-    <PackageVersion Include="MessagePack" Version="2.5.108" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="LightInject" Version="6.6.4" />
+    <PackageVersion Include="MessagePack" Version="2.5.124" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
-    <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="NLog" Version="5.1.3" />
-    <PackageVersion Include="NuGet.Packaging.Core" Version="6.5.0" />
-    <PackageVersion Include="NuGet.Protocol" Version="6.5.0" />
+    <PackageVersion Include="Moq" Version="4.20.69" />
+    <PackageVersion Include="NLog" Version="5.2.4" />
+    <PackageVersion Include="NuGet.Packaging.Core" Version="6.7.0" />
+    <PackageVersion Include="NuGet.Protocol" Version="6.7.0" />
     <PackageVersion Include="SharpCompress" Version="0.33.0" />
     <PackageVersion Include="System.CodeDom" Version="7.0.0" />
     <PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="XunitXml.TestLogger" Version="3.0.78" />
-    <PackageVersion Include="YamlDotNet" Version="13.1.0" />
+    <PackageVersion Include="xunit" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageVersion Include="XunitXml.TestLogger" Version="3.1.11" />
+    <PackageVersion Include="YamlDotNet" Version="13.3.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Snap.Installer/Windows/CustomChromeWindow.cs b/src/Snap.Installer/Windows/CustomChromeWindow.cs
@@ -17,6 +17,4 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
         BeginMoveDrag(e);
         base.OnPointerPressed(e);
     }
-
-    protected override void HandleWindowStateChanged(WindowState state) => WindowState = WindowState.Normal;
 }