Upgrade the project to .NET 9.0 (General Availability) and remove sup…

…port for .NET 6.0, which reached its End of Life (EOL) on November 12, 2024.
fintermobilityas · Nov 18, 2024 · 697887d · 697887d
1 parent f89a740
commit 697887d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 26 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -14,10 +14,9 @@ on:
 env:
   GITVERSION_VERSION: 5.12.0
   MSVS_TOOLSET_VERSION: 16
-  SNAPX_DOTNET_FRAMEWORK_VERSION: net8.0
-  DOTNET_NET60_VERSION: 6.0.425
-  DOTNET_NET80_VERSION: 8.0.401
-  DOTNET_NET90_VERSION: 9.0.100-preview.7.24407.12
+  SNAPX_DOTNET_FRAMEWORK_VERSION: net9.0
+  DOTNET_NET80_VERSION: 8.0.404
+  DOTNET_NET90_VERSION: 9.0.100
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_NOLOGO: 1
@@ -77,7 +76,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: |
-            ${{ env.DOTNET_NET60_VERSION }}
             ${{ env.DOTNET_NET90_VERSION }}
             ${{ env.DOTNET_NET80_VERSION }}
 
@@ -143,7 +141,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: |
-            ${{ env.DOTNET_NET60_VERSION }}
             ${{ env.DOTNET_NET90_VERSION }}
             ${{ env.DOTNET_NET80_VERSION }}
 
@@ -225,7 +222,6 @@ jobs:
         uses: actions/[email protected]
         with:
           dotnet-version: |
-            ${{ env.DOTNET_NET60_VERSION }}
             ${{ env.DOTNET_NET90_VERSION }}
             ${{ env.DOTNET_NET80_VERSION }}
 

diff --git a/build.ps1 b/build.ps1
@@ -8,15 +8,15 @@ param(
     [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)]
 	[string] $DockerImageName = "snapx",
 	[Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)]
-	[string] $DockerVersion = "39.0",
+	[string] $DockerVersion = "40.0",
 	[Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)]
     [switch] $DockerLocal,
     [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)]
 	[switch] $DockerContext,
     [Parameter(Position = 6, ValueFromPipelineByPropertyName = $true)]
     [switch] $CIBuild,
     [Parameter(Position = 7, ValueFromPipelineByPropertyName = $true)]
-    [string] $NetCoreAppVersion = "net8.0",
+    [string] $NetCoreAppVersion = "net9.0",
     [Parameter(Position = 8, ValueFromPipelineByPropertyName = $true)]
     [string] $Version = "0.0.0",
     [Parameter(Position = 9, ValueFromPipelineByPropertyName = $true)]

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -3,9 +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.427
-ARG DOTNET_80_SDK_VERSION=8.0.403
-ARG DOTNET_90_SDK_VERSION=9.0.100-rc.2.24474.11
+ARG DOTNET_80_SDK_VERSION=8.0.404
+ARG DOTNET_90_SDK_VERSION=9.0.100
 ARG DOTNET_RID=linux-x64
 
 
@@ -33,12 +32,6 @@ 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_60_SDK_VERSION}/dotnet-sdk-${DOTNET_60_SDK_VERSION}-${DOTNET_RID}.tar.gz && \
-  mkdir -p /root/dotnet && tar zxf dotnet-sdk-${DOTNET_60_SDK_VERSION}-${DOTNET_RID}.tar.gz -C /root/dotnet && \
-  rm dotnet-sdk-${DOTNET_60_SDK_VERSION}-${DOTNET_RID}.tar.gz
-
 RUN \
   /root/dotnet/dotnet tool update powershell -g
 

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

diff --git a/src/Snap.Installer/Snap.Installer.csproj b/src/Snap.Installer/Snap.Installer.csproj
@@ -7,7 +7,7 @@
         <OutputType>Exe</OutputType>
         <RootNamespace>Snap.Installer</RootNamespace>
         <AssemblyName>Snap.Installer</AssemblyName>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <IsTestProject>false</IsTestProject>
     </PropertyGroup>

diff --git a/src/Snap.Shared.Tests/BaseFixture.cs b/src/Snap.Shared.Tests/BaseFixture.cs
@@ -121,7 +121,7 @@ public SnapApp BuildSnapApp(string id = "demoapp", bool isGenesis = false,
             ],
             Target = new SnapTarget
             {
-                Framework = "net8.0",
+                Framework = "net9.0",
                 Shortcuts =
                 [
                     SnapShortcutLocation.Desktop,

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;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.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;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.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;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <IsPackable>true</IsPackable>
         <IsTestProject>false</IsTestProject>
     </PropertyGroup>

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

diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj
@@ -11,7 +11,7 @@
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>snapx</ToolCommandName>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <IsPackable>true</IsPackable>
         <IsTestProject>false</IsTestProject>
         <SnapxPackagePathPrefix>tools/$(TargetFramework)/any</SnapxPackagePathPrefix>