tried porting to dotnet8: new target, basis is now dotnet 8 (e.g. glo…

…bal.lock) since without this chance sdkresolver in msbuild constantly switches to dotnet8 even in dotnet7 (which is out of life). however build of dotnet7 should work still, fixed ilmerge by again compiling adaptify.msbuild.dotnet to netstandard which is actually merged in ilmerge, disabled parallel generation in adaptify tool for now,
krauthaufen · Sep 25, 2024 · a412b32 · a412b32
1 parent e7797b4
commit a412b32
Show file tree

Hide file tree

Showing 13 changed files with 157 additions and 48 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.0",
+      "version": "8.0.3",
       "commands": [
         "paket"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,5 @@ symbolCache.db
 .g.fs
 .ionide
 **/.idea/
-.DS_Store
+.DS_Store
+/src/Adaptify.Compiler/adaptify.fsproj.user
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.2.0-prerelease1
+* dotnet8 support
+
 ### 1.1.13
 * assembly version fix 3
 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.0",
     "rollForward": "latestMinor"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -6,7 +6,7 @@ group Hans
   framework: net472, netstandard2.0, net7.0, net6.0
   # PreCompiler
   nuget FSharp.Core                           >= 6.0.0 lowest_matching: true
-  nuget FSharp.Compiler.Service               ~> 43.7.400
+  nuget FSharp.Compiler.Service               ~> 43.8.400
   nuget DotNet.Glob                           ~> 3.1.3
   nuget Microsoft.Build.Tasks.Core            ~> 17.7.2
   nuget Microsoft.Build.Framework             ~> 17.7.2
@@ -23,7 +23,7 @@ group Tool6
   framework:net6.0
   source https://api.nuget.org/v3/index.json
   nuget FSharp.Core                           >= 6.0.0 lowest_matching: true
-  nuget FSharp.Compiler.Service               ~> 43.7.400
+  nuget FSharp.Compiler.Service               ~> 43.8.400
   nuget DotNet.Glob                           ~> 3.1.3
   nuget BlackFox.VsWhere                      ~> 1.1.0
   nuget Ionide.ProjInfo                       ~> 0.63.0
@@ -34,7 +34,18 @@ group Tool7
   framework:net7.0
   source https://api.nuget.org/v3/index.json
   nuget FSharp.Core                           >= 6.0.0 lowest_matching: true
-  nuget FSharp.Compiler.Service               ~> 43.7.400
+  nuget FSharp.Compiler.Service               ~> 43.8.400
+  nuget DotNet.Glob                           ~> 3.1.3
+  nuget BlackFox.VsWhere                      ~> 1.1.0
+  nuget Ionide.ProjInfo                       ~> 0.63.0
+  nuget Microsoft.Build                       >= 0.0.0.0 lowest_matching: true
+  nuget NuGet.Frameworks                      ~> 6.7.0
+
+group Tool8
+  framework:net8.0
+  source https://api.nuget.org/v3/index.json
+  nuget FSharp.Core                           >= 6.0.0 lowest_matching: true
+  nuget FSharp.Compiler.Service               ~> 43.8.400
   nuget DotNet.Glob                           ~> 3.1.3
   nuget BlackFox.VsWhere                      ~> 1.1.0
   nuget Ionide.ProjInfo                       ~> 0.63.0

diff --git a/paket.lock b/paket.lock
diff --git a/src/Adaptify.Compiler.Core/Adaptify.Compiler.Core.fsproj b/src/Adaptify.Compiler.Core/Adaptify.Compiler.Core.fsproj
@@ -12,6 +12,7 @@
     <OutputPath>..\..\bin\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Utilities.fs" />
     <Compile Include="Scope.fs" />
     <Compile Include="Types.fs" />

diff --git a/src/Adaptify.Compiler.Core/Utilities.fs b/src/Adaptify.Compiler.Core/Utilities.fs
@@ -437,7 +437,7 @@ module Versions =
         #else
         let tag = None
         #endif
-
+ 
         match tag with
         | Some tag ->
             log.info Range.range0 "version: %s (local)" tag

diff --git a/src/Adaptify.Compiler/Program.fs b/src/Adaptify.Compiler/Program.fs
@@ -339,7 +339,7 @@ let main argv =
 
 
 
-        projectInfos |> topologicalSort |> Array.iter (Array.Parallel.iter (fun info ->
+        projectInfos |> topologicalSort |> Array.iter (Array.iter (fun info ->
             let outputPath = 
                 match info.output with
                 | Some output -> Path.GetDirectoryName output

diff --git a/src/Adaptify.Compiler/Properties/launchSettings.json b/src/Adaptify.Compiler/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "adaptify": {
       "commandName": "Project",
-      "commandLineArgs": "dotnet adaptify --local --verbose --force \"C:\\repo\\Rail4Future\\src\\PointCloudViewer\\PointCloudViewer.fsproj\""
+      "commandLineArgs": "--server --verbose"
     }
   }
 }
diff --git a/src/Adaptify.Compiler/adaptify.fsproj b/src/Adaptify.Compiler/adaptify.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>True</DisableImplicitFSharpCoreReference>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>adaptify</ToolCommandName>
@@ -26,8 +26,8 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-	  <PackageReference Include="FSharp.Core" Version="7.0.400" />
-	  <PackageReference Include="FSharp.Compiler.Service" Version="[43.7.400, 43.8.0)" />
+	  <PackageReference Include="FSharp.Core" Version="8.0.400" />
+	  <PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
 	  <PackageReference Include="DotNet.Glob" Version="[3.1.3, 3.2.0)" />
 	  <PackageReference Include="BlackFox.VsWhere" Version="[1.1.0, 1.2.0)" />
 	  <PackageReference Include="Ionide.ProjInfo" Version="[0.63.0, 0.64.0)" />
@@ -37,8 +37,8 @@
 	  <PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.2.2, 17.3.0)" />
   </ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="FSharp.Core" Version="7.0.400" />
-		<PackageReference Include="FSharp.Compiler.Service" Version="[43.7.400, 43.8.0)" />
+		<PackageReference Include="FSharp.Core" Version="8.0.400" />
+		<PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
 		<PackageReference Include="DotNet.Glob" Version="[3.1.3, 3.2.0)" />
 		<PackageReference Include="BlackFox.VsWhere" Version="[1.1.0, 1.2.0)" />
 		<PackageReference Include="Ionide.ProjInfo" Version="[0.63.0, 0.64.0)" />
@@ -47,6 +47,17 @@
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="[17.7.2, 17.8.0)" />
 		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.7.2, 17.8.0)" />
 	</ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="FSharp.Core" Version="8.0.400" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
+    <PackageReference Include="DotNet.Glob" Version="[3.1.3, 3.2.0)" />
+    <PackageReference Include="BlackFox.VsWhere" Version="[1.1.0, 1.2.0)" />
+    <PackageReference Include="Ionide.ProjInfo" Version="[0.63.0, 0.64.0)" />
+    <PackageReference Include="Microsoft.Build" Version="[17.11.4, 17.12.0)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="[17.11.4, 17.12.0)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="[17.11.4, 17.12.0)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.11.4, 17.12.0)" />
+  </ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Adaptify.Compiler.Core\Adaptify.Compiler.Core.fsproj" />
 	</ItemGroup>

diff --git a/src/Adaptify.MSBuild.DotNet/Adaptify.MSBuild.DotNet.fsproj b/src/Adaptify.MSBuild.DotNet/Adaptify.MSBuild.DotNet.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <DisableImplicitFSharpCoreReference>True</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -15,23 +15,39 @@
     <None Include="Adaptify.MSBuild.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="FSharp.Core" Version="8.0.400" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
+    <PackageReference Include="Microsoft.Build" Version="[17.2.2, 17.3.0)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="[17.2.2, 17.3.0)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="[17.2.2, 17.3.0)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.2.2, 17.3.0)" />
   </ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-		<PackageReference Include="FSharp.Core" Version="7.0.400" />
-		<PackageReference Include="FSharp.Compiler.Service" Version="[43.7.400, 43.8.0)" />
+		<PackageReference Include="FSharp.Core" Version="8.0.400" />
+		<PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
 		<PackageReference Include="Microsoft.Build" Version="[17.2.2, 17.3.0)" />
 		<PackageReference Include="Microsoft.Build.Framework" Version="[17.2.2, 17.3.0)" />
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="[17.2.2, 17.3.0)" />
 		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.2.2, 17.3.0)" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-		<PackageReference Include="FSharp.Core" Version="7.0.400" />
