Merge pull request #284 from xt0rted/dotnet-targets

Drop dotnet core 3.1 and add 7.0
xt0rted · Jul 2, 2023 · ffd322d · ffd322d
2 parents 826978b + 93b40cb
commit ffd322d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
           colored-output: false
           strip-comments-from-global-json: false
           dotnet-version: |
-            3.1.x
+            6.0.x
 
       - run: npm ci
 

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -54,7 +54,7 @@ jobs:
           colored-output: false
           strip-comments-from-global-json: false
           dotnet-version: |
-            3.1.x
+            6.0.x
 
       - run: npm ci
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
           colored-output: false
           strip-comments-from-global-json: false
           dotnet-version: |
-            3.1.x
+            6.0.x
 
       - run: npm ci
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,5 +9,6 @@
         "linecap",
         "linejoin",
         "viewbox"
-    ]
+    ],
+    "dotnet.defaultSolution": "HeroiconsTagHelper.sln"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+> **Note**:
+> This version drops support for .NET Core 3.1
+
+- Started targeting .NET 7.0
 - Bumped `heroicons` from 2.0.15 to 2.0.16
 
 ## [2.0.15](https://github.com/xt0rted/heroicons-tag-helper/compare/v2.0.14...v2.0.15) - 2023-02-14

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/global.json b/global.json
@@ -1,14 +1,14 @@
 {
   "sdk": {
-    "version": "6.0.411"
+    "version": "7.0.305"
   },
   "scripts": {
     "clean": "dotnet rimraf artifacts",
     "clean:bin": "dotnet rimraf **/bin **/obj",
     "build": "dotnet build",
     "test": "dotnet test",
-    "test:31": "dotnet test --framework netcoreapp3.1",
     "test:6": "dotnet test --framework net6.0",
+    "test:7": "dotnet test --framework net7.0",
     "pack": "dotnet pack --output ./artifacts",
     "ci": "dotnet r build test pack",
     "watch": "dotnet watch [env:DOTNET_WATCH_RESTART_ON_RUDE_EDIT=true] --verbose --project sample"

diff --git a/sample/Sample.csproj b/sample/Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <TargetFrameworks></TargetFrameworks>
     <NoWarn>1701;1702;CS0618</NoWarn>
   </PropertyGroup>