Merge pull request #31 from elonmallin/master

fix: add net8 and net7 support
stylianosnicoletti · Feb 29, 2024 · 0ef4ecf · 0ef4ecf
2 parents a0270b8 + c3a8cae
commit 0ef4ecf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.100
+          dotnet-version: 8.0.100
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -45,7 +45,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.100
+          dotnet-version: 8.0.100
       - name: Build
         run: dotnet build -c Release
       - name: Create Release NuGet package

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/docker-example/ConsoleApp/bin/Debug/net6.0/ConsoleApp.dll",
+            "program": "${workspaceFolder}/docker-example/ConsoleApp/bin/Debug/net8.0/ConsoleApp.dll",
             "args": [],
             "cwd": "${workspaceFolder}/docker-example/ConsoleApp",
             "console": "internalConsole",

diff --git a/docker-example/ConsoleApp/ConsoleApp.csproj b/docker-example/ConsoleApp/ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
 </Project>
diff --git a/docker-example/Dockerfile b/docker-example/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-amd64 as build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bullseye-slim-amd64 as build-env
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -13,7 +13,7 @@ RUN dotnet publish -c Release -o /app/out
 RUN dotnet tool install --tool-path /app/out dotnet-certificate-tool
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim-amd64
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.0-bullseye-slim-amd64
 WORKDIR /app
 COPY --from=build-env /app/out .
 COPY ./docker-entrypoint.sh .

diff --git a/docker-example/global.json b/docker-example/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100"
+    "version": "8.0.100"
   }
 }
diff --git a/src/GSoft.CertificateTool.csproj b/src/GSoft.CertificateTool.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <Description>CLI tool that installs a certificate to the specified store (defaults to My).</Description>
         <RepositoryUrl>https://github.com/gsoft-inc/dotnet-certificate-tool</RepositoryUrl>
-        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     </PropertyGroup>
 
     <PropertyGroup>