diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 5f136aa6..d6aa3eb5 100644 --- 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,7 +185,7 @@ 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 @@ -193,7 +193,7 @@ jobs: 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 index 82de0c31..c94165f6 100644 --- 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 index d2efc4d2..301bb487 100644 --- 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 index 48d585f0..bf16e20d 100644 --- 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 index 5eece8df..d3b8b425 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,7 +1,7 @@ true - 11.0.0-preview7 + 11.0.4 @@ -11,22 +11,22 @@ - + - - - + + + - - - - + + + + - - - - + + + + diff --git a/src/Snap.Installer/Windows/CustomChromeWindow.cs b/src/Snap.Installer/Windows/CustomChromeWindow.cs index 106fd489..8e5019a5 100644 --- 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; }