- corrected paths to docs

- fantomas
fsprojects · Nov 27, 2023 · 34c72f2 · 34c72f2
1 parent 83d27f7
commit 34c72f2
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 21 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -7,12 +7,6 @@
       "commands": [
         "fsdocs"
       ]
-    },
-    "fantomas": {
-      "version": "6.2.3",
-      "commands": [
-        "fantomas"
-      ]
     }
   }
 }
diff --git a/build.fsx b/build.fsx
@@ -53,7 +53,6 @@ let shallBuild = args.IsTask("build")
 let shallTest = args.IsTask("test")
 let shallPublish = args.IsTask("publish")
 let shallPack = args.IsTask("pack")
-let shallFormat = args.IsTask("format")
 
 let toolRestore = "toolRestore", fun () ->
     Shell.ExecSuccess ("dotnet", "tool restore")
@@ -64,9 +63,6 @@ let clean = "clean", fun () ->
     ++ ".pack"
     |> Shell.cleanDirs 
 
-let checkFormat = "checkformat", fun () ->
-    Shell.ExecSuccess ("dotnet", $"fantomas --check ./src/FsHttp/ ./src/Tests/")
-
 let slnPath = "./FsHttp.sln"
 let build = "build", fun () ->
     Shell.ExecSuccess ("dotnet", $"build {slnPath}")
@@ -85,9 +81,6 @@ let pack = "pack", fun () ->
         Shell.ExecSuccess ("dotnet", sprintf "pack %s -o %s -c Release" p (Path.combine __SOURCE_DIRECTORY__ ".pack"))
     )
 
-let format = "format", fun () ->
-    Shell.ExecSuccess ("dotnet", $"fantomas ./src/FsHttp/ ./src/Tests/")
-
 // TODO: git tag + release
 let publish = "publish", fun () ->
     let nugetApiKey = Environment.environVar Properties.nugetPushEnvVarName
@@ -101,19 +94,15 @@ run [
     toolRestore
 
     if shallBuild then
-        checkFormat
         build
     if shallTest then
         test
     if shallPack then
         pack
     if shallPublish then
-        checkFormat
         build
         pack
         publish
-    if shallFormat then
-        format
 ]
 
 Trace.trace $"Finished script..."
diff --git a/format.ps1 b/format.ps1
diff --git a/src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj b/src/FsHttp.FSharpData/FsHttp.FSharpData.fsproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
-    <None Include="..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FsHttp\FsHttp.fsproj" />

diff --git a/src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj b/src/FsHttp.NewtonsoftJson/FsHttp.NewtonsoftJson.fsproj
@@ -19,7 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
-    <None Include="..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FsHttp\FsHttp.fsproj" />

diff --git a/src/FsHttp/FsHttp.fsproj b/src/FsHttp/FsHttp.fsproj
@@ -37,6 +37,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
-    <None Include="..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\docs\img\logo_small.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>