Merge pull request #187 from jediwhale/dotnet8

Dotnet 8 Update
jediwhale · Nov 17, 2023 · f24d603 · f24d603
2 parents e7fc733 + eac103c
commit f24d603
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 39 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,9 +13,9 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.X
             6.0.X
             7.0.X
+            8.0.X
       - name: Install dependencies
         run: dotnet msbuild -target:restore .\build.proj
       - name: Build

diff --git a/build.proj b/build.proj
@@ -41,18 +41,6 @@
       source\dbfitOracle\bin\release\net48\dbfit.oracle.dll;
       source\dbfitSqlServer\bin\release\net48\dbfit.sqlserver.dll;
       source\dbfitSybase\bin\release\net48\dbfit.sybase.dll;"/>
-    <NetcoreFiles Include="
-      source\fitSharp\bin\release\netcoreapp3.1\fitSharp.dll;
-      source\fit\bin\release\netcoreapp3.1\fit.dll;
-      source\Runner\bin\release\netcoreapp3.1\Runner.dll;
-      source\Runner\bin\release\netcoreapp3.1\Runner.runtimeconfig.json;
-      source\RunnerW\bin\release\netcoreapp3.1\RunnerW.dll;
-      source\RunnerW\bin\release\netcoreapp3.1\RunnerW.runtimeconfig.json;
-      source\dbfit\bin\release\netcoreapp3.1\dbfit.dll;
-      source\dbfitMySql\bin\release\netcoreapp3.1\dbfit.mysql.dll;
-      source\dbfitOracle\bin\release\netcoreapp3.1\dbfit.oracle.dll;
-      source\dbfitSqlServer\bin\release\netcoreapp3.1\dbfit.sqlserver.dll;
-      source\dbfitSybase\bin\release\netcoreapp3.1\dbfit.sybase.dll;"/>
      <Net6Files Include="
       source\fitSharp\bin\release\net6.0\fitSharp.dll;
       source\fit\bin\release\net6.0\fit.dll;
@@ -97,14 +85,37 @@
       source\dbfitOracle\bin\release\net7.0-windows\dbfit.oracle.dll;
       source\dbfitSqlServer\bin\release\net7.0-windows\dbfit.sqlserver.dll;
       source\dbfitSybase\bin\release\net7.0-windows\dbfit.sybase.dll;"/>
+     <Net8Files Include="
+      source\fitSharp\bin\release\net8.0\fitSharp.dll;
+      source\fit\bin\release\net8.0\fit.dll;
+      source\Runner\bin\release\net8.0\Runner.dll;
+      source\Runner\bin\release\net8.0\Runner.runtimeconfig.json;
+      source\dbfit\bin\release\net8.0\dbfit.dll;
+      source\dbfitMySql\bin\release\net8.0\dbfit.mysql.dll;
+      source\dbfitOracle\bin\release\net8.0\dbfit.oracle.dll;
+      source\dbfitSqlServer\bin\release\net8.0\dbfit.sqlserver.dll;
+      source\dbfitSybase\bin\release\net8.0\dbfit.sybase.dll;"/>
+     <Net8WinFiles Include="
+      source\fitSharp\bin\release\net8.0-windows\fitSharp.dll;
+      source\fit\bin\release\net8.0-windows\fit.dll;
+      source\Runner\bin\release\net8.0-windows\Runner.dll;
+      source\Runner\bin\release\net8.0-windows\Runner.runtimeconfig.json;
+      source\RunnerW\bin\release\net8.0-windows\RunnerW.dll;
+      source\RunnerW\bin\release\net8.0-windows\RunnerW.runtimeconfig.json;
+      source\dbfit\bin\release\net8.0-windows\dbfit.dll;
+      source\dbfitMySql\bin\release\net8.0-windows\dbfit.mysql.dll;
+      source\dbfitOracle\bin\release\net8.0-windows\dbfit.oracle.dll;
+      source\dbfitSqlServer\bin\release\net8.0-windows\dbfit.sqlserver.dll;
+      source\dbfitSybase\bin\release\net8.0-windows\dbfit.sybase.dll;"/>
    <Packages Include="nuget\*.nupkg" />
   </ItemGroup>
   <Copy SourceFiles="@(Netfx48Files)" DestinationFolder="nuget\lib\net48" />
-  <Copy SourceFiles="@(NetcoreFiles)" DestinationFolder="nuget\lib\netcoreapp3.1" />
   <Copy SourceFiles="@(Net6Files)" DestinationFolder="nuget\lib\net6.0" />
   <Copy SourceFiles="@(Net6WinFiles)" DestinationFolder="nuget\lib\net6.0-windows" />
   <Copy SourceFiles="@(Net7Files)" DestinationFolder="nuget\lib\net7.0" />
   <Copy SourceFiles="@(Net7WinFiles)" DestinationFolder="nuget\lib\net7.0-windows" />
+  <Copy SourceFiles="@(Net8Files)" DestinationFolder="nuget\lib\net8.0" />
+  <Copy SourceFiles="@(Net8WinFiles)" DestinationFolder="nuget\lib\net8.0-windows" />
   <Exec Command="..\binary\tools\nuget\nuget pack FitSharp.nuspec" WorkingDirectory="nuget"/>
   <Move SourceFiles="@(Packages)" DestinationFolder="binary" />
 </Target>

