Add support for .NET 7.0

spectreconsole · Nov 9, 2022 · fabec1d · fabec1d
1 parent 02f9d26
commit fabec1d
Show file tree

Hide file tree

Showing 54 changed files with 79 additions and 81 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
     <DefaultItemExcludes>$(DefaultItemExcludes);output\**;.gitignore</DefaultItemExcludes>
     <NoWarn>MVC1000</NoWarn>

diff --git 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
@@ -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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Delegates</ExampleName>
     <ExampleDescription>Demonstrates how to specify commands as delegates.</ExampleDescription>

diff --git a/examples/Cli/Demo/Demo.csproj b/examples/Cli/Demo/Demo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Demo</ExampleName>
     <ExampleDescription>Demonstrates the most common use cases of Spectre.Cli.</ExampleDescription>

diff --git a/examples/Cli/Dynamic/Dynamic.csproj b/examples/Cli/Dynamic/Dynamic.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Dynamic</ExampleName>
     <ExampleDescription>Demonstrates how to define dynamic commands.</ExampleDescription>

diff --git a/examples/Cli/Injection/Injection.csproj b/examples/Cli/Injection/Injection.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Injection</ExampleName>
     <ExampleDescription>Demonstrates how to use dependency injection with Spectre.Cli.</ExampleDescription>

diff --git a/examples/Cli/Logging/Logging.csproj b/examples/Cli/Logging/Logging.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Logging</ExampleName>
     <ExampleDescription>Demonstrates how to dynamically configure Serilog for logging using parameters from a command.</ExampleDescription>

diff --git a/examples/Console/AlternateScreen/AlternateScreen.csproj b/examples/Console/AlternateScreen/AlternateScreen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Screens</ExampleTitle>
     <ExampleDescription>Demonstrates how to use alternate screens.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Borders/Borders.csproj b/examples/Console/Borders/Borders.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Borders</ExampleTitle>
     <ExampleDescription>Demonstrates the different kind of borders.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Calendars/Calendars.csproj b/examples/Console/Calendars/Calendars.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Calendars</ExampleTitle>
     <ExampleDescription>Demonstrates how to render calendars.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Canvas/Canvas.csproj b/examples/Console/Canvas/Canvas.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Canvas</ExampleTitle>
     <ExampleDescription>Demonstrates how to render pixels and images.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Charts/Charts.csproj b/examples/Console/Charts/Charts.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Charts</ExampleTitle>
     <ExampleDescription>Demonstrates how to render charts in a console.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Colors/Colors.csproj b/examples/Console/Colors/Colors.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Colors</ExampleTitle>
     <ExampleDescription>Demonstrates how to use [yellow]c[/][red]o[/][green]l[/][blue]o[/][aqua]r[/][lime]s[/] in the console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Columns/Columns.csproj b/examples/Console/Columns/Columns.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Columns</ExampleTitle>
     <ExampleDescription>Demonstrates how to render data into columns.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Cursor/Cursor.csproj b/examples/Console/Cursor/Cursor.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Cursor</ExampleTitle>
     <ExampleDescription>Demonstrates how to move the cursor.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Emojis/Emojis.csproj b/examples/Console/Emojis/Emojis.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Emojis</ExampleTitle>
     <ExampleDescription>Demonstrates how to render emojis.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Exceptions/Exceptions.csproj b/examples/Console/Exceptions/Exceptions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Exceptions</ExampleTitle>
     <ExampleDescription>Demonstrates how to render formatted exceptions.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Figlet/Figlet.csproj b/examples/Console/Figlet/Figlet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Figlet</ExampleTitle>
     <ExampleDescription>Demonstrates how to render FIGlet text.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Grids/Grids.csproj b/examples/Console/Grids/Grids.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Grids</ExampleTitle>
     <ExampleDescription>Demonstrates how to render grids in a console.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Info/Info.csproj b/examples/Console/Info/Info.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Info</ExampleTitle>
     <ExampleDescription>Displays the capabilities of the current console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Links/Links.csproj b/examples/Console/Links/Links.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Links</ExampleTitle>
     <ExampleDescription>Demonstrates how to render links in a console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Live/Live.csproj b/examples/Console/Live/Live.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Live</ExampleTitle>
     <ExampleDescription>Demonstrates how to do live updates.</ExampleDescription>
     <ExampleGroup>Live</ExampleGroup>

diff --git a/examples/Console/LiveTable/LiveTable.csproj b/examples/Console/LiveTable/LiveTable.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>LiveTable</ExampleTitle>
     <ExampleDescription>Demonstrates how to do live updates in a table.</ExampleDescription>
     <ExampleGroup>Live</ExampleGroup>

diff --git a/examples/Console/Minimal/Minimal.csproj b/examples/Console/Minimal/Minimal.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <ExampleTitle>Minimal</ExampleTitle>
     <ExampleDescription>Demonstrates a minimal console application.</ExampleDescription>

diff --git a/examples/Console/Panels/Panels.csproj b/examples/Console/Panels/Panels.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Panels</ExampleTitle>
     <ExampleDescription>Demonstrates how to render items in panels.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Paths/Paths.csproj b/examples/Console/Paths/Paths.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Paths</ExampleTitle>
     <ExampleDescription>Demonstrates how to render paths.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Progress/Progress.csproj b/examples/Console/Progress/Progress.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Progress</ExampleTitle>
     <ExampleDescription>Demonstrates how to show progress bars.</ExampleDescription>
     <ExampleGroup>Status</ExampleGroup>

diff --git a/examples/Console/Prompt/Prompt.csproj b/examples/Console/Prompt/Prompt.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>9</LangVersion>
     <ExampleTitle>Prompt</ExampleTitle>
     <ExampleDescription>Demonstrates how to get input from a user.</ExampleDescription>

diff --git a/examples/Console/Rules/Rules.csproj b/examples/Console/Rules/Rules.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Rules</ExampleTitle>
     <ExampleDescription>Demonstrates how to render horizontal rules (lines).</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Showcase/Showcase.csproj b/examples/Console/Showcase/Showcase.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Showcase</ExampleTitle>
     <ExampleDescription>Demonstation of Spectre.Console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

diff --git a/examples/Console/Status/Status.csproj b/examples/Console/Status/Status.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Status</ExampleTitle>
     <ExampleDescription>Demonstrates how to show status updates.</ExampleDescription>
     <ExampleGroup>Status</ExampleGroup>

diff --git a/examples/Console/Tables/Tables.csproj b/examples/Console/Tables/Tables.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Tables</ExampleTitle>
     <ExampleDescription>Demonstrates how to render tables in a console.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

diff --git a/examples/Console/Trees/Trees.csproj b/examples/Console/Trees/Trees.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Trees</ExampleTitle>
     <ExampleDescription>Demonstrates how to render trees in a console.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

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

diff --git 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
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -32,12 +32,12 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.1.0" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="4.2.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Analyzers" Version="4.1.1">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.1.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git 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 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="Properties/stylecop.json" />