Use "dotnet tool" instead of "0install" to get docfx

nano-byte · Dec 27, 2023 · dc9ec4e · dc9ec4e
1 parent 35ceb45
commit dc9ec4e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "docfx": {
+      "version": "2.74.1",
+      "commands": [
+        "docfx"
+      ]
+    }
+  }
+}
diff --git a/doc/build.ps1 b/doc/build.ps1
@@ -1,7 +1,13 @@
 $ErrorActionPreference = "Stop"
 pushd $PSScriptRoot
 
-..\0install.ps1 run --batch https://apps.0install.net/dotnet/docfx.xml --logLevel=warning --warningsAsErrors docfx.json
-if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
+function Run-DotNet {
+    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
+}
+
+# Build docs
+Run-DotNet tool restore
+Run-DotNet docfx --logLevel=warning --warningsAsErrors docfx.json
 
 popd
diff --git a/renovate.json b/renovate.json
@@ -21,7 +21,7 @@
       "automergeType": "branch"
     },
     {
-      "matchPackagePatterns": ["gittools", "SourceLink"],
+      "matchPackagePatterns": ["gittools", "docfx", "SourceLink"],
       "automerge": true,
       "automergeType": "branch"
     },