Merge branch 'develop'

fintermobilityas · Feb 25, 2023 · 2f12ed9 · 2f12ed9
2 parents 67b80c2 + 0655a00
commit 2f12ed9
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git 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/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:

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 = "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
@@ -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/Directory.Packages.props b/src/Directory.Packages.props
@@ -15,12 +15,12 @@
     <PackageVersion Include="LibLog" Version="5.0.8" />
     <PackageVersion Include="LightInject" Version="6.6.3" />
     <PackageVersion Include="MessagePack" Version="2.4.59" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.4" />
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="NLog" Version="5.1.1" />
-    <PackageVersion Include="NuGet.Packaging.Core" Version="6.4.0" />
-    <PackageVersion Include="NuGet.Protocol" Version="6.4.0" />
+    <PackageVersion Include="NLog" Version="5.1.2" />
+    <PackageVersion Include="NuGet.Packaging.Core" Version="6.5.0" />
+    <PackageVersion Include="NuGet.Protocol" Version="6.5.0" />
     <PackageVersion Include="ServiceStack.HttpClient" Version="6.6.0" />
     <PackageVersion Include="SharpCompress" Version="0.32.2" />
     <PackageVersion Include="System.CodeDom" Version="7.0.0" />

diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj
@@ -5,7 +5,7 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <IsTestProject>false</IsTestProject>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj
@@ -5,7 +5,7 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Snap/Snap.csproj b/src/Snap/Snap.csproj
@@ -8,7 +8,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <IAmSnapCore>true</IAmSnapCore>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <IsTestProject>false</IsTestProject>
     </PropertyGroup>