Skip to content

Commit 6739702

Browse files
peterspeters
committed
Merge branch 'develop'
2 parents c54d61f + 9ddd2c2 commit 6739702

File tree

6 files changed

+29
-31
lines changed

6 files changed

+29
-31
lines changed

‎.github/workflows/dotnetcore.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ env:
1515
GITVERSION_VERSION: 5.12.0
1616
MSVS_TOOLSET_VERSION: 16
1717
SNAPX_DOTNET_FRAMEWORK_VERSION: net7.0
18-
DOTNET_NET60_VERSION: 6.0.408
19-
DOTNET_NET70_VERSION: 7.0.203
20-
DOTNET_NET80_VERSION: 8.0.100-preview.3.23178.7
18+
DOTNET_NET60_VERSION: 6.0.414
19+
DOTNET_NET70_VERSION: 7.0.401
20+
DOTNET_NET80_VERSION: 8.0.100-rc.1.23455.8
2121
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2222
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2323
DOTNET_NOLOGO: 1
@@ -32,7 +32,7 @@ jobs:
3232
SNAPX_VERSION: ${{ steps.set-version.outputs.SNAPX_VERSION }}
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
fetch-depth: 0
3838

@@ -61,7 +61,7 @@ jobs:
6161
SNAPX_VERSION: ${{ needs.setup.outputs.SNAPX_VERSION }}
6262
steps:
6363
- name: Checkout
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@v4
6565
with:
6666
lfs: true
6767
submodules: true
@@ -74,7 +74,7 @@ jobs:
7474
password: ${{ secrets.SNAPX_DOCKER_READ_PAT }}
7575

7676
- name: Setup .NET
77-
uses: actions/setup-dotnet@v3.0.3
77+
uses: actions/setup-dotnet@v3.2.0
7878
with:
7979
dotnet-version: |
8080
${{ env.DOTNET_NET60_VERSION }}
@@ -134,13 +134,13 @@ jobs:
134134
SNAPX_VERSION: ${{ needs.setup.outputs.SNAPX_VERSION }}
135135
steps:
136136
- name: Checkout
137-
uses: actions/checkout@v3
137+
uses: actions/checkout@v4
138138
with:
139139
lfs: true
140140
submodules: true
141141

142142
- name: Setup .NET
143-
uses: actions/setup-dotnet@v3.0.3
143+
uses: actions/setup-dotnet@v3.2.0
144144
with:
145145
dotnet-version: |
146146
${{ env.DOTNET_NET60_VERSION }}
@@ -185,15 +185,15 @@ jobs:
185185
path: ${{ github.workspace }}/artifacts/**/*
186186

187187
publish:
188-
if: success()
188+
if: success()
189189
runs-on: ubuntu-latest
190190
name: Nupkg
191191
needs: [setup, windows, linux] # todo: enable me when github actions supports arm64: test-linux-arm64
192192
env:
193193
SNAPX_VERSION: ${{ needs.setup.outputs.SNAPX_VERSION }}
194194
steps:
195195
- name: Checkout
196-
uses: actions/checkout@v3
196+
uses: actions/checkout@v4
197197
with:
198198
lfs: true
199199

@@ -222,7 +222,7 @@ jobs:
222222
path: ${{ github.workspace }}
223223

224224
- name: Setup .NET
225-
uses: actions/setup-dotnet@v3.0.3
225+
uses: actions/setup-dotnet@v3.2.0
226226
with:
227227
dotnet-version: |
228228
${{ env.DOTNET_NET60_VERSION }}

‎GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
next-version: 5.2.2
1+
next-version: 5.2.3
22
mode: ContinuousDeployment
33
continuous-delivery-fallback-tag: ''
44
branches:

‎build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param(
88
[Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)]
99
[string] $DockerImageName = "snapx",
1010
[Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)]
11-
[string] $DockerVersion = "22.0",
11+
[string] $DockerVersion = "28.0",
1212
[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
1313
[switch] $DockerLocal,
1414
[Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]

‎docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ FROM ubuntu:20.04 as env-build
33
ENV DEBIAN_FRONTEND=noninteractive
44
ENV SNAPX_DOCKER_WORKING_DIR /build/snapx
55

6-
ARG DOTNET_60_SDK_VERSION=6.0.408
7-
ARG DOTNET_70_SDK_VERSION=7.0.203
8-
ARG DOTNET_80_SDK_VERSION=8.0.100-preview.3.23178.7
6+
ARG DOTNET_60_SDK_VERSION=6.0.414
7+
ARG DOTNET_70_SDK_VERSION=7.0.401
8+
ARG DOTNET_80_SDK_VERSION=8.0.100-rc.1.23455.8
99
ARG DOTNET_RID=linux-x64
1010

1111

‎src/Directory.Packages.props

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<AvaloniaVersion>11.0.0-preview7</AvaloniaVersion>
4+
<AvaloniaVersion>11.0.4</AvaloniaVersion>
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
@@ -11,22 +11,22 @@
1111
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
1212
<PackageVersion Include="Castle.Core" Version="5.1.1" />
1313
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
14-
<PackageVersion Include="Jetbrains.Annotations" Version="2022.3.1" />
14+
<PackageVersion Include="Jetbrains.Annotations" Version="2023.2.0" />
1515
<PackageVersion Include="LibLog" Version="5.0.8" />
16-
<PackageVersion Include="LightInject" Version="6.6.3" />
17-
<PackageVersion Include="MessagePack" Version="2.5.108" />
18-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
16+
<PackageVersion Include="LightInject" Version="6.6.4" />
17+
<PackageVersion Include="MessagePack" Version="2.5.124" />
18+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
1919
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
20-
<PackageVersion Include="Moq" Version="4.18.4" />
21-
<PackageVersion Include="NLog" Version="5.1.3" />
22-
<PackageVersion Include="NuGet.Packaging.Core" Version="6.5.0" />
23-
<PackageVersion Include="NuGet.Protocol" Version="6.5.0" />
20+
<PackageVersion Include="Moq" Version="4.20.69" />
21+
<PackageVersion Include="NLog" Version="5.2.4" />
22+
<PackageVersion Include="NuGet.Packaging.Core" Version="6.7.0" />
23+
<PackageVersion Include="NuGet.Protocol" Version="6.7.0" />
2424
<PackageVersion Include="SharpCompress" Version="0.33.0" />
2525
<PackageVersion Include="System.CodeDom" Version="7.0.0" />
2626
<PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
27-
<PackageVersion Include="xunit" Version="2.4.2" />
28-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
29-
<PackageVersion Include="XunitXml.TestLogger" Version="3.0.78" />
30-
<PackageVersion Include="YamlDotNet" Version="13.1.0" />
27+
<PackageVersion Include="xunit" Version="2.5.0" />
28+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
29+
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.11" />
30+
<PackageVersion Include="YamlDotNet" Version="13.3.1" />
3131
</ItemGroup>
3232
</Project>

‎src/Snap.Installer/Windows/CustomChromeWindow.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
1717
BeginMoveDrag(e);
1818
base.OnPointerPressed(e);
1919
}
20-
21-
protected override void HandleWindowStateChanged(WindowState state) => WindowState = WindowState.Normal;
2220
}

0 commit comments

Comments
 (0)