diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 97ce6a93..a274fb16 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -14,10 +14,9 @@ on: env: GITVERSION_VERSION: 5.12.0 MSVS_TOOLSET_VERSION: 16 - SNAPX_DOTNET_FRAMEWORK_VERSION: net8.0 - DOTNET_NET60_VERSION: 6.0.425 - DOTNET_NET80_VERSION: 8.0.401 - DOTNET_NET90_VERSION: 9.0.100-preview.7.24407.12 + SNAPX_DOTNET_FRAMEWORK_VERSION: net9.0 + DOTNET_NET80_VERSION: 8.0.404 + DOTNET_NET90_VERSION: 9.0.100 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 @@ -77,7 +76,6 @@ jobs: uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: | - ${{ env.DOTNET_NET60_VERSION }} ${{ env.DOTNET_NET90_VERSION }} ${{ env.DOTNET_NET80_VERSION }} @@ -143,7 +141,6 @@ jobs: uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: | - ${{ env.DOTNET_NET60_VERSION }} ${{ env.DOTNET_NET90_VERSION }} ${{ env.DOTNET_NET80_VERSION }} @@ -225,7 +222,6 @@ jobs: uses: actions/setup-dotnet@v4.1.0 with: dotnet-version: | - ${{ env.DOTNET_NET60_VERSION }} ${{ env.DOTNET_NET90_VERSION }} ${{ env.DOTNET_NET80_VERSION }} diff --git a/build.ps1 b/build.ps1 index 4562d211..104788af 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 = "39.0", + [string] $DockerVersion = "40.0", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] @@ -16,7 +16,7 @@ param( [Parameter(Position = 6, ValueFromPipelineByPropertyName = $true)] [switch] $CIBuild, [Parameter(Position = 7, ValueFromPipelineByPropertyName = $true)] - [string] $NetCoreAppVersion = "net8.0", + [string] $NetCoreAppVersion = "net9.0", [Parameter(Position = 8, ValueFromPipelineByPropertyName = $true)] [string] $Version = "0.0.0", [Parameter(Position = 9, ValueFromPipelineByPropertyName = $true)] diff --git a/docker/Dockerfile b/docker/Dockerfile index 389bc997..c2b8db45 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,9 +3,8 @@ 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.427 -ARG DOTNET_80_SDK_VERSION=8.0.403 -ARG DOTNET_90_SDK_VERSION=9.0.100-rc.2.24474.11 +ARG DOTNET_80_SDK_VERSION=8.0.404 +ARG DOTNET_90_SDK_VERSION=9.0.100 ARG DOTNET_RID=linux-x64 @@ -33,12 +32,6 @@ RUN \ wget https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${DOTNET_80_SDK_VERSION}/dotnet-sdk-${DOTNET_80_SDK_VERSION}-${DOTNET_RID}.tar.gz && \ mkdir -p /root/dotnet && tar zxf dotnet-sdk-${DOTNET_80_SDK_VERSION}-${DOTNET_RID}.tar.gz -C /root/dotnet && \ rm dotnet-sdk-${DOTNET_80_SDK_VERSION}-${DOTNET_RID}.tar.gz - -RUN \ - wget https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${DOTNET_60_SDK_VERSION}/dotnet-sdk-${DOTNET_60_SDK_VERSION}-${DOTNET_RID}.tar.gz && \ - mkdir -p /root/dotnet && tar zxf dotnet-sdk-${DOTNET_60_SDK_VERSION}-${DOTNET_RID}.tar.gz -C /root/dotnet && \ - rm dotnet-sdk-${DOTNET_60_SDK_VERSION}-${DOTNET_RID}.tar.gz - RUN \ /root/dotnet/dotnet tool update powershell -g diff --git a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj index a17aeb9b..bac6e64c 100644 --- a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj +++ b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj @@ -5,7 +5,7 @@ false true - net8.0 + net9.0 diff --git a/src/Snap.Installer/Snap.Installer.csproj b/src/Snap.Installer/Snap.Installer.csproj index efcf6210..82fb7552 100644 --- a/src/Snap.Installer/Snap.Installer.csproj +++ b/src/Snap.Installer/Snap.Installer.csproj @@ -7,7 +7,7 @@ Exe Snap.Installer Snap.Installer - net8.0 + net9.0 false false diff --git a/src/Snap.Shared.Tests/BaseFixture.cs b/src/Snap.Shared.Tests/BaseFixture.cs index 31b23383..4fe48f01 100644 --- a/src/Snap.Shared.Tests/BaseFixture.cs +++ b/src/Snap.Shared.Tests/BaseFixture.cs @@ -121,7 +121,7 @@ public SnapApp BuildSnapApp(string id = "demoapp", bool isGenesis = false, ], Target = new SnapTarget { - Framework = "net8.0", + Framework = "net9.0", Shortcuts = [ SnapShortcutLocation.Desktop, diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj index 5ee7a60a..30671e5d 100644 --- a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj +++ b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj @@ -5,7 +5,7 @@ false false - net6.0;net8.0;net9.0 + net8.0;net9.0 diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj index 1695a2ad..bf1cc7c5 100644 --- a/src/Snap.Tests/Snap.Tests.csproj +++ b/src/Snap.Tests/Snap.Tests.csproj @@ -5,7 +5,7 @@ false true - net6.0;net8.0;net9.0 + net8.0;net9.0 diff --git a/src/Snap/Snap.csproj b/src/Snap/Snap.csproj index 03683174..dfbf8611 100644 --- a/src/Snap/Snap.csproj +++ b/src/Snap/Snap.csproj @@ -8,7 +8,7 @@ true true true - net6.0;net8.0;net9.0 + net8.0;net9.0 true false diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj index d0a1a6df..3074b625 100644 --- a/src/Snapx.Tests/Snapx.Tests.csproj +++ b/src/Snapx.Tests/Snapx.Tests.csproj @@ -5,7 +5,7 @@ false true - net8.0 + net9.0 diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj index 19e95736..c32b01b0 100644 --- a/src/Snapx/Snapx.csproj +++ b/src/Snapx/Snapx.csproj @@ -11,7 +11,7 @@ true snapx true - net8.0 + net9.0 true false tools/$(TargetFramework)/any