diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ceb8b3a..5145235c 100644 --- 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 index 1543b622..b75637cb 100644 --- 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;"/> - + + - + + diff --git a/document/fitSharp/Fit/CompareFloatingPoint.html b/document/fitSharp/Fit/CompareFloatingPoint.html index fadd4a09..9f62bf85 100644 --- a/document/fitSharp/Fit/CompareFloatingPoint.html +++ b/document/fitSharp/Fit/CompareFloatingPoint.html @@ -25,6 +25,7 @@ 3abandon story test 6abandon story test 7abandon story test +8abandon story test
diff --git a/global.json b/global.json index 4037c775..a6d57a59 100644 --- 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 } -} \ No newline at end of file +} diff --git a/nuget/FitSharp.2022.11.13.nupkg b/nuget/FitSharp.2022.11.13.nupkg new file mode 100644 index 00000000..f527287e Binary files /dev/null and b/nuget/FitSharp.2022.11.13.nupkg differ diff --git a/source/Runner/Runner.csproj b/source/Runner/Runner.csproj index b512b8d4..8bc4e557 100644 --- a/source/Runner/Runner.csproj +++ b/source/Runner/Runner.csproj @@ -1,7 +1,7 @@  Exe - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fitSharp.Runner false false diff --git a/source/RunnerW/RunnerW.csproj b/source/RunnerW/RunnerW.csproj index 3007c1d9..2a868bc3 100644 --- a/source/RunnerW/RunnerW.csproj +++ b/source/RunnerW/RunnerW.csproj @@ -2,7 +2,7 @@ Exe - net48;netcoreapp3.1;net6.0-windows;net7.0-windows + net48;net6.0-windows;net7.0-windows;net8.0-windows true false false diff --git a/source/Samples/Samples.csproj b/source/Samples/Samples.csproj index 1d8bc0ac..682b5337 100644 --- a/source/Samples/Samples.csproj +++ b/source/Samples/Samples.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fitSharp.Samples false false diff --git a/source/StoryTest/StoryTest.csproj b/source/StoryTest/StoryTest.csproj index 97c8a1b2..4b6bba9e 100644 --- a/source/StoryTest/StoryTest.csproj +++ b/source/StoryTest/StoryTest.csproj @@ -2,7 +2,7 @@ fitSharp.StoryTest - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows false false diff --git a/source/TestTarget/TestTarget.csproj b/source/TestTarget/TestTarget.csproj index ef47d904..cdb45960 100644 --- a/source/TestTarget/TestTarget.csproj +++ b/source/TestTarget/TestTarget.csproj @@ -1,14 +1,14 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fitSharp.TestTarget false false - xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netfx1\" /I /Y + xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netfx1\" /I /Y - xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netcore1\" /I /Y + xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netcore1\" /I /Y diff --git a/source/TestTarget2/TestTarget2.csproj b/source/TestTarget2/TestTarget2.csproj index e7394c55..017008cc 100644 --- a/source/TestTarget2/TestTarget2.csproj +++ b/source/TestTarget2/TestTarget2.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fitSharp.TestTarget2 false false @@ -10,6 +10,6 @@ xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netfx2\" /I /Y - xcopy "$(TargetPath)*" "$(SolutionDir)build\sample\netcore2\" /I /Y + xreapp3py "$(TargetPath)*" "$(SolutionDir)build\sample\netcore2\" /I /Y diff --git a/source/dbfit/dbfit.csproj b/source/dbfit/dbfit.csproj index f6927ee5..bfc489c8 100644 --- a/source/dbfit/dbfit.csproj +++ b/source/dbfit/dbfit.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows dbfit false false diff --git a/source/dbfitMySql/dbfitMySql.csproj b/source/dbfitMySql/dbfitMySql.csproj index 3cffe042..cda10cc1 100644 --- a/source/dbfitMySql/dbfitMySql.csproj +++ b/source/dbfitMySql/dbfitMySql.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows dbfit.MySql dbfit.MySql false diff --git a/source/dbfitOracle/dbfitOracle.csproj b/source/dbfitOracle/dbfitOracle.csproj index 68cfe16b..5c634462 100644 --- a/source/dbfitOracle/dbfitOracle.csproj +++ b/source/dbfitOracle/dbfitOracle.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows dbfit.Oracle dbfit.Oracle false diff --git a/source/dbfitSqlServer/dbfitSqlServer.csproj b/source/dbfitSqlServer/dbfitSqlServer.csproj index 471d7476..dd8e332f 100644 --- a/source/dbfitSqlServer/dbfitSqlServer.csproj +++ b/source/dbfitSqlServer/dbfitSqlServer.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows dbfit.SqlServer dbfit.SqlServer false diff --git a/source/dbfitSybase/dbfitSybase.csproj b/source/dbfitSybase/dbfitSybase.csproj index d4d0d6f2..51ef2435 100644 --- a/source/dbfitSybase/dbfitSybase.csproj +++ b/source/dbfitSybase/dbfitSybase.csproj @@ -1,7 +1,7 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows dbfit.Sybase dbfit.Sybase false diff --git a/source/dbfitTest/dbfitTest.csproj b/source/dbfitTest/dbfitTest.csproj index e595a5d6..ae79b379 100644 --- a/source/dbfitTest/dbfitTest.csproj +++ b/source/dbfitTest/dbfitTest.csproj @@ -1,7 +1,7 @@  Library - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fitSharp.Test false false diff --git a/source/fit/fit.csproj b/source/fit/fit.csproj index 4d7bf5d1..ba1a93ed 100644 --- a/source/fit/fit.csproj +++ b/source/fit/fit.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows false false diff --git a/source/fitSharp/Machine/Model/TargetFramework.cs b/source/fitSharp/Machine/Model/TargetFramework.cs index 4fdf7a8a..c57e50d3 100644 --- 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 index 28b27563..b9d265ff 100644 --- a/source/fitSharp/fitSharp.csproj +++ b/source/fitSharp/fitSharp.csproj @@ -2,7 +2,7 @@ false false - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows diff --git a/source/fitSharpTest/fitSharpTest.csproj b/source/fitSharpTest/fitSharpTest.csproj index fca7ddc1..5e1910a5 100644 --- a/source/fitSharpTest/fitSharpTest.csproj +++ b/source/fitSharpTest/fitSharpTest.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fitSharp.Test false false diff --git a/source/fitTest/fitTest.csproj b/source/fitTest/fitTest.csproj index 6b142a82..8453d1a6 100644 --- a/source/fitTest/fitTest.csproj +++ b/source/fitTest/fitTest.csproj @@ -1,6 +1,6 @@  - net48;netcoreapp3.1;net6.0;net6.0-windows;net7.0;net7.0-windows + net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows fit.Test false false