net8.0

nightroman · Nov 19, 2023 · c5aba35 · c5aba35
1 parent e3ffb96
commit c5aba35
Show file tree

Hide file tree

Showing 242 changed files with 1,418 additions and 2,046 deletions.
diff --git a/.build.ps1 b/.build.ps1
@@ -6,7 +6,7 @@
 param(
 	$Platform = (property Platform x64),
 	$Configuration = (property Configuration Release),
-	$TargetFramework = (property TargetFramework net7.0)
+	$TargetFramework = (property TargetFramework net8.0)
 )
 
 $FarHome = "C:\Bin\Far\$Platform"

diff --git a/CopyColor/.build.ps1 b/CopyColor/.build.ps1
@@ -20,8 +20,8 @@ task build meta, {
 task publish {
 	$null = mkdir $ModuleRoot -Force
 	Copy-Item -Destination $ModuleRoot @(
-		"bin\$Configuration\net7.0-windows\$ModuleName.dll"
-		"bin\$Configuration\net7.0-windows\$ModuleName.pdb"
+		"bin\$Configuration\net8.0-windows\$ModuleName.dll"
+		"bin\$Configuration\net8.0-windows\$ModuleName.pdb"
 	)
 }
 

diff --git a/CopyColor/CopyColor.csproj b/CopyColor/CopyColor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <FarHome Condition="'$(FarHome)' == ''">C:\Bin\Far\x64</FarHome>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>

diff --git a/CopyColor/History.txt b/CopyColor/History.txt
@@ -1,5 +1,9 @@
 https://www.nuget.org/packages/FarNet.CopyColor
 
+= 5.0.0 =
+
+Requires FarNet 8
+
 = 4.0.2 =
 
 Use ClipboardHelper by Arthur Teplitzki.

diff --git a/CopyColor/TheTool.cs b/CopyColor/TheTool.cs
@@ -14,7 +14,7 @@ public class TheTool : ModuleTool
 {
 	const string ModuleName = "CopyColor";
 	readonly static Guid Colorer = new("d2f36b62-a470-418d-83a3-ed7a3710e5b5");
-	readonly static string[] Colors = { "#000000", "#000080", "#008000", "#008080", "#800000", "#800080", "#808000", "#c0c0c0", "#808080", "#0000ff", "#00ff00", "#00ffff", "#ff0000", "#ff00ff", "#ffff00", "#ffffff", };
+	readonly static string[] Colors = ["#000000", "#000080", "#008000", "#008080", "#800000", "#800080", "#808000", "#c0c0c0", "#808080", "#0000ff", "#00ff00", "#00ffff", "#ff0000", "#ff00ff", "#ffff00", "#ffffff",];
 
 	static string EncodeHtml(string html)
 	{

diff --git a/Drawer/.build.ps1 b/Drawer/.build.ps1
@@ -20,8 +20,8 @@ task build meta, {
 task publish {
 	$null = mkdir $ModuleRoot -Force
 	Copy-Item -Destination $ModuleRoot @(
-		"bin\$Configuration\net7.0\$ModuleName.dll"
-		"bin\$Configuration\net7.0\$ModuleName.pdb"
+		"bin\$Configuration\net8.0\$ModuleName.dll"
+		"bin\$Configuration\net8.0\$ModuleName.pdb"
 	)
 }
 

diff --git a/Drawer/CurrentWordDrawer.cs b/Drawer/CurrentWordDrawer.cs
@@ -12,7 +12,7 @@ namespace FarNet.Drawer;
 [ModuleDrawer(Name = Settings.CurrentWordName, Priority = 2, Id = Settings.CurrentWordGuid)]
 public class CurrentWordDrawer : ModuleDrawer
 {
-	EditorColor NewColorKeepForeground(int lineIndex, int start, int end, ConsoleColor fg, ConsoleColor bg)
+	static EditorColor NewColorKeepForeground(int lineIndex, int start, int end, ConsoleColor fg, ConsoleColor bg)
 	{
 		if (bg == ConsoleColor.Yellow)
 		{

diff --git a/Drawer/Drawer.csproj b/Drawer/Drawer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <FarHome Condition="'$(FarHome)' == ''">C:\Bin\Far\x64</FarHome>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FarNet">

diff --git a/Drawer/History.txt b/Drawer/History.txt
@@ -1,5 +1,9 @@
 https://www.nuget.org/packages/FarNet.Drawer
 
+= 4.0.0 =
+
+Requires FarNet 8
+
 = 3.0.1 =
 
 master -> main, update links.

diff --git a/Drawer/Settings.cs b/Drawer/Settings.cs
@@ -34,7 +34,7 @@ public class CurrentWord
 
 	public class FixedColumn
 	{
-		public int[] ColumnNumbers { get; set; } = new int[] { 80, 120 };
+		public int[] ColumnNumbers { get; set; } = [80, 120];
 
 		public ConsoleColor ColorForeground { get; set; } = ConsoleColor.Black;
 

diff --git a/EditorKit/EditorKit.csproj b/EditorKit/EditorKit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <FarHome Condition="'$(FarHome)' == ''">C:\Bin\Far\x64</FarHome>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
   <ItemGroup>

diff --git a/EditorKit/History.txt b/EditorKit/History.txt
@@ -1,5 +1,9 @@
 https://www.nuget.org/packages/FarNet.EditorKit
 
+= 2.0.0 =
+
+Requires FarNet 8
+
 = 1.0.2 =
 
 editorconfig 0.14.0

diff --git a/Explore/.build.ps1 b/Explore/.build.ps1
@@ -20,8 +20,8 @@ task build meta, {
 task publish {
 	$null = mkdir $ModuleRoot -Force
 	Copy-Item -Destination $ModuleRoot @(
-		"bin\$Configuration\net7.0\$ModuleName.dll"
-		"bin\$Configuration\net7.0\$ModuleName.pdb"
+		"bin\$Configuration\net8.0\$ModuleName.dll"
+		"bin\$Configuration\net8.0\$ModuleName.pdb"
 	)
 }
 

diff --git a/Explore/Explore.csproj b/Explore/Explore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <FarHome Condition="'$(FarHome)' == ''">C:\Bin\Far\x64</FarHome>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="$(FarHome)\FarNet\FarNet.dll">

diff --git a/Explore/History.txt b/Explore/History.txt
@@ -1,5 +1,9 @@
 https://www.nuget.org/packages/FarNet.Explore
 
+= 5.0.0 =
+
+Requires FarNet 8
+
 = 4.0.2 =
 
 Parameters

diff --git a/Explore/TheCommand.cs b/Explore/TheCommand.cs
@@ -22,8 +22,7 @@ public override void Invoke(object sender, ModuleCommandEventArgs e)
 		}
 
 		// the module panel
-		Panel panel = Far.Api.Panel as Panel;
-		if (panel == null)
+		if (Far.Api.Panel is not Panel panel)
 		{
 			Far.Api.Message("This is not a module panel.");
 			return;
@@ -33,16 +32,15 @@ public override void Invoke(object sender, ModuleCommandEventArgs e)
 		var search = new SearchFileCommand(panel.Explorer);
 
 		// parameters
-		var parameters = new string[]
-		{
+		string[] parameters = [
 			"-Asynchronous",
 			"-Depth",
 			"-Directory",
 			"-File",
 			"-Recurse",
 			"-XFile",
 			"-XPath",
-		};
+		];
 
 		// parse, setup the search
 		bool async = false;
@@ -61,7 +59,7 @@ public override void Invoke(object sender, ModuleCommandEventArgs e)
 				if (!Far.Api.IsMaskValid(mask))
 					throw new ModuleException("Invalid mask.");
 
-				search.Filter = delegate(Explorer explorer, FarFile file)
+				search.Filter = delegate (Explorer explorer, FarFile file)
 				{
 					return Far.Api.IsMaskMatch(file.Name, mask);
 				};

diff --git a/FSharpFar/History.txt b/FSharpFar/History.txt
@@ -1,5 +1,11 @@
 https://www.nuget.org/packages/FarNet.FSharpFar
 
+= 4.0.0 =
+
+Requires .NET 8.0, FarNet 8.0.0
+
+Keep several open sessions again.
+
 = 3.1.1 =
 
 FSharp.Core 7.0.401

diff --git a/FSharpFar/src/FSharpFar/Config.fs b/FSharpFar/src/FSharpFar/Config.fs
@@ -140,7 +140,7 @@ module Config =
         addProperty "StartProgram" (getFarExePath ())
 
         //! use `windows` or charting is not happy
-        addProperty "TargetFramework" "net7.0-windows"
+        addProperty "TargetFramework" "net8.0-windows"
         addProperty "UseWindowsForms" "true"
         addProperty "DisableImplicitFSharpCoreReference" "true"
 

diff --git a/FSharpFar/src/FSharpFar/FSharpFar.fsproj b/FSharpFar/src/FSharpFar/FSharpFar.fsproj
@@ -3,7 +3,7 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <FarHome Condition="'$(FarHome)' == ''">C:\Bin\Far\x64</FarHome>
     <MyOutDir>$(FarHome)\FarNet\Modules\$(AssemblyName)</MyOutDir>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <WarningLevel>5</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -41,8 +41,8 @@
       <HintPath>$(FarHome)\FarNet\FarNet.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <PackageReference Include="FSharp.Core" Version="7.0.401" />
-    <PackageReference Include="FSharp.Compiler.Service" Version="43.7.401" />
+    <PackageReference Include="FSharp.Core" Version="8.0.100" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="43.8.100" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="ib publish -Configuration $(Configuration) -FarHome $(FarHome)" />