From 2b90594e2b3809d9bf8266e259d32cc95e946cb5 Mon Sep 17 00:00:00 2001
From: Dmytro Kyshchenko <sys2712@gmail.com>
Date: Wed, 15 Nov 2023 11:41:09 +0200
Subject: [PATCH] #743 - Upgrade to .NET 8.

---
 CI/azure-pipelines.yml                 |  4 ++--
 Directory.Packages.props               |  2 +-
 xFunc.Benchmark/xFunc.Benchmark.csproj |  2 +-
 xFunc.Cli/xFunc.Cli.csproj             |  2 +-
 xFunc.Tests/xFunc.Tests.csproj         |  2 +-
 xFunc.TrimTest/Program.cs              |  6 ------
 xFunc.TrimTest/xFunc.TrimTest.csproj   | 22 ----------------------
 xFunc.sln                              | 14 ++++----------
 8 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 xFunc.TrimTest/Program.cs
 delete mode 100644 xFunc.TrimTest/xFunc.TrimTest.csproj

diff --git a/CI/azure-pipelines.yml b/CI/azure-pipelines.yml
index bd7f3304b..2e3750e76 100644
--- a/CI/azure-pipelines.yml
+++ b/CI/azure-pipelines.yml
@@ -23,10 +23,10 @@ jobs:
 
     steps:
     - task: UseDotNet@2
-      displayName: 'Install .NET 7'
+      displayName: 'Install .NET 8'
       inputs:
         packageType: 'sdk'
-        version: '7.0.x'
+        version: '8.0.x'
 
     - task: DotNetCoreCLI@2
       displayName: 'dotnet restore'
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 124c97a6f..943bf24d1 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <PackageVersion Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
-    <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.10" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
diff --git a/xFunc.Benchmark/xFunc.Benchmark.csproj b/xFunc.Benchmark/xFunc.Benchmark.csproj
index 8c22423f6..c94a22e89 100644
--- a/xFunc.Benchmark/xFunc.Benchmark.csproj
+++ b/xFunc.Benchmark/xFunc.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/xFunc.Cli/xFunc.Cli.csproj b/xFunc.Cli/xFunc.Cli.csproj
index ca68b8e00..9fe92047d 100644
--- a/xFunc.Cli/xFunc.Cli.csproj
+++ b/xFunc.Cli/xFunc.Cli.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>xfunc</ToolCommandName>    
diff --git a/xFunc.Tests/xFunc.Tests.csproj b/xFunc.Tests/xFunc.Tests.csproj
index adb0c3e53..3aca3c04b 100644
--- a/xFunc.Tests/xFunc.Tests.csproj
+++ b/xFunc.Tests/xFunc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <RootNamespace>xFunc.Tests</RootNamespace>
diff --git a/xFunc.TrimTest/Program.cs b/xFunc.TrimTest/Program.cs
deleted file mode 100644
index 69a909d25..000000000
--- a/xFunc.TrimTest/Program.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using xFunc.Maths;
-
-var processor = new Processor();
-var result = processor.Solve("sin(90)");
-
-Console.WriteLine(result);
\ No newline at end of file
diff --git a/xFunc.TrimTest/xFunc.TrimTest.csproj b/xFunc.TrimTest/xFunc.TrimTest.csproj
deleted file mode 100644
index 2e8e16680..000000000
--- a/xFunc.TrimTest/xFunc.TrimTest.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <IsPackable>false</IsPackable>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimmerDefaultAction>link</TrimmerDefaultAction>
-    <RuntimeIdentifier>osx.10.12-arm64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\xFunc.Maths\xFunc.Maths.csproj" />
-    <TrimmerRootAssembly Include="xFunc.Maths" />
-  </ItemGroup>
-
-</Project>
diff --git a/xFunc.sln b/xFunc.sln
index a85e5a823..6741aba3b 100644
--- a/xFunc.sln
+++ b/xFunc.sln
@@ -23,12 +23,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CI", "CI", "{7D6A31E3-42CF-49E7-A0D2-657A460388BC}"
-ProjectSection(SolutionItems) = preProject
-	CI\azure-pipelines.yml = CI\azure-pipelines.yml
-	CI\codecov.yml = CI\codecov.yml
-EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xFunc.TrimTest", "xFunc.TrimTest\xFunc.TrimTest.csproj", "{C487368F-E25F-4EF6-B6F7-4485205E36E7}"
+	ProjectSection(SolutionItems) = preProject
+		CI\azure-pipelines.yml = CI\azure-pipelines.yml
+		CI\codecov.yml = CI\codecov.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,10 +50,6 @@ Global
 		{EC5FB562-9BFE-4BD9-A3E4-666D3021AF1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC5FB562-9BFE-4BD9-A3E4-666D3021AF1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC5FB562-9BFE-4BD9-A3E4-666D3021AF1F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C487368F-E25F-4EF6-B6F7-4485205E36E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C487368F-E25F-4EF6-B6F7-4485205E36E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C487368F-E25F-4EF6-B6F7-4485205E36E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C487368F-E25F-4EF6-B6F7-4485205E36E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE