Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dotnet 8 Update #187

Merged
merged 11 commits into from
Nov 17, 2023
Merged

Dotnet 8 Update #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d96d68
Switch to .net 8 preview sdk. Add all definitions for .net 8.
sqeezy Sep 6, 2023
aaba484
Remove netcoreapp3.1
sqeezy Sep 15, 2023
f63c7b9
Use general compiler directive for net5 and onwards
sqeezy Sep 15, 2023
66e7270
Add missing exclude of floating point comparision test for net8
sqeezy Sep 15, 2023
fc8405a
Merge branches 'automatic_tests' and 'dotnet8' of https://github.com/…
sqeezy Sep 17, 2023
b30e379
Merge remote-tracking branch 'origin/master' into dotnet8
sqeezy Sep 17, 2023
97f214e
Add dotnet 8 setup for tests
sqeezy Sep 17, 2023
413fae4
Remove setup for dotnet 3.1 in workflow
sqeezy Sep 17, 2023
c395d10
Be generous with used dotnet version
sqeezy Sep 24, 2023
08421b0
Upgrade to dotnet 8 RC 2
sqeezy Oct 31, 2023
eac103c
Use SDK version 8.0.100 GA
sqeezy Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
37 changes: 24 additions & 13 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions document/fitSharp/Fit/CompareFloatingPoint.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
7 changes: 4 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"sdk": {
"version": "7.0.100",
"rollForward": "latestMinor"
"version": "8.0.100",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}
}
Binary file added nuget/FitSharp.2022.11.13.nupkg
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion source/Runner/Runner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/RunnerW/RunnerW.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/Samples/Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/StoryTest/StoryTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions source/TestTarget/TestTarget.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions source/TestTarget2/TestTarget2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion source/dbfit/dbfit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/dbfitMySql/dbfitMySql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/dbfitOracle/dbfitOracle.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/dbfitSqlServer/dbfitSqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/dbfitSybase/dbfitSybase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/dbfitTest/dbfitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/fit/fit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions source/fitSharp/Machine/Model/TargetFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion source/fitSharp/fitSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion source/fitSharpTest/fitSharpTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion source/fitTest/fitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading