remove fgl dependency

nfdi4plants · Aug 4, 2023 · 8767c8d · 8767c8d
1 parent 1f9275d
commit 8767c8d
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 30 deletions.
diff --git a/src/ARCTokenization/ARCTokenization.fsproj b/src/ARCTokenization/ARCTokenization.fsproj
@@ -4,6 +4,12 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,11 +43,11 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ControlledVocabulary\ControlledVocabulary.fsproj" PackageVersion="[0.0.0, 1.0.0)" />
-    <PackageReference Include="FSharp.FGL.ArrayAdjacencyGraph" Version="[0.0.2]" />
     <PackageReference Include="FSharpAux.Core" Version="[2.0.0]" />
     <PackageReference Include="FsOboParser" Version="[0.1.0]" />
     <PackageReference Include="FsSpreadsheet" Version="[3.1.1]" />
     <PackageReference Include="FsSpreadsheet.ExcelIO" Version="[3.1.1]" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">

diff --git a/src/ARCTokenization/AnnotationTable.fs b/src/ARCTokenization/AnnotationTable.fs
@@ -3,8 +3,6 @@
 open ControlledVocabulary
 open FSharpAux
 open FsSpreadsheet
-open FSharp.FGL
-open FSharp.FGL.ArrayAdjacencyGraph
 
 open System
 

diff --git a/src/ARCTokenization/packages.lock.json b/src/ARCTokenization/packages.lock.json
@@ -8,16 +8,6 @@
         "resolved": "6.0.7",
         "contentHash": "e6wGrq5smV3Yk2fBE/Y0nBG5oFyF59k5Je0a0QDydUpg6liyaafGjD3xvutciKepCP2knspZ/sWViC/F1OyyQQ=="
       },
-      "FSharp.FGL.ArrayAdjacencyGraph": {
-        "type": "Direct",
-        "requested": "[0.0.2, 0.0.2]",
-        "resolved": "0.0.2",
-        "contentHash": "L7JmdDkb375CcOVdAW5HFDpuj0ZQFuzVNhHOp/eJhH3xPWGJ5skeTLm8P0XWyxTjpCCAtoW2B0oScU+QtCgxSw==",
-        "dependencies": {
-          "FSharp.Core": "5.0.0",
-          "FSharp.FGL": "0.0.2"
-        }
-      },
       "FSharpAux.Core": {
         "type": "Direct",
         "requested": "[2.0.0, 2.0.0]",
@@ -58,6 +48,16 @@
           "FsSpreadsheet": "[3.0.0, 4.0.0)"
         }
       },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
       "NETStandard.Library": {
         "type": "Direct",
         "requested": "[2.0.3, )",
@@ -67,14 +67,6 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
-      "Aether": {
-        "type": "Transitive",
-        "resolved": "8.3.1",
-        "contentHash": "GKedgXPkm3nUO+Zbj9suNFQ/wCjw30ixUTgnrPvj0oJ9WiAyy1kDacJTHgTPTjyD1RILuDEPTPwsKGWlSpWLOw==",
-        "dependencies": {
-          "FSharp.Core": "4.3.4"
-        }
-      },
       "DocumentFormat.OpenXml": {
         "type": "Transitive",
         "resolved": "2.12.3",
@@ -88,15 +80,6 @@
         "resolved": "4.0.0",
         "contentHash": "crDLkyN4xADgnCqIneMUGVDo2oS92W4oufbIH/jwc8Fk7nIH6pS/Ds1rBB4R1jUfU1WM1k9GEPa4Up8cNj5VYw=="
       },
-      "FSharp.FGL": {
-        "type": "Transitive",
-        "resolved": "0.0.2",
-        "contentHash": "6tOOMs0Rm4bPIVPZ5eE3x2aQ299heMv3LCJBFGca0mb7JOPN5IeBRvcdVpHokQ1ag9ndCuFC98nOUQqu2DquEw==",
-        "dependencies": {
-          "Aether": "8.3.1",
-          "FSharp.Core": "5.0.0"
-        }
-      },
       "FSharp.SystemTextJson": {
         "type": "Transitive",
         "resolved": "0.19.13",
@@ -125,11 +108,21 @@
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
+      },
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
         "resolved": "1.1.0",
         "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
       },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
+      },
       "System.Buffers": {
         "type": "Transitive",
         "resolved": "4.5.1",

diff --git a/src/ControlledVocabulary/ControlledVocabulary.fsproj b/src/ControlledVocabulary/ControlledVocabulary.fsproj
@@ -4,6 +4,12 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="FSharpAux.Core" Version="[2.0.0]" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ControlledVocabulary/packages.lock.json b/src/ControlledVocabulary/packages.lock.json
@@ -17,6 +17,16 @@
           "FSharp.Core": "6.0.7"
         }
       },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
       "NETStandard.Library": {
         "type": "Direct",
         "requested": "[2.0.3, )",
@@ -26,10 +36,20 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
+      },
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
         "resolved": "1.1.0",
         "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
       }
     }
   }