Remove .net6 and net7 targets. Add net9

jediwhale · Sep 11, 2024 · 4aaa29f · 4aaa29f
1 parent 1af4693
commit 4aaa29f
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 73 deletions.
diff --git a/build.proj b/build.proj
@@ -41,50 +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;"/>
-     <Net6Files Include="
-      source\fitSharp\bin\release\net6.0\fitSharp.dll;
-      source\fit\bin\release\net6.0\fit.dll;
-      source\Runner\bin\release\net6.0\Runner.dll;
-      source\Runner\bin\release\net6.0\Runner.runtimeconfig.json;
-      source\dbfit\bin\release\net6.0\dbfit.dll;
-      source\dbfitMySql\bin\release\net6.0\dbfit.mysql.dll;
-      source\dbfitOracle\bin\release\net6.0\dbfit.oracle.dll;
-      source\dbfitSqlServer\bin\release\net6.0\dbfit.sqlserver.dll;
-      source\dbfitSybase\bin\release\net6.0\dbfit.sybase.dll;"/>
-     <Net6WinFiles Include="
-      source\fitSharp\bin\release\net6.0-windows\fitSharp.dll;
-      source\fit\bin\release\net6.0-windows\fit.dll;
-      source\Runner\bin\release\net6.0-windows\Runner.dll;
-      source\Runner\bin\release\net6.0-windows\Runner.runtimeconfig.json;
-      source\RunnerW\bin\release\net6.0-windows\RunnerW.dll;
-      source\RunnerW\bin\release\net6.0-windows\RunnerW.runtimeconfig.json;
-      source\dbfit\bin\release\net6.0-windows\dbfit.dll;
-      source\dbfitMySql\bin\release\net6.0-windows\dbfit.mysql.dll;
-      source\dbfitOracle\bin\release\net6.0-windows\dbfit.oracle.dll;
-      source\dbfitSqlServer\bin\release\net6.0-windows\dbfit.sqlserver.dll;
-      source\dbfitSybase\bin\release\net6.0-windows\dbfit.sybase.dll;"/>
-     <Net7Files Include="
-      source\fitSharp\bin\release\net7.0\fitSharp.dll;
-      source\fit\bin\release\net7.0\fit.dll;
-      source\Runner\bin\release\net7.0\Runner.dll;
-      source\Runner\bin\release\net7.0\Runner.runtimeconfig.json;
-      source\dbfit\bin\release\net7.0\dbfit.dll;
-      source\dbfitMySql\bin\release\net7.0\dbfit.mysql.dll;
-      source\dbfitOracle\bin\release\net7.0\dbfit.oracle.dll;
-      source\dbfitSqlServer\bin\release\net7.0\dbfit.sqlserver.dll;
-      source\dbfitSybase\bin\release\net7.0\dbfit.sybase.dll;"/>
-     <Net7WinFiles Include="
-      source\fitSharp\bin\release\net7.0-windows\fitSharp.dll;
-      source\fit\bin\release\net7.0-windows\fit.dll;
-      source\Runner\bin\release\net7.0-windows\Runner.dll;
-      source\Runner\bin\release\net7.0-windows\Runner.runtimeconfig.json;
-      source\RunnerW\bin\release\net7.0-windows\RunnerW.dll;
-      source\RunnerW\bin\release\net7.0-windows\RunnerW.runtimeconfig.json;
-      source\dbfit\bin\release\net7.0-windows\dbfit.dll;
-      source\dbfitMySql\bin\release\net7.0-windows\dbfit.mysql.dll;
-      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;
@@ -107,15 +63,35 @@
       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;"/>
