From c338908f3ac4bf68a61849be8751f3892de68b64 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Wed, 8 Feb 2023 15:52:31 +0100 Subject: [PATCH 1/8] v-next. --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From 019b1e43a8e2fa92365858448ce9d3d66a88a927 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 07:09:47 +0100 Subject: [PATCH 2/8] Bump NLog from 5.1.1 to 5.1.2 (#298) Bumps [NLog](https://github.com/NLog/NLog) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/NLog/NLog/releases) - [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md) - [Commits](https://github.com/NLog/NLog/compare/v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: NLog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index e07b3ed6..bed56e65 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -18,7 +18,7 @@ - + From 293e590a5c5a63f733f43f11de4cc938cac3ad5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:38:12 +0100 Subject: [PATCH 3/8] Bump YamlDotNet from 12.3.1 to 13.0.1 (#299) Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.3.1 to 13.0.1. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.3.1...v13.0.1) --- updated-dependencies: - dependency-name: YamlDotNet dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index bed56e65..95e81dda 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -28,6 +28,6 @@ - + From 4ec6e16c9b0379a96b8cd2b9d222b401a439584b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 08:06:56 +0100 Subject: [PATCH 4/8] Bump Microsoft.NET.Test.Sdk from 17.4.1 to 17.5.0 (#300) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.4.1 to 17.5.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.4.1...v17.5.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 95e81dda..0e1e5d36 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -15,7 +15,7 @@ - + From acc43b7679c8a4b52cac5b208de0e73ae40fa1cb Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Wed, 22 Feb 2023 09:37:06 +0100 Subject: [PATCH 5/8] Add support for .NET 8 preview 1. --- .github/workflows/dotnetcore.yml | 9 +++++++-- build.ps1 | 2 +- docker/Dockerfile | 10 ++++++++-- src/Snap.Shared.Tests/Snap.Shared.Tests.csproj | 2 +- src/Snap.Tests/Snap.Tests.csproj | 2 +- src/Snap/Snap.csproj | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) 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/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/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 From ff3af926808fce449fbdb7b4c57c0df710fce83a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 10:38:12 +0100 Subject: [PATCH 6/8] Revert "Bump YamlDotNet from 12.3.1 to 13.0.1 (#299)" This reverts commit 293e590a5c5a63f733f43f11de4cc938cac3ad5f. --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 0e1e5d36..fd65aefe 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -28,6 +28,6 @@ - + From e609a4ed72b97d30839bd8da0df3c7c6f9d0a914 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 08:40:55 +0100 Subject: [PATCH 7/8] Bump NuGet.Protocol from 6.4.0 to 6.5.0 (#302) Bumps [NuGet.Protocol](https://github.com/NuGet/NuGet.Client) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/NuGet/NuGet.Client/releases) - [Commits](https://github.com/NuGet/NuGet.Client/commits) --- updated-dependencies: - dependency-name: NuGet.Protocol dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index fd65aefe..aa28da8e 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -20,7 +20,7 @@ - + From 0655a0016d408cfa1755b56705c046d609888843 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 08:42:13 +0100 Subject: [PATCH 8/8] Bump NuGet.Packaging.Core from 6.4.0 to 6.5.0 (#303) Bumps [NuGet.Packaging.Core](https://github.com/NuGet/NuGet.Client) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/NuGet/NuGet.Client/releases) - [Commits](https://github.com/NuGet/NuGet.Client/commits) --- updated-dependencies: - dependency-name: NuGet.Packaging.Core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index aa28da8e..4e7dcd48 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -19,7 +19,7 @@ - +