Merge branch 'develop'

fintermobilityas · Feb 8, 2022 · 707cd20 · 707cd20
2 parents dc5925e + 926abc0
commit 707cd20
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -9,10 +9,10 @@ on:
       - develop
 
 env:
-  GITVERSION_VERSION: 5.7.0
+  GITVERSION_VERSION: 5.8.1
   MSVS_TOOLSET_VERSION: 16
   SNAPX_DOTNET_FRAMEWORK_VERSION: net6.0
-  DOTNET_NET60_VERSION: 6.0.100
+  DOTNET_NET60_VERSION: 6.0.102
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: 1
@@ -70,7 +70,7 @@ jobs:
           password: ${{secrets.GITHUB_TOKEN }}     
 
       - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v1.9.0
         with:
           dotnet-version: ${{ env.DOTNET_NET60_VERSION }}
 
@@ -136,7 +136,7 @@ jobs:
           submodules: true   
 
       - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v1.9.0
         with:
           dotnet-version: ${{ env.DOTNET_NET60_VERSION }}
 
@@ -201,7 +201,7 @@ jobs:
   #              
 
   #    - name: Setup .NET 6.0
-  #      uses: actions/setup-dotnet@v1.8.2
+  #      uses: actions/setup-dotnet@v1.9.0
   #      with:
   #        dotnet-version: ${{ env.DOTNET_NET60_VERSION }}
 
@@ -253,7 +253,7 @@ jobs:
           path: ${{ github.workspace }}
 
       - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v1.8.2
+        uses: actions/setup-dotnet@v1.9.0
         with:
           dotnet-version: ${{ env.DOTNET_NET60_VERSION }}
 

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,4 +1,4 @@
-next-version: 4.0.1
+next-version: 4.0.2
 mode: ContinuousDeployment
 continuous-delivery-fallback-tag: ''
 branches:

diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Checkout our sample application, [snapx demoapp](https://github.com/fintermobili
 - Powershell v7 `dotnet tool update powershell -g`
 - .NET SDK v6.0
 
-- Visual Studio 2022 Preview 4.1 Community with C++ workload installed
+- Visual Studio 2022 Community Edition with C++ workload installed
 
 #### Bootstrap snapx 
 

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.0" />
-        <PackageReference Include="NLog" Version="5.0.0-preview.1" />    
+        <PackageReference Include="NLog" Version="5.0.0-rc2" />    
     </ItemGroup>
 </Project>
diff --git a/src/Snap/Snap.Deps.targets b/src/Snap/Snap.Deps.targets
@@ -3,7 +3,7 @@
         <PackageReference Include="Jetbrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
         <PackageReference Include="Mono.Cecil" Version="0.11.4"/>
         <PackageReference Include="YamlDotNet" Version="11.2.1"/>
-        <PackageReference Include="SharpCompress" Version="0.30.0"/>
+        <PackageReference Include="SharpCompress" Version="0.30.1"/>
         <PackageReference Include="MessagePack" Version="2.3.85" />
         <PackageReference Include="NuGet.Packaging.Core" Version="6.0.0" />
         <PackageReference Include="NuGet.Protocol" Version="6.0.0"/>

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.12.0" />
+        <PackageReference Include="ServiceStack" Version="6.0.2" />
     </ItemGroup>
 
     <ItemGroup>