Update dependencies

patriksvensson · patriksvensson · commit aaa000b25911 · 2022-02-10T13:23:32.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.202
+          dotnet-version: 6.0.101
 
       - name: Build
         shell: bash
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -48,7 +48,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.202
+          dotnet-version: 6.0.101
 
       - name: Build
         shell: bash
@@ -78,7 +78,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.202
+          dotnet-version: 6.0.101
 
       - name: Publish
         shell: bash
diff --git a/build.cake b/build.cake
@@ -7,10 +7,10 @@ var configuration = Argument("configuration", "Release");
 Task("Build")
     .Does(context => 
 {
-    DotNetCoreBuild("./src/RadLine.sln", new DotNetCoreBuildSettings {
+    DotNetBuild("./src/RadLine.sln", new DotNetBuildSettings {
         Configuration = configuration,
         NoIncremental = context.HasArgument("rebuild"),
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 });
@@ -19,7 +19,7 @@ Task("Test")
     .IsDependentOn("Build")
     .Does(context => 
 {
-    DotNetCoreTest("./src/RadLine.Tests/RadLine.Tests.csproj", new DotNetCoreTestSettings {
+    DotNetTest("./src/RadLine.Tests/RadLine.Tests.csproj", new DotNetTestSettings {
         Configuration = configuration,
         NoRestore = true,
         NoBuild = true,
@@ -32,12 +32,12 @@ Task("Package")
 {
     context.CleanDirectory("./.artifacts");
 
-    context.DotNetCorePack($"./src/RadLine.sln", new DotNetCorePackSettings {
+    context.DotNetPack($"./src/RadLine.sln", new DotNetPackSettings {
         Configuration = configuration,
         NoRestore = true,
         NoBuild = true,
         OutputDirectory = "./.artifacts",
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 });
@@ -56,7 +56,7 @@ Task("Publish-NuGet")
     foreach(var file in context.GetFiles("./.artifacts/*.nupkg")) 
     {
         context.Information("Publishing {0}...", file.GetFilename().FullPath);
-        DotNetCoreNuGetPush(file.FullPath, new DotNetCoreNuGetPushSettings
+        DotNetNuGetPush(file.FullPath, new DotNetNuGetPushSettings
         {
             Source = "https://api.nuget.org/v3/index.json",
             ApiKey = apiKey,
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.1.0",
+      "version": "2.0.0",
       "commands": [
         "dotnet-cake"
       ]
     },
     "dotnet-example": {
-      "version": "1.3.1",
+      "version": "1.6.0",
       "commands": [
         "dotnet-example"
       ]
diff --git a/examples/Demo/Demo.csproj b/examples/Demo/Demo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/examples/Demo/Program.cs b/examples/Demo/Program.cs
@@ -50,7 +50,7 @@ public static async Task Main()
 
             // Write the buffer
             AnsiConsole.WriteLine();
-            AnsiConsole.Render(new Panel(result.EscapeMarkup())
+            AnsiConsole.Write(new Panel(result.EscapeMarkup())
                 .Header("[yellow]Text:[/]")
                 .RoundedBorder());
         }
diff --git a/examples/Repl/Program.cs b/examples/Repl/Program.cs
@@ -21,7 +21,7 @@ public static async Task Main()
                 AnsiConsole.MarkupLine("The terminal does not support ANSI codes, or it isn't a terminal.");
             }
 
-            AnsiConsole.Render(new FigletText("JS REPL"));
+            AnsiConsole.Write(new FigletText("JS REPL"));
             AnsiConsole.MarkupLine("Type [yellow]exit[/] to leave, " +
                 "[yellow]print([grey]obj[/])[/] to write to the console, " +
                 "[yellow]load([grey]'path'[/])[/] to load scripts.");
@@ -84,7 +84,7 @@ private static void Evaluate(JavaScriptEngine engine, string source)
 
         private static void Print(string message, Color color)
         {
-            AnsiConsole.Render(
+            AnsiConsole.Write(
                 new Padder(
                     new Panel(message).BorderColor(color),
                     new Padding(2, 0)));
diff --git a/examples/Repl/Repl.csproj b/examples/Repl/Repl.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "projects": [ "src" ],
   "sdk": {
-    "version": "5.0.202",
-    "rollForward": "latestPatch"
+    "version": "6.0.101",
+    "rollForward": "latestFeature"
   }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -31,9 +31,9 @@
   </PropertyGroup>
   
   <ItemGroup Label="Package References">
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.4.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.5.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/RadLine.Tests/RadLine.Tests.csproj b/src/RadLine.Tests/RadLine.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,15 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
-    <PackageReference Include="Spectre.Console.Testing" Version="0.39.1-preview.0.31" />
+    <PackageReference Include="Spectre.Console.Testing" Version="0.43.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -29,4 +29,8 @@
     <ProjectReference Include="..\RadLine\RadLine.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="Roslynator.Analyzers" Version="4.0.2" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/RadLine/RadLine.csproj b/src/RadLine/RadLine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
@@ -13,12 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Spectre.Console" Version="0.39.1-preview.0.13" />
-    <PackageReference Include="IsExternalInit" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="Nullable" Version="1.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Spectre.Console" Version="0.43" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Roslynator.Analyzers" Version="4.0.2" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static async Task Main()`
`50`	`50`
`51`	`51`	`// Write the buffer`
`52`	`52`	`AnsiConsole.WriteLine();`
`53`		`- AnsiConsole.Render(new Panel(result.EscapeMarkup())`
	`53`	`+ AnsiConsole.Write(new Panel(result.EscapeMarkup())`
`54`	`54`	`.Header("[yellow]Text:[/]")`
`55`	`55`	`.RoundedBorder());`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"projects": [ "src" ],`
`3`	`3`	`"sdk": {`
`4`		`- "version": "5.0.202",`
`5`		`- "rollForward": "latestPatch"`
	`4`	`+ "version": "6.0.101",`
	`5`	`+ "rollForward": "latestFeature"`
`6`	`6`	`}`
`7`	`7`	`}`