From cccece18bf88fed9f412e4cf0cf0920733f7013b Mon Sep 17 00:00:00 2001
From: Jimmy Byrd <jimmybyrd@gmail.com>
Date: Sun, 17 Sep 2023 19:16:22 -0400
Subject: [PATCH 1/2] Format after building

---
 .fantomasignore            |  5 +++++
 Directory.Build.targets    | 32 +++++++++++++++++++++++++-------
 Directory.Solution.targets |  8 +++-----
 3 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 .fantomasignore

diff --git a/.fantomasignore b/.fantomasignore
new file mode 100644
index 000000000..e4821f857
--- /dev/null
+++ b/.fantomasignore
@@ -0,0 +1,5 @@
+test/
+build/
+benchmarks/
+utils/
+demo.fsx
diff --git a/Directory.Build.targets b/Directory.Build.targets
index ac86c2874..2a1809c47 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,12 +1,30 @@
 <Project>
 
-<Target Name="SupportPrereleaseVersion"
-    AfterTargets="SetVersionFromChangelog">
-    <PropertyGroup Condition="'$(VersionSuffix)' != ''">
-        <Version>$(Version)-$(VersionSuffix)</Version>
-        <PackageVersion>$(Version)</PackageVersion>
-    </PropertyGroup>
-</Target>
+  <PropertyGroup>
+    <_BuildProjBaseIntermediateOutputPath>$(MSBuildThisFileDirectory)build/obj/</_BuildProjBaseIntermediateOutputPath>
+    <_DotnetToolManifestFile>$(MSBuildThisFileDirectory).config/dotnet-tools.json</_DotnetToolManifestFile>
+    <_DotnetToolRestoreOutputFile>$(_BuildProjBaseIntermediateOutputPath)/dotnet-tool-restore-$(NETCoreSdkVersion)</_DotnetToolRestoreOutputFile>
+    <_DotnetFantomasOutputFile>$(BaseIntermediateOutputPath)dotnet-fantomas-msbuild</_DotnetFantomasOutputFile>
+  </PropertyGroup>
 
+  <Target Name="SupportPrereleaseVersion"
+      AfterTargets="SetVersionFromChangelog">
+      <PropertyGroup Condition="'$(VersionSuffix)' != ''">
+          <Version>$(Version)-$(VersionSuffix)</Version>
+          <PackageVersion>$(Version)</PackageVersion>
+      </PropertyGroup>
+  </Target>
 
+  <!-- Make sure that dotnet tools (including paket) are restored before restoring any project -->
+  <Target Name="ToolRestore" BeforeTargets="Restore;CollectPackageReferences;PaketRestore" Inputs="$(_DotnetToolManifestFile)" Outputs="$(_DotnetToolRestoreOutputFile)">
+    <Exec Command="dotnet tool restore" WorkingDirectory="$(MSBuildThisFileDirectory)" StandardOutputImportance="High" StandardErrorImportance="High" />
+    <MakeDir Directories="$(_BuildProjBaseIntermediateOutputPath)"/>
+    <Touch Files="$(_DotnetToolRestoreOutputFile)" AlwaysCreate="True" ForceTouch="True" />
+  </Target>
+
+  <!-- Make sure that files are formatted before building -->
+  <Target Name="Format" BeforeTargets="BeforeBuild" Inputs="@(Compile)" Outputs="$(_DotnetFantomasOutputFile)" >
+    <Exec Command="dotnet fantomas $(MSBuildProjectDirectory)" StandardOutputImportance="High" StandardErrorImportance="High" WorkingDirectory="$(MSBuildThisFileDirectory)" />
+    <Touch Files="$(_DotnetFantomasOutputFile)" AlwaysCreate="True" ForceTouch="True" />
+  </Target>
 </Project>
diff --git a/Directory.Solution.targets b/Directory.Solution.targets
index 649ad93a7..01ee9997e 100644
--- a/Directory.Solution.targets
+++ b/Directory.Solution.targets
@@ -1,13 +1,11 @@
 <Project>
-  <ItemGroup>
-    <FormatInputs Include="src/**/*.fs;src/**/*.fsi" Exclude="src/**/obj/**/*.fs" />
-  </ItemGroup>
+
 
   <Target Name="Format">
-    <Exec Command="dotnet fantomas @(FormatInputs, ' ') " />
+    <Exec Command="dotnet fantomas $(MSBuildThisFileDirectory)" />
   </Target>
 
   <Target Name="CheckFormat">
-    <Exec Command="dotnet fantomas --check @(FormatInputs, ' ') " />
+    <Exec Command="dotnet fantomas --check $(MSBuildThisFileDirectory) " />
   </Target>
 </Project>

From 1723ad8a564669ba5cd8524311a4ea6b52f1a854 Mon Sep 17 00:00:00 2001
From: Jimmy Byrd <jimmybyrd@gmail.com>
Date: Sun, 17 Sep 2023 19:17:48 -0400
Subject: [PATCH 2/2] Format on save

---
 .vscode/settings.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index bd975e647..c88acb648 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,5 +19,8 @@
     "*.*proj": "msbuild",
     "*.props": "msbuild",
     "*.targets": "msbuild"
+  },
+  "[fsharp]": {
+      "editor.formatOnSave": true
   }
-}
\ No newline at end of file
+}