Adding net7.0 target framework (#260)

* Adding net7.0 target framework * Fixed workflow for codeql
shibayan · Sep 4, 2023 · c9b2b47 · c9b2b47
1 parent 2fa046e
commit c9b2b47
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 env:
-  DOTNET_VERSION: 6.0.x
+  DOTNET_VERSION: 7.0.x
 
 jobs:
   build:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,7 +7,7 @@ on:
     branches: [ "master" ]
 
 env:
-  DOTNET_VERSION: 6.0.x
+  DOTNET_VERSION: 7.0.x
 
 jobs:
   analyze:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,7 +5,7 @@ on:
     tags: [ v* ]
 
 env:
-  DOTNET_VERSION: 6.0.x
+  DOTNET_VERSION: 7.0.x
 
 jobs:
   publish:

diff --git a/Sharprompt.Example/Sharprompt.Example.csproj b/Sharprompt.Example/Sharprompt.Example.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/Sharprompt.Tests/Sharprompt.Tests.csproj b/Sharprompt.Tests/Sharprompt.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Sharprompt/Internal/EnumHelper.cs b/Sharprompt/Internal/EnumHelper.cs
@@ -10,7 +10,11 @@ internal static class EnumHelper<TEnum> where TEnum : notnull
 {
     static EnumHelper()
     {
+#if NET7_0_OR_GREATER
+        var values = (TEnum[])Enum.GetValuesAsUnderlyingType(typeof(TEnum));
+#else
         var values = (TEnum[])Enum.GetValues(typeof(TEnum));
+#endif
 
         foreach (var value in values)
         {

diff --git a/Sharprompt/Sharprompt.csproj b/Sharprompt/Sharprompt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -11,7 +11,7 @@
     <PackageId>Sharprompt</PackageId>
     <PackageIcon>icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>https://github.com/shibayan/Sharprompt/releases</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/shibayan/Sharprompt/releases/tag/v$(Version)</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>cli;command-line;console;interactive;prompt;terminal</PackageTags>
     <RepositoryUrl>https://github.com/shibayan/Sharprompt</RepositoryUrl>