Merge branch 'develop'

fintermobilityas · Jan 13, 2021 · 02cdac0 · 02cdac0
2 parents 088026e + a4b4402
commit 02cdac0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -3,10 +3,10 @@ name: snapx
 on: push
 
 env:
-  GITVERSION_VERSION: 5.5.0
+  GITVERSION_VERSION: 5.6.3
   MSVS_TOOLSET_VERSION: 16
   DOTNET_FRAMEWORK_VERSION: net5.0
-  DOTNET_SDK_VERSION: 5.0.101
+  DOTNET_SDK_VERSION: 5.0.102
   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: 3.0.6
+next-version: 3.0.7
 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 = "3.0.101",
+	[string] $DockerVersion = "6.1",
 	[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
     [switch] $DockerLocal,
     [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]
@@ -512,7 +512,7 @@ switch ($Target) {
     }
     "Publish-Docker-Image" {
 		Invoke-Command-Colored $CommandDocker @(
-			"build -f ""$DockerFilenamePath"" -t ${DockerGithubRegistryUrl}/${DockerImageName}:${DockerVersion} docker"
+			"build --no-cache -f ""$DockerFilenamePath"" -t ${DockerGithubRegistryUrl}/${DockerImageName}:${DockerVersion} docker"
         )
 
 		Invoke-Command-Colored $CommandDocker @(

diff --git a/src/Snap/Snap.Deps.targets b/src/Snap/Snap.Deps.targets
@@ -6,8 +6,8 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Mono.Cecil" Version="0.11.3"/>
-        <PackageReference Include="YamlDotNet" Version="9.1.0"/>
-        <PackageReference Include="SharpCompress" Version="0.26.0"/>
+        <PackageReference Include="YamlDotNet" Version="9.1.1"/>
+        <PackageReference Include="SharpCompress" Version="0.27.0"/>
         <PackageReference Include="MessagePack" Version="2.2.85" />
         <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     </ItemGroup>

diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj
@@ -31,7 +31,7 @@
 
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="ServiceStack" Version="5.10.2" />
+        <PackageReference Include="ServiceStack" Version="5.10.4" />
         <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     </ItemGroup>