diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 2877c449..b8a1d3f5 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -15,8 +15,9 @@ env: GITVERSION_VERSION: 5.10.3 MSVS_TOOLSET_VERSION: 16 SNAPX_DOTNET_FRAMEWORK_VERSION: net7.0 - DOTNET_NET60_VERSION: 6.0.405 - DOTNET_NET70_VERSION: 7.0.102 + DOTNET_NET60_VERSION: 6.0.406 + DOTNET_NET70_VERSION: 7.0.103 + DOTNET_NET80_VERSION: 8.0.100-preview.1.23115.2 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 @@ -78,6 +79,7 @@ jobs: dotnet-version: | ${{ env.DOTNET_NET60_VERSION }} ${{ env.DOTNET_NET70_VERSION }} + ${{ env.DOTNET_NET80_VERSION }} - name: Build native shell: pwsh @@ -146,6 +148,7 @@ jobs: dotnet-version: | ${{ env.DOTNET_NET60_VERSION }} ${{ env.DOTNET_NET70_VERSION }} + ${{ env.DOTNET_NET80_VERSION }} - name: Build native run: ./build.ps1 Bootstrap-Windows -Version ${{ env.SNAPX_VERSION }} -Configuration ${{ matrix.configuration }} -CIBuild -NetCoreAppVersion ${{ env.SNAPX_DOTNET_FRAMEWORK_VERSION }} -Rid ${{ matrix.rid }} @@ -213,6 +216,7 @@ jobs: # dotnet-version: | # ${{ env.DOTNET_NET60_VERSION }} # ${{ env.DOTNET_NET70_VERSION }} + # ${{ env.DOTNET_NET80_VERSION }} # # - name: Test native @@ -267,6 +271,7 @@ jobs: dotnet-version: | ${{ env.DOTNET_NET60_VERSION }} ${{ env.DOTNET_NET70_VERSION }} + ${{ env.DOTNET_NET80_VERSION }} - name: Add dotnet tools to environment path shell: pwsh diff --git a/GitVersion.yml b/GitVersion.yml index 7e9ae0c7..e73ea8f0 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 5.1.0 +next-version: 5.1.1 mode: ContinuousDeployment continuous-delivery-fallback-tag: '' branches: diff --git a/build.ps1 b/build.ps1 index 67355edf..687b1757 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 = "19.0", + [string] $DockerVersion = "20.0", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] diff --git a/docker/Dockerfile b/docker/Dockerfile index d1dbd648..d8b964ec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,8 +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.405 -ARG DOTNET_70_SDK_VERSION=7.0.102 +ARG DOTNET_60_SDK_VERSION=6.0.406 +ARG DOTNET_70_SDK_VERSION=7.0.103 +ARG DOTNET_80_SDK_VERSION=8.0.100-preview.1.23115.2 ARG DOTNET_RID=linux-x64 @@ -21,6 +22,11 @@ RUN \ dpkg -i packages-microsoft-prod.deb && \ apt-get update && \ rm packages-microsoft-prod.deb + +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_70_SDK_VERSION}/dotnet-sdk-${DOTNET_70_SDK_VERSION}-${DOTNET_RID}.tar.gz && \ diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index e07b3ed6..4e7dcd48 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -15,12 +15,12 @@ - + - - - + + + diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj index 70763391..b06aeafa 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;net7.0 + net6.0;net7.0;net8.0 diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj index 4e301e1e..d229298e 100644 --- a/src/Snap.Tests/Snap.Tests.csproj +++ b/src/Snap.Tests/Snap.Tests.csproj @@ -5,7 +5,7 @@ false true - net6.0;net7.0 + net6.0;net7.0;net8.0 diff --git a/src/Snap/Snap.csproj b/src/Snap/Snap.csproj index 2de844b9..82cef632 100644 --- a/src/Snap/Snap.csproj +++ b/src/Snap/Snap.csproj @@ -8,7 +8,7 @@ true true true - net6.0;net7.0 + net6.0;net7.0;net8.0 true false