+     <Net9Files Include="
+      source\fitSharp\bin\release\net9.0\fitSharp.dll;
+      source\fit\bin\release\net9.0\fit.dll;
+      source\Runner\bin\release\net9.0\Runner.dll;
+      source\Runner\bin\release\net9.0\Runner.runtimeconfig.json;
+      source\dbfit\bin\release\net9.0\dbfit.dll;
+      source\dbfitMySql\bin\release\net9.0\dbfit.mysql.dll;
+      source\dbfitOracle\bin\release\net9.0\dbfit.oracle.dll;
+      source\dbfitSqlServer\bin\release\net9.0\dbfit.sqlserver.dll;
+      source\dbfitSybase\bin\release\net9.0\dbfit.sybase.dll;"/>
+     <Net9WinFiles Include="
+      source\fitSharp\bin\release\net9.0-windows\fitSharp.dll;
+      source\fit\bin\release\net9.0-windows\fit.dll;
+      source\Runner\bin\release\net9.0-windows\Runner.dll;
+      source\Runner\bin\release\net9.0-windows\Runner.runtimeconfig.json;
+      source\RunnerW\bin\release\net9.0-windows\RunnerW.dll;
+      source\RunnerW\bin\release\net9.0-windows\RunnerW.runtimeconfig.json;
+      source\dbfit\bin\release\net9.0-windows\dbfit.dll;
+      source\dbfitMySql\bin\release\net9.0-windows\dbfit.mysql.dll;
+      source\dbfitOracle\bin\release\net9.0-windows\dbfit.oracle.dll;
+      source\dbfitSqlServer\bin\release\net9.0-windows\dbfit.sqlserver.dll;
+      source\dbfitSybase\bin\release\net9.0-windows\dbfit.sybase.dll;"/>
    <Packages Include="nuget\*.nupkg" />
   </ItemGroup>
   <Copy SourceFiles="@(Netfx48Files)" DestinationFolder="nuget\lib\net48" />
-  <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" />
+  <Copy SourceFiles="@(net9Files)" DestinationFolder="nuget\lib\net9.0" />
+  <Copy SourceFiles="@(net9WinFiles)" DestinationFolder="nuget\lib\net9.0-windows" />
   <Exec Command="..\binary\tools\nuget\nuget pack FitSharp.nuspec" WorkingDirectory="nuget"/>
   <Move SourceFiles="@(Packages)" DestinationFolder="binary" />
 </Target>

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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.Runner</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/Runner/RunnerL.csproj b/source/Runner/RunnerL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <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;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0-windows;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.0-windows</TargetFrameworks>
     <RootNamespace>fitSharp.Samples</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/Samples/SamplesL.csproj b/source/Samples/SamplesL.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+        <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.0-windows</TargetFrameworks>
         <Deterministic>false</Deterministic>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     </PropertyGroup>

diff --git a/source/StoryTest/StoryTestL.csproj b/source/StoryTest/StoryTestL.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <RootNamespace>fitSharp.StoryTest</RootNamespace>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Deterministic>false</Deterministic>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <AssemblyName>StoryTest</AssemblyName>

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

diff --git a/source/TestTarget/TestTargetL.csproj b/source/TestTarget/TestTargetL.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>fitSharp.TestTarget</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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

diff --git a/source/TestTarget2/TestTarget2L.csproj b/source/TestTarget2/TestTarget2L.csproj
@@ -4,7 +4,7 @@
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>TestTarget2</AssemblyName>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\TestTarget\TestTargetL.csproj" />

diff --git a/source/dbfit/dbfit.csproj b/source/dbfit/dbfit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.0-windows</TargetFrameworks>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

diff --git a/source/fit/fitL.csproj b/source/fit/fitL.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>fit</AssemblyName>

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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.0-windows</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

diff --git a/source/fitSharp/fitSharpL.csproj b/source/fitSharp/fitSharpL.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>fitSharp</RootNamespace>

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

diff --git a/source/fitSharpTest/fitSharpTestL.csproj b/source/fitSharpTest/fitSharpTestL.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <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;net6.0;net6.0-windows;net7.0;net7.0-windows;net8.0;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0;net8.0-windows;net9.0;net9.0-windows</TargetFrameworks>
     <RootNamespace>fit.Test</RootNamespace>
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/source/fitTest/fitTestL.csproj b/source/fitTest/fitTestL.csproj
@@ -4,7 +4,7 @@
     <Deterministic>false</Deterministic>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>fitTest</AssemblyName>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\fitSharp\fitSharpL.csproj" />