diff --git a/document/fitSharp/Fit/CompareFloatingPoint.html b/document/fitSharp/Fit/CompareFloatingPoint.html
@@ -25,6 +25,7 @@
 <tr><td>3</td><td>abandon story test</td></tr>
 <tr><td>6</td><td>abandon story test</td></tr>
 <tr><td>7</td><td>abandon story test</td></tr>
+<tr><td>8</td><td>abandon story test</td></tr>
 </table>
 <br>
 <table border="1" cellpadding="2" cellspacing="0">

diff --git a/global.json b/global.json
@@ -1,6 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.100",
-    "rollForward": "latestMinor"
+    "version": "8.0.100",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
   }
-}
+}
diff --git a/nuget/FitSharp.2022.11.13.nupkg b/nuget/FitSharp.2022.11.13.nupkg
diff --git a/source/Runner/Runner.csproj b/source/Runner/Runner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.Runner</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/RunnerW/RunnerW.csproj b/source/RunnerW/RunnerW.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/Samples/Samples.csproj b/source/Samples/Samples.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.Samples</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/StoryTest/StoryTest.csproj b/source/StoryTest/StoryTest.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <RootNamespace>fitSharp.StoryTest</RootNamespace>
-        <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
         <Deterministic>false</Deterministic>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     </PropertyGroup>

diff --git a/source/TestTarget/TestTarget.csproj b/source/TestTarget/TestTarget.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.TestTarget</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent Condition="'$(TargetFramework)' == 'net462'">xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netfx1\" /I /Y
+    <PostBuildEvent Condition="'$(TargetFramework)' == 'net48'">xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netfx1\" /I /Y
     </PostBuildEvent>
-    <PostBuildEvent Condition="'$(TargetFramework)' == 'netcoreapp3.1'">xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netcore1\" /I /Y
+    <PostBuildEvent Condition="'$(TargetFramework)' == 'net8'">xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netcore1\" /I /Y
     </PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/source/TestTarget2/TestTarget2.csproj b/source/TestTarget2/TestTarget2.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.TestTarget2</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -10,6 +10,6 @@
   </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent Condition="'$(TargetFramework)' == 'net462'">xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netfx2\" /I /Y</PostBuildEvent>
-    <PostBuildEvent Condition="'$(TargetFramework)' == 'netcoreapp3.1'">xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netcore2\" /I /Y</PostBuildEvent>
+    <PostBuildEvent Condition="'$(TargetFramework)' == 'net8'">xreapp3py "$(TargetPath)*" "$(SolutionDir)build\sample\netcore2\" /I /Y</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/source/dbfit/dbfit.csproj b/source/dbfit/dbfit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>dbfit</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/dbfitMySql/dbfitMySql.csproj b/source/dbfitMySql/dbfitMySql.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>dbfit.MySql</RootNamespace>
     <AssemblyName>dbfit.MySql</AssemblyName>
     <Deterministic>false</Deterministic>

diff --git a/source/dbfitOracle/dbfitOracle.csproj b/source/dbfitOracle/dbfitOracle.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>dbfit.Oracle</RootNamespace>
     <AssemblyName>dbfit.Oracle</AssemblyName>
     <Deterministic>false</Deterministic>

diff --git a/source/dbfitSqlServer/dbfitSqlServer.csproj b/source/dbfitSqlServer/dbfitSqlServer.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>dbfit.SqlServer</RootNamespace>
     <AssemblyName>dbfit.SqlServer</AssemblyName>
     <Deterministic>false</Deterministic>

diff --git a/source/dbfitSybase/dbfitSybase.csproj b/source/dbfitSybase/dbfitSybase.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>dbfit.Sybase</RootNamespace>
     <AssemblyName>dbfit.Sybase</AssemblyName>
     <Deterministic>false</Deterministic>

diff --git a/source/dbfitTest/dbfitTest.csproj b/source/dbfitTest/dbfitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.Test</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/fit/fit.csproj b/source/fit/fit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

diff --git a/source/fitSharp/Machine/Model/TargetFramework.cs b/source/fitSharp/Machine/Model/TargetFramework.cs
@@ -11,7 +11,7 @@ namespace fitSharp.Machine.Model {
     public static class TargetFramework {
         public static string Location(Assembly assembly) {
             return
-                #if NET5_0 || NET6_0 || NET7_0
+                #if NET5_0_OR_GREATER
                     OperatingSystem.IsWindows() ? assembly.Location.Replace("\\", "/") : assembly.Location
                 #else
                     assembly.CodeBase
@@ -20,7 +20,7 @@ public static string Location(Assembly assembly) {
         }
 
         public static string FileExtension =>
-            #if NET5_0 || NET6_0 || NET7_0
+            #if NET5_0_OR_GREATER
                 OperatingSystem.IsWindows() ? "net5" : "linux"
             #else
                 #if NETCOREAPP
@@ -32,7 +32,7 @@ public static string Location(Assembly assembly) {
             ;
 
         public static bool IsWindows =>
-            #if NET5_0 || NET6_0 || NET7_0
+            #if NET5_0_OR_GREATER
                 OperatingSystem.IsWindows()
             #else
                 #if NETCOREAPP

diff --git a/source/fitSharp/fitSharp.csproj b/source/fitSharp/fitSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/source/fitSharpTest/fitSharpTest.csproj b/source/fitSharpTest/fitSharpTest.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.Test</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/fitTest/fitTest.csproj b/source/fitTest/fitTest.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
     <RootNamespace>fit.Test</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>