diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index b4bdac8b..af41a08f 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -15,8 +15,8 @@ env: GITVERSION_VERSION: 5.9.0 MSVS_TOOLSET_VERSION: 16 SNAPX_DOTNET_FRAMEWORK_VERSION: net6.0 - DOTNET_NET60_VERSION: 6.0.201 - DOTNET_NET70_VERSION: 7.0.100-preview.3.22179.4 + DOTNET_NET60_VERSION: 6.0.300 + DOTNET_NET70_VERSION: 7.0.100-preview.4.22252.9 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 diff --git a/GitVersion.yml b/GitVersion.yml index 9da0c02d..d92797ae 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 4.0.7 +next-version: 4.0.8 mode: ContinuousDeployment continuous-delivery-fallback-tag: '' branches: diff --git a/build.ps1 b/build.ps1 index 777d8c8b..e0db7994 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 = "12.0", + [string] $DockerVersion = "13.0", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] diff --git a/docker/Dockerfile b/docker/Dockerfile index 36bdfdff..52a4eade 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,8 +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.201 -ARG DOTNET_70_SDK_VERSION=7.0.100-preview.3.22179.4 +ARG DOTNET_60_SDK_VERSION=6.0.300 +ARG DOTNET_70_SDK_VERSION=7.0.100-preview.4.22252.9 ARG DOTNET_RID=linux-x64 diff --git a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj index 1e50fe0b..66273f01 100644 --- a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj +++ b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj @@ -21,13 +21,13 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Snap.Installer/Snap.Installer.Deps.targets b/src/Snap.Installer/Snap.Installer.Deps.targets index 4ea6456c..e485a20d 100644 --- a/src/Snap.Installer/Snap.Installer.Deps.targets +++ b/src/Snap.Installer/Snap.Installer.Deps.targets @@ -3,6 +3,6 @@ - + diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj index 59a390c1..6872bd8a 100644 --- a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj +++ b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj @@ -9,10 +9,10 @@ - + - - + + diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj index 36df11df..5259b335 100644 --- a/src/Snap.Tests/Snap.Tests.csproj +++ b/src/Snap.Tests/Snap.Tests.csproj @@ -18,13 +18,13 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Snap/Core/SnapCryptoProvider.cs b/src/Snap/Core/SnapCryptoProvider.cs index fe57bf98..a44bfcab 100644 --- a/src/Snap/Core/SnapCryptoProvider.cs +++ b/src/Snap/Core/SnapCryptoProvider.cs @@ -30,7 +30,7 @@ public string Sha256(byte[] content) { if (content == null) throw new ArgumentNullException(nameof(content)); - var sha256 = SHA256.Create(); + using var sha256 = SHA256.Create(); var hash = sha256.ComputeHash(content); return HashToString(hash); @@ -47,7 +47,7 @@ public string Sha256(Stream content) content.Seek(0, SeekOrigin.Begin); - var sha256 = SHA256.Create(); + using var sha256 = SHA256.Create(); var hash = sha256.ComputeHash(content); content.Seek(0, SeekOrigin.Begin); diff --git a/src/Snap/Snap.Deps.targets b/src/Snap/Snap.Deps.targets index 95d90d2a..83f37d61 100644 --- a/src/Snap/Snap.Deps.targets +++ b/src/Snap/Snap.Deps.targets @@ -1,11 +1,11 @@ - + - - + + diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj index 9c2c7ab7..d4e3c20b 100644 --- a/src/Snapx.Tests/Snapx.Tests.csproj +++ b/src/Snapx.Tests/Snapx.Tests.csproj @@ -18,13 +18,13 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj index 8f162312..f3d73c9d 100644 --- a/src/Snapx/Snapx.csproj +++ b/src/Snapx/Snapx.csproj @@ -30,8 +30,8 @@ - - + +