Merge branch 'develop'

fintermobilityas · May 23, 2022 · 256af99 · 256af99
2 parents c9822b3 + 50b9249
commit 256af99
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -21,13 +21,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="Castle.Core" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="System.CodeDom" Version="6.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

diff --git a/src/Snap.Installer/Snap.Installer.Deps.targets b/src/Snap.Installer/Snap.Installer.Deps.targets
@@ -3,6 +3,6 @@
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
         <PackageReference Include="LightInject" Version="6.4.1" />
-        <PackageReference Include="NLog" Version="5.0.0-rc2" />    
+        <PackageReference Include="NLog" Version="5.0.0" />    
     </ItemGroup>
 </Project>
diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj
@@ -9,10 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
     </ItemGroup>
 

diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj
@@ -18,13 +18,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="Castle.Core" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="System.CodeDom" Version="6.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

diff --git 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
@@ -1,11 +1,11 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="Jetbrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
+        <PackageReference Include="Jetbrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
         <PackageReference Include="Mono.Cecil" Version="0.11.4"/>
         <PackageReference Include="YamlDotNet" Version="11.2.1"/>
         <PackageReference Include="SharpCompress" Version="0.31.0"/>
         <PackageReference Include="MessagePack" Version="2.3.85" />
-        <PackageReference Include="NuGet.Packaging.Core" Version="6.1.0" />
-        <PackageReference Include="NuGet.Protocol" Version="6.1.0"/>
+        <PackageReference Include="NuGet.Packaging.Core" Version="6.2.0" />
+        <PackageReference Include="NuGet.Protocol" Version="6.2.0"/>
     </ItemGroup>
 </Project>
diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj
@@ -18,13 +18,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="Castle.Core" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+        <PackageReference Include="Moq" Version="4.18.1" />
         <PackageReference Include="System.CodeDom" Version="6.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>

diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj
@@ -30,8 +30,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="ServiceStack" Version="6.0.2" />
+        <PackageReference Include="CommandLineParser" Version="2.9.1" />
+        <PackageReference Include="ServiceStack.HttpClient" Version="6.1.0" />
     </ItemGroup>
 
     <ItemGroup>