diff --git a/build.cake b/build.cake index a75d9d515..d61b978fc 100644 --- a/build.cake +++ b/build.cake @@ -17,7 +17,7 @@ Task("Build") DotNetBuild("./src/Spectre.Console.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); }); @@ -29,7 +29,7 @@ Task("Build-Analyzer") DotNetBuild("./src/Spectre.Console.Analyzer.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); }); @@ -41,7 +41,7 @@ Task("Build-Examples") DotNetBuild("./examples/Examples.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); }); @@ -80,7 +80,7 @@ Task("Package") NoRestore = true, NoBuild = true, OutputDirectory = "./.artifacts", - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); @@ -89,7 +89,7 @@ Task("Package") NoRestore = true, NoBuild = true, OutputDirectory = "./.artifacts", - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); }); diff --git a/docs/Docs.csproj b/docs/Docs.csproj index 14d9b7fbd..5ae29edd3 100644 --- a/docs/Docs.csproj +++ b/docs/Docs.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 $(MSBuildProjectDirectory) $(DefaultItemExcludes);output\**;.gitignore MVC1000 diff --git a/docs/global.json b/docs/global.json index 49d225529..77c776f82 100644 --- a/docs/global.json +++ b/docs/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.300", + "version": "7.0.100", "rollForward": "latestFeature" } } diff --git a/dotnet-tools.json b/dotnet-tools.json index c02d1a378..a0b331cdd 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "2.3.0", + "version": "3.0.0", "commands": [ "dotnet-cake" ] diff --git a/examples/Cli/Delegates/Delegates.csproj b/examples/Cli/Delegates/Delegates.csproj index e08f84a5c..53b2a23eb 100644 --- a/examples/Cli/Delegates/Delegates.csproj +++ b/examples/Cli/Delegates/Delegates.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false Delegates Demonstrates how to specify commands as delegates. diff --git a/examples/Cli/Demo/Demo.csproj b/examples/Cli/Demo/Demo.csproj index 6b6904a52..104414957 100644 --- a/examples/Cli/Demo/Demo.csproj +++ b/examples/Cli/Demo/Demo.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false Demo Demonstrates the most common use cases of Spectre.Cli. diff --git a/examples/Cli/Dynamic/Dynamic.csproj b/examples/Cli/Dynamic/Dynamic.csproj index 86c9639dc..a5353a546 100644 --- a/examples/Cli/Dynamic/Dynamic.csproj +++ b/examples/Cli/Dynamic/Dynamic.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false Dynamic Demonstrates how to define dynamic commands. diff --git a/examples/Cli/Injection/Injection.csproj b/examples/Cli/Injection/Injection.csproj index 9d9db3965..6bebd6998 100644 --- a/examples/Cli/Injection/Injection.csproj +++ b/examples/Cli/Injection/Injection.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false Injection Demonstrates how to use dependency injection with Spectre.Cli. diff --git a/examples/Cli/Logging/Logging.csproj b/examples/Cli/Logging/Logging.csproj index e7c4cd029..5579c3c05 100644 --- a/examples/Cli/Logging/Logging.csproj +++ b/examples/Cli/Logging/Logging.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 false Logging Demonstrates how to dynamically configure Serilog for logging using parameters from a command. diff --git a/examples/Console/AlternateScreen/AlternateScreen.csproj b/examples/Console/AlternateScreen/AlternateScreen.csproj index 24be5e73c..8e18a0082 100644 --- a/examples/Console/AlternateScreen/AlternateScreen.csproj +++ b/examples/Console/AlternateScreen/AlternateScreen.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Screens Demonstrates how to use alternate screens. Widgets diff --git a/examples/Console/Borders/Borders.csproj b/examples/Console/Borders/Borders.csproj index 128b1b626..3f01d3e36 100644 --- a/examples/Console/Borders/Borders.csproj +++ b/examples/Console/Borders/Borders.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Borders Demonstrates the different kind of borders. Widgets diff --git a/examples/Console/Calendars/Calendars.csproj b/examples/Console/Calendars/Calendars.csproj index bcf976444..21606c333 100644 --- a/examples/Console/Calendars/Calendars.csproj +++ b/examples/Console/Calendars/Calendars.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Calendars Demonstrates how to render calendars. Widgets diff --git a/examples/Console/Canvas/Canvas.csproj b/examples/Console/Canvas/Canvas.csproj index 63dfeebb7..a1a1e956b 100644 --- a/examples/Console/Canvas/Canvas.csproj +++ b/examples/Console/Canvas/Canvas.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Canvas Demonstrates how to render pixels and images. Widgets diff --git a/examples/Console/Charts/Charts.csproj b/examples/Console/Charts/Charts.csproj index 3fe640f2a..1d78fa695 100644 --- a/examples/Console/Charts/Charts.csproj +++ b/examples/Console/Charts/Charts.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Charts Demonstrates how to render charts in a console. Widgets diff --git a/examples/Console/Colors/Colors.csproj b/examples/Console/Colors/Colors.csproj index 642d5d0f2..5ed956574 100644 --- a/examples/Console/Colors/Colors.csproj +++ b/examples/Console/Colors/Colors.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Colors Demonstrates how to use [yellow]c[/][red]o[/][green]l[/][blue]o[/][aqua]r[/][lime]s[/] in the console. Misc diff --git a/examples/Console/Columns/Columns.csproj b/examples/Console/Columns/Columns.csproj index b004dde0c..aab263561 100644 --- a/examples/Console/Columns/Columns.csproj +++ b/examples/Console/Columns/Columns.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Columns Demonstrates how to render data into columns. Widgets diff --git a/examples/Console/Cursor/Cursor.csproj b/examples/Console/Cursor/Cursor.csproj index e2153cd90..2a0a8615b 100644 --- a/examples/Console/Cursor/Cursor.csproj +++ b/examples/Console/Cursor/Cursor.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Cursor Demonstrates how to move the cursor. Misc diff --git a/examples/Console/Emojis/Emojis.csproj b/examples/Console/Emojis/Emojis.csproj index e30aea92c..71c43b741 100644 --- a/examples/Console/Emojis/Emojis.csproj +++ b/examples/Console/Emojis/Emojis.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Emojis Demonstrates how to render emojis. Misc diff --git a/examples/Console/Exceptions/Exceptions.csproj b/examples/Console/Exceptions/Exceptions.csproj index d90cfb2c8..3e67e5ede 100644 --- a/examples/Console/Exceptions/Exceptions.csproj +++ b/examples/Console/Exceptions/Exceptions.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Exceptions Demonstrates how to render formatted exceptions. Misc diff --git a/examples/Console/Figlet/Figlet.csproj b/examples/Console/Figlet/Figlet.csproj index a59f0d7c0..3db0e85f0 100644 --- a/examples/Console/Figlet/Figlet.csproj +++ b/examples/Console/Figlet/Figlet.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Figlet Demonstrates how to render FIGlet text. Widgets diff --git a/examples/Console/Grids/Grids.csproj b/examples/Console/Grids/Grids.csproj index 4d761834b..c6991f300 100644 --- a/examples/Console/Grids/Grids.csproj +++ b/examples/Console/Grids/Grids.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Grids Demonstrates how to render grids in a console. Widgets diff --git a/examples/Console/Info/Info.csproj b/examples/Console/Info/Info.csproj index ff94b84b1..ab7310fad 100644 --- a/examples/Console/Info/Info.csproj +++ b/examples/Console/Info/Info.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Info Displays the capabilities of the current console. Misc diff --git a/examples/Console/Links/Links.csproj b/examples/Console/Links/Links.csproj index 746a0f4d2..badb83cc7 100644 --- a/examples/Console/Links/Links.csproj +++ b/examples/Console/Links/Links.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Links Demonstrates how to render links in a console. Misc diff --git a/examples/Console/Live/Live.csproj b/examples/Console/Live/Live.csproj index edfe36c6f..8aacf07a8 100644 --- a/examples/Console/Live/Live.csproj +++ b/examples/Console/Live/Live.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Live Demonstrates how to do live updates. Live diff --git a/examples/Console/LiveTable/LiveTable.csproj b/examples/Console/LiveTable/LiveTable.csproj index fb9635f5d..47d53619f 100644 --- a/examples/Console/LiveTable/LiveTable.csproj +++ b/examples/Console/LiveTable/LiveTable.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 LiveTable Demonstrates how to do live updates in a table. Live diff --git a/examples/Console/Minimal/Minimal.csproj b/examples/Console/Minimal/Minimal.csproj index 0ac0897e9..e680684b2 100644 --- a/examples/Console/Minimal/Minimal.csproj +++ b/examples/Console/Minimal/Minimal.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable Minimal Demonstrates a minimal console application. diff --git a/examples/Console/Panels/Panels.csproj b/examples/Console/Panels/Panels.csproj index 07f230df6..9b7969b5f 100644 --- a/examples/Console/Panels/Panels.csproj +++ b/examples/Console/Panels/Panels.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Panels Demonstrates how to render items in panels. Widgets diff --git a/examples/Console/Paths/Paths.csproj b/examples/Console/Paths/Paths.csproj index d6d9e16b6..e86a8cfbf 100644 --- a/examples/Console/Paths/Paths.csproj +++ b/examples/Console/Paths/Paths.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Paths Demonstrates how to render paths. Widgets diff --git a/examples/Console/Progress/Progress.csproj b/examples/Console/Progress/Progress.csproj index 06a9a2873..d34e3ec9e 100644 --- a/examples/Console/Progress/Progress.csproj +++ b/examples/Console/Progress/Progress.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Progress Demonstrates how to show progress bars. Status diff --git a/examples/Console/Prompt/Prompt.csproj b/examples/Console/Prompt/Prompt.csproj index 76e9f57c6..760579cd0 100644 --- a/examples/Console/Prompt/Prompt.csproj +++ b/examples/Console/Prompt/Prompt.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 9 Prompt Demonstrates how to get input from a user. diff --git a/examples/Console/Rules/Rules.csproj b/examples/Console/Rules/Rules.csproj index f4840367c..7bcddd420 100644 --- a/examples/Console/Rules/Rules.csproj +++ b/examples/Console/Rules/Rules.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Rules Demonstrates how to render horizontal rules (lines). Widgets diff --git a/examples/Console/Showcase/Showcase.csproj b/examples/Console/Showcase/Showcase.csproj index cdc667f0f..3944555ea 100644 --- a/examples/Console/Showcase/Showcase.csproj +++ b/examples/Console/Showcase/Showcase.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Showcase Demonstation of Spectre.Console. Misc diff --git a/examples/Console/Status/Status.csproj b/examples/Console/Status/Status.csproj index 96a7472cb..886f93477 100644 --- a/examples/Console/Status/Status.csproj +++ b/examples/Console/Status/Status.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Status Demonstrates how to show status updates. Status diff --git a/examples/Console/Tables/Tables.csproj b/examples/Console/Tables/Tables.csproj index 7ea8eb21d..bed52c6cc 100644 --- a/examples/Console/Tables/Tables.csproj +++ b/examples/Console/Tables/Tables.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Tables Demonstrates how to render tables in a console. Widgets diff --git a/examples/Console/Trees/Trees.csproj b/examples/Console/Trees/Trees.csproj index d933118b0..0517fab11 100644 --- a/examples/Console/Trees/Trees.csproj +++ b/examples/Console/Trees/Trees.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 Trees Demonstrates how to render trees in a console. Widgets diff --git a/examples/Shared/Shared.csproj b/examples/Shared/Shared.csproj index 358378de8..b7c9678e6 100644 --- a/examples/Shared/Shared.csproj +++ b/examples/Shared/Shared.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false enable diff --git a/global.json b/global.json index 0b738cd89..70e3dcc50 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.400" + "version": "7.0.100" } } diff --git a/resources/scripts/Generator/Generator.csproj b/resources/scripts/Generator/Generator.csproj index b63f006c4..7b9238034 100644 --- a/resources/scripts/Generator/Generator.csproj +++ b/resources/scripts/Generator/Generator.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net7.0 default diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 64057c44e..6bf853f6b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,12 +32,12 @@ - + All - + All diff --git a/src/Spectre.Console.Analyzer.Sandbox/Spectre.Console.Analyzer.Sandbox.csproj b/src/Spectre.Console.Analyzer.Sandbox/Spectre.Console.Analyzer.Sandbox.csproj index 3f799ca9b..9ca43306b 100644 --- a/src/Spectre.Console.Analyzer.Sandbox/Spectre.Console.Analyzer.Sandbox.csproj +++ b/src/Spectre.Console.Analyzer.Sandbox/Spectre.Console.Analyzer.Sandbox.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 diff --git a/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj b/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj index 42fe92248..99623d2b3 100644 --- a/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj +++ b/src/Spectre.Console.Cli/Spectre.Console.Cli.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net7.0;net6.0;netstandard2.0 enable true SA1633 @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj b/src/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj index 5564af283..8b57cac4f 100644 --- a/src/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj +++ b/src/Spectre.Console.ImageSharp/Spectre.Console.ImageSharp.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net7.0;net6.0;netstandard2.0 enable true A library that extends Spectre.Console with ImageSharp superpowers. diff --git a/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj b/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj index 851b890d5..c182429f9 100644 --- a/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj +++ b/src/Spectre.Console.Testing/Spectre.Console.Testing.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net7.0;net6.0;netstandard2.0 false enable true diff --git a/src/Spectre.Console/Extensions/EnumerableExtensions.cs b/src/Spectre.Console/Extensions/EnumerableExtensions.cs index ba43319e6..b41d4c7bc 100644 --- a/src/Spectre.Console/Extensions/EnumerableExtensions.cs +++ b/src/Spectre.Console/Extensions/EnumerableExtensions.cs @@ -110,7 +110,7 @@ public static IEnumerable SelectIndex(this IEnumerable s return source.Select((value, index) => func(value, index)); } -#if !NET5_0_OR_GREATER +#if !NET6_0_OR_GREATER public static IEnumerable<(TFirst First, TSecond Second)> Zip( this IEnumerable source, IEnumerable first) { diff --git a/src/Spectre.Console/Internal/Colors/ColorSystemDetector.cs b/src/Spectre.Console/Internal/Colors/ColorSystemDetector.cs index 67d8c712c..06ca25300 100644 --- a/src/Spectre.Console/Internal/Colors/ColorSystemDetector.cs +++ b/src/Spectre.Console/Internal/Colors/ColorSystemDetector.cs @@ -64,7 +64,7 @@ private static bool GetWindowsVersionInformation(out int major, out int build) return false; } -#if NET5_0_OR_GREATER +#if NET6_0_OR_GREATER // The reason we're not always using this, is because it will return wrong values on other runtimes than .NET 5+ // See https://docs.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/5.0/environment-osversion-returns-correct-version var version = Environment.OSVersion.Version; diff --git a/src/Spectre.Console/Spectre.Console.csproj b/src/Spectre.Console/Spectre.Console.csproj index ac3494f41..d3ec1c92d 100644 --- a/src/Spectre.Console/Spectre.Console.csproj +++ b/src/Spectre.Console/Spectre.Console.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net7.0;net6.0;netstandard2.0 enable true SA1633 @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 88ea54502..7d0d62ad7 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -9,7 +9,7 @@ All - + All diff --git a/test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj b/test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj index 06e7fc722..67f58742a 100644 --- a/test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj +++ b/test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj @@ -1,8 +1,8 @@ - net6.0;net48 - net6.0 + net7.0;net48 + net7.0 @@ -14,10 +14,9 @@ - - - - + + + all @@ -31,15 +30,15 @@ - - - $([System.String]::Copy('%(FileName)').Split('.')[0]) - %(ParentFile).cs - - - $([System.String]::Copy('%(FileName)').Split('.')[0]) - %(ParentFile).cs - + + + $([System.String]::Copy('%(FileName)').Split('.')[0]) + %(ParentFile).cs + + + $([System.String]::Copy('%(FileName)').Split('.')[0]) + %(ParentFile).cs + diff --git a/test/Spectre.Console.Cli.Tests/Utilities/ModuleInitializerAttribute.cs b/test/Spectre.Console.Cli.Tests/Utilities/ModuleInitializerAttribute.cs index 6f93cb48c..5b84da221 100644 --- a/test/Spectre.Console.Cli.Tests/Utilities/ModuleInitializerAttribute.cs +++ b/test/Spectre.Console.Cli.Tests/Utilities/ModuleInitializerAttribute.cs @@ -1,4 +1,4 @@ -#if !NET5_0_OR_GREATER +#if !NET6_0_OR_GREATER namespace System.Runtime.CompilerServices; [AttributeUsage(AttributeTargets.Method, Inherited = false)] diff --git a/test/Spectre.Console.Cli.Tests/VerifyConfiguration.cs b/test/Spectre.Console.Cli.Tests/VerifyConfiguration.cs index 770ec2bde..b3261c23f 100644 --- a/test/Spectre.Console.Cli.Tests/VerifyConfiguration.cs +++ b/test/Spectre.Console.Cli.Tests/VerifyConfiguration.cs @@ -5,6 +5,6 @@ public static class VerifyConfiguration [ModuleInitializer] public static void Init() { - VerifierSettings.DerivePathInfo(Expectations.Initialize); + Verifier.DerivePathInfo(Expectations.Initialize); } } diff --git a/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj b/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj index c450b0245..03422532e 100644 --- a/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj +++ b/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj @@ -1,8 +1,8 @@ - net6.0;net48 - net6.0 + net7.0;net48 + net7.0 @@ -18,10 +18,9 @@ - - - - + + + all diff --git a/test/Spectre.Console.Tests/Unit/StyleTests.cs b/test/Spectre.Console.Tests/Unit/StyleTests.cs index 5213ed9ae..e75ce2095 100644 --- a/test/Spectre.Console.Tests/Unit/StyleTests.cs +++ b/test/Spectre.Console.Tests/Unit/StyleTests.cs @@ -302,7 +302,7 @@ public void Should_Return_Error_If_Color_Number_Is_Invalid(string style, string [InlineData("rgb(255)", "Invalid RGB color 'rgb(255)'.")] [InlineData("rgb(255,255)", "Invalid RGB color 'rgb(255,255)'.")] [InlineData("rgb(255,255,255", "Invalid RGB color 'rgb(255,255,255'.")] - [InlineData("rgb(A,B,C)", "Invalid RGB color 'rgb(A,B,C)'. Input string was not in a correct format.")] + [InlineData("rgb(A,B,C)", "Invalid RGB color 'rgb(A,B,C)'.")] public void Should_Return_Error_If_Rgb_Color_Is_Invalid(string style, string expected) { // Given, When @@ -310,7 +310,7 @@ public void Should_Return_Error_If_Rgb_Color_Is_Invalid(string style, string exp // Then result.ShouldNotBeNull(); - result.Message.ShouldBe(expected); + result.Message.ShouldStartWith(expected); } } diff --git a/test/Spectre.Console.Tests/Utilities/ModuleInitializerAttribute.cs b/test/Spectre.Console.Tests/Utilities/ModuleInitializerAttribute.cs index 6f93cb48c..5b84da221 100644 --- a/test/Spectre.Console.Tests/Utilities/ModuleInitializerAttribute.cs +++ b/test/Spectre.Console.Tests/Utilities/ModuleInitializerAttribute.cs @@ -1,4 +1,4 @@ -#if !NET5_0_OR_GREATER +#if !NET6_0_OR_GREATER namespace System.Runtime.CompilerServices; [AttributeUsage(AttributeTargets.Method, Inherited = false)] diff --git a/test/Spectre.Console.Tests/VerifyConfiguration.cs b/test/Spectre.Console.Tests/VerifyConfiguration.cs index 770ec2bde..b3261c23f 100644 --- a/test/Spectre.Console.Tests/VerifyConfiguration.cs +++ b/test/Spectre.Console.Tests/VerifyConfiguration.cs @@ -5,6 +5,6 @@ public static class VerifyConfiguration [ModuleInitializer] public static void Init() { - VerifierSettings.DerivePathInfo(Expectations.Initialize); + Verifier.DerivePathInfo(Expectations.Initialize); } }