Merge pull request #490 from bilal-fazlani/suport-dotnet-8

bilal-fazlani · Nov 26, 2023 · 8454643 · 8454643
2 parents 6b4bb01 + 045addf
commit 8454643
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,6 +20,7 @@ jobs:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Deploy

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,6 +21,7 @@ jobs:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/CommandDotNet.NewerReleasesAlerts/AlertOnNewerReleaseMiddleware.cs b/CommandDotNet.NewerReleasesAlerts/AlertOnNewerReleaseMiddleware.cs
@@ -102,7 +102,6 @@ private static Task<int> AlertOnNewVersion(CommandContext context, ExecutionDele
         private static bool TryGetCurrentVersion(out SemVersion semVersion)
         {
             return SemVersion.TryParse(AppInfo.Instance.Version, out semVersion);
-
         }
 
         private static bool TryGetLatestReleaseVersion(CommandContext context, NewerReleaseConfig config, out SemVersion? semVersion)

diff --git a/CommandDotNet.TestTools/Scenarios/AppRunnerScenarioExtensions.cs b/CommandDotNet.TestTools/Scenarios/AppRunnerScenarioExtensions.cs
@@ -81,7 +81,9 @@ private static void AssertExitCodeAndErrorMessage(IScenario scenario, AppRunnerR
             AssertUnexpectedOutputTexts(scenario, result, sb);
             if (sb.Length > 0)
             {
-                throw new AssertFailedException(sb.ToString());
+                var newLine = Environment.NewLine;
+                throw new AssertFailedException(
+                    $"{sb}{newLine}Output:{newLine}{newLine}{result.Console.AllText()}");
             }
         }
 

diff --git a/CommandDotNet.Tests/CommandDotNet.NewerReleasesAlerts/NewReleaseAlertOnGitHubTests.cs b/CommandDotNet.Tests/CommandDotNet.NewerReleasesAlerts/NewReleaseAlertOnGitHubTests.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Reflection;
 using System.Threading.Tasks;
 using CommandDotNet.Builders;
 using CommandDotNet.NewerReleasesAlerts;

diff --git a/CommandDotNet.sln b/CommandDotNet.sln
@@ -10,7 +10,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFolder", "SolutionFolder", "{4CA1A4AA-7105-4FEC-B88B-3A4AD3BBD6EE}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		appveyor.yml = appveyor.yml
 		Directory.Build.props = Directory.Build.props
 		README.md = README.md
 	EndProjectSection
@@ -19,7 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandDotNet.Example", "Co
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{6296D4E9-7128-4CFA-BFB9-1DF6004B7626}"
 	ProjectSection(SolutionItems) = preProject
-		.travis.yml = .travis.yml
 		deploy.sh = deploy.sh
 	EndProjectSection
 EndProject

diff --git a/CommandDotNet/Builders/AppInfo.cs b/CommandDotNet/Builders/AppInfo.cs
@@ -138,9 +138,12 @@ private static AppInfo BuildAppInfo()
             return new AppInfo(isExe, isSelfContainedExe, isRunViaDotNetExe, entryAssembly, filePath!, fileName);
         }
 
-        private static string? GetVersion(Assembly hostAssembly) =>
+        private static string? GetVersion(Assembly hostAssembly)
+        {
             // thanks Spectre console for figuring this out https://github.com/spectreconsole/spectre.console/issues/242
-            hostAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "?";
+            var version = hostAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+            return version?.Substring(0, version.IndexOf('+'));
+        }
 
         public object Clone() => new AppInfo(IsExe, IsSelfContainedExe, IsRunViaDotNetExe, EntryAssembly, FilePath, FileName, _version);
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
     <LangVersion>11.0</LangVersion>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
  </PropertyGroup>
  <PropertyGroup>
-Original file line number
+Diff line change
@@ Expand Up @@
             private static bool TryGetCurrentVersion(out SemVersion semVersion)
             {
                 return SemVersion.TryParse(AppInfo.Instance.Version, out semVersion);
             }
             private static bool TryGetLatestReleaseVersion(CommandContext context, NewerReleaseConfig config, out SemVersion? semVersion)
@@ Expand Down @@