Use Fantomas.Core project references for ASTViewer.

fsprojects · Dec 11, 2023 · 6c7baa0 · 6c7baa0
1 parent 739d015
commit 6c7baa0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,12 +6,6 @@ updates:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 10
-- package-ecosystem: nuget
-  directory: "/src/server/ASTViewer"
-  schedule:
-    interval: daily
-    time: "10:00"
-  open-pull-requests-limit: 10
   allow:
     - dependency-name: "Fantomas.Core"
 - package-ecosystem: nuget

diff --git a/src/server/ASTViewer/ASTViewer.fsproj b/src/server/ASTViewer/ASTViewer.fsproj
@@ -6,6 +6,7 @@
     <OutputType>exe</OutputType>
     <!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     <IsLambda>true</IsLambda>
   </PropertyGroup>
   <ItemGroup>
@@ -23,7 +24,9 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Fantomas.Core" Version="6.3.0-alpha-004" />
+    <ProjectReference Include="$(FantomasMainRepository)\src\Fantomas.Core\Fantomas.Core.fsproj" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="6.0.6" />
     <PackageReference Include="Thoth.Json.Net" Version="8.0.0" />
   </ItemGroup>

diff --git a/src/server/ASTViewer/packages.lock.json b/src/server/ASTViewer/packages.lock.json
@@ -23,16 +23,6 @@
           "Amazon.Lambda.Core": "2.1.0"
         }
       },
-      "Fantomas.Core": {
-        "type": "Direct",
-        "requested": "[6.3.0-alpha-003, )",
-        "resolved": "6.3.0-alpha-003",
-        "contentHash": "d7bGzhkGQnW6sUMqjZO4Fw8yNHiROvRjcsOVUXLvuLCAlmivhx0+DwBkDawwDHZJfeeBht8rVw+W17iUobI3lg==",
-        "dependencies": {
-          "FSharp.Core": "6.0.1",
-          "Fantomas.FCS": "6.3.0-alpha-003"
-        }
-      },
       "FSharp.Core": {
         "type": "Direct",
         "requested": "[6.0.6, )",
@@ -77,17 +67,6 @@
           "FSharp.Core": "4.5.2"
         }
       },
-      "Fantomas.FCS": {
-        "type": "Transitive",
-        "resolved": "6.3.0-alpha-003",
-        "contentHash": "3Y4/lhMTpAWJ0nm8nXRTsNvYc2MqZFMhBE0ggp51Qyrtrcmk4JV0trSprESNiEV18DKKFGQUTxykpkwIekykzQ==",
-        "dependencies": {
-          "FSharp.Core": "6.0.1",
-          "System.Diagnostics.DiagnosticSource": "7.0.0",
-          "System.Memory": "4.5.5",
-          "System.Runtime": "4.3.1"
-        }
-      },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -143,6 +122,22 @@
         "type": "Transitive",
         "resolved": "6.0.0",
         "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+      },
+      "fantomas.core": {
+        "type": "Project",
+        "dependencies": {
+          "FSharp.Core": "[6.0.1, )",
+          "Fantomas.FCS": "[1.0.0, )"
+        }
+      },
+      "fantomas.fcs": {
+        "type": "Project",
+        "dependencies": {
+          "FSharp.Core": "[6.0.1, )",
+          "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
+          "System.Memory": "[4.5.5, )",
+          "System.Runtime": "[4.3.1, )"
+        }
       }
     }
   }