From fe84588baf6a9e626f5034c6cbd6fc567ece9864 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Sun, 31 Mar 2024 12:54:44 -0500
Subject: [PATCH 1/2] build FSAC standalone binaries for each OS/Arch

---
 .gitignore                               |  3 ++-
 Directory.Build.props                    |  1 +
 global.json                              |  5 ++---
 src/FsAutoComplete/FsAutoComplete.fsproj | 19 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b34fbd3ac..04d00da67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,5 @@ test/FsAutoComplete.Tests.Lsp/TestResults/
 .tool-versions
 BenchmarkDotNet.Artifacts/
 
-*.sarif
\ No newline at end of file
+*.sarif
+artifacts
diff --git a/Directory.Build.props b/Directory.Build.props
index ed5de172f..5786e74db 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Title>FsAutoComplete</Title>
     <Product>FsAutoComplete</Product>
+    <ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
     <PackageLicenseExpression Condition=" '$(PackAsTool)' != 'true' ">Apache-2.0</PackageLicenseExpression>
     <NoWarn>$(NoWarn);3186,0042</NoWarn><!-- circumvent an error with the fake dependencymanager for
     paket: https://github.com/dotnet/fsharp/issues/8678 -->
diff --git a/global.json b/global.json
index 5c6dc58bc..cf2164e4e 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.400",
-    "rollForward": "major",
-    "allowPrerelease": true
+    "version": "8.0.100",
+    "rollForward": "major"
   }
 }
\ No newline at end of file
diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
index 0caf50835..6766eff2b 100644
--- a/src/FsAutoComplete/FsAutoComplete.fsproj
+++ b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -2,9 +2,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
+    <RuntimeIdentifiers>
+      win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64;linux-musl-x64;linux-musl-arm64</RuntimeIdentifiers>
     <AssemblyName>fsautocomplete</AssemblyName>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
@@ -79,6 +81,21 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="BuildAllStandloneApplications">
+    <ItemGroup>
+      <_RIDS Include="$(RuntimeIdentifiers)" />
+      <_RIDSpecificFSACBuild
+          Include="$(MSBuildThisFile)"
+          AdditionalProperties="RuntimeIdentifier=%(_RIDS.Identity)" />
+    </ItemGroup>
+
+    <MSBuild
+        Projects="@(_RIDSpecificFSACBuild)"
+        Targets="Publish"
+        Properties="Configuration=Release;PublishSingleFile=true;PublishTrimmed=true;"
+        RemoveProperties="RuntimeIdentifiers"
+        BuildInParallel="true" />
+  </Target>
 
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

From 798b5f46bcd50ca66b6bb4bbabb8b17e81183a76 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Sun, 31 Mar 2024 16:38:31 -0500
Subject: [PATCH 2/2] slightly better build outputs

---
 src/FsAutoComplete/FsAutoComplete.fsproj | 30 +++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
index 6766eff2b..5bda9247e 100644
--- a/src/FsAutoComplete/FsAutoComplete.fsproj
+++ b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -19,6 +19,10 @@
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishSelfContained>true</PublishSelfContained>
+    <DebugType>embedded</DebugType>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
   </PropertyGroup>
   <ItemGroup>
     <None
@@ -71,6 +75,11 @@
       $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
 
+  <ItemGroup Label="Trimming Settings">
+    <TrimmerRootAssembly Include="Serilog" />
+    <TrimmerRootAssembly Include="Ionide.ProjInfo.ProjectSystem" />
+  </ItemGroup>
+
   <!-- workaround for not being able to have p2p dependencies in tool output dir
   https://github.com/nuget/home/issues/3891#issuecomment-377319939 -->
   <Target
@@ -83,17 +92,32 @@
 
   <Target Name="BuildAllStandloneApplications">
     <ItemGroup>
+      <!-- Make MSBuild Items out of the RIDs so we can batch across them -->
       <_RIDS Include="$(RuntimeIdentifiers)" />
+      <!-- Make MSBuild Items out of the TFMs so we can batch across them. Create NUM_RIDS items
+      per-TFM because we want to build each TFM for all supported platforms. -->
+      <_TFMS
+          Include="$(TargetFrameworks)"
+          RID="%(_RIDS.Identity)" />
+      <!-- Turn the _TFMS items into requests to build this project (fsautocomplete.fsproj) with
+      different parameters. This pattern is often used to to parallel builds of the same project in
+      MSBuild logic. -->
       <_RIDSpecificFSACBuild
           Include="$(MSBuildThisFile)"
-          AdditionalProperties="RuntimeIdentifier=%(_RIDS.Identity)" />
+          AdditionalProperties="RuntimeIdentifier=%(_TFMS.RID);TargetFramework=%(_TFMS.Identity)" />
     </ItemGroup>
 
+    <!-- Ask MSBuild to build all of the requests we just made. The MSBuild Task recognizes the
+    AdditionalProperties metadata and will apply that to each specific build, we can specify the things
+    that are common to all of the builds here.  Unsetting RuntimeIdentifiers and TargetFrameworks
+    ensures that the SDK targets detect that these are single-RID/single-TFM builds accurately, and
+    since we're pretty certain there are no data dependencies here we can have the builds operate in
+    parallel. -->
     <MSBuild
         Projects="@(_RIDSpecificFSACBuild)"
         Targets="Publish"
-        Properties="Configuration=Release;PublishSingleFile=true;PublishTrimmed=true;"
-        RemoveProperties="RuntimeIdentifiers"
+        Properties="Configuration=Release;SelfContained=true"
+        RemoveProperties="RuntimeIdentifiers;TargetFrameworks"
         BuildInParallel="true" />
   </Target>