-		<PackageReference Include="FSharp.Compiler.Service" Version="[43.7.400, 43.8.0)" />
+		<PackageReference Include="FSharp.Core" Version="8.0.400" />
+		<PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
 		<PackageReference Include="Microsoft.Build" Version="[17.7.2, 17.8.0)" />
 		<PackageReference Include="Microsoft.Build.Framework" Version="[17.7.2, 17.8.0)" />
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="[17.7.2, 17.8.0)" />
 		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.7.2, 17.8.0)" />
 	</ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="FSharp.Core" Version="8.0.400" />
+    <PackageReference Include="FSharp.Compiler.Service" Version="[43.8.400, 43.9.0)" />
+    <PackageReference Include="Microsoft.Build" Version="[17.7.2, 17.8.0)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="[17.7.2, 17.8.0)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="[17.7.2, 17.8.0)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="[17.7.2, 17.8.0)" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Adaptify.Compiler.Core\Adaptify.Compiler.Core.fsproj" />
   </ItemGroup>

diff --git a/src/Adaptify.MSBuild.Framework/Adaptify.MSBuild.Framework.fsproj b/src/Adaptify.MSBuild.Framework/Adaptify.MSBuild.Framework.fsproj
@@ -11,6 +11,7 @@
     <OutputPath>..\..\bin\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="..\Adaptify.MSBuild.DotNet\BuildTask.fs" />
     <None Include="..\Adaptify.MSBuild.DotNet\Adaptify.MSBuild.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>