Revert "[Doc] Upgrade to Docfx 2.67.0 (akkadotnet#6738)"

This reverts commit 66f348a.

Author: Arkatufus

build.fsx

@@ -488,13 +488,14 @@ Target "DocFx" (fun _ ->
             { p with
                 ExcludeVersion = true
                 Version = "0.1.0-alpha-1611021200"
-                OutputDirectory = currentDirectory @@ "tools" }) "msdn.4.5.2" 
+                OutputDirectory = currentDirectory @@ "tools" }) "msdn.4.5.2"
 
     let docsPath = FullName "./docs"
-    let docFxPath = FullName(findToolInSubPath "docfx.exe" "tools/docfx/")
+    let docFxPath = FullName(findToolInSubPath "docfx.exe" "tools/docfx.console/tools")
 
     let args = StringBuilder()
                 |> append (docsPath @@ "docfx.json" )
+                |> append ("--warningsAsErrors")
                 |> toText
 
     let result = ExecProcess(fun info ->

build.ps1

@@ -33,7 +33,7 @@ $FakeVersion = "4.63.0"
 $NugetVersion = "5.8.0";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
 $ProtobufVersion = "3.21.5"
-$DocfxVersion = "2.67.0"
+$DocfxVersion = "2.59.4"
 
 $IncrementalistVersion = "0.8.0";
 
@@ -89,14 +89,13 @@ if (!(Test-Path $ProtobufExePath)) {
 ###########################################################################
 
 # Make sure Docfx has been installed.
-# Make sure the Incrementalist has been installed
-if (Get-Command docfx -ErrorAction SilentlyContinue) {
-    Write-Host "Found docfx. Skipping install."
-}
-else{
-    $DocfxExePath = Join-Path $ToolPath "docfx"
+$DocfxExePath = Join-Path $ToolPath "docfx.console/tools/docfx.exe"
+if (!(Test-Path $DocfxExePath)) {
     Write-Host "Installing Docfx..."
-	dotnet tool install docfx --version $DocfxVersion --tool-path "$DocfxExePath"
+    Invoke-Expression "&`"$NugetPath`" install docfx.console -ExcludeVersion -Version $DocfxVersion -OutputDirectory `"$ToolPath`"" | Out-Null;
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occured while restoring docfx.console from NuGet."
+    }
 }
 
 ###########################################################################

docs/docfx.json

@@ -13,7 +13,7 @@
                 "**/*Tests*.csproj",
                 "**/*Tests.*.csproj"
             ],
-            "cwd": "../src"
+            "src": "../src"
         }],
         "dest": "api",
         "filter": "filterConfig.yml"
@@ -23,7 +23,7 @@
             "files": [
                 "api/**.yml",
                 "api/index.md"
-            ]			
+            ]
         }, {
             "files": [
                 "articles/**.md",
@@ -77,8 +77,6 @@
             "template"
         ],
         "postProcessors": ["ExtractSearchIndex"],
-        "noLangKeyword": false,
-		    "warningsAsErrors": true,
-        "Docfx_Git_Timeout": 30000
+        "noLangKeyword": false
     }
 }

serve-docs.ps1

@@ -1,6 +1,6 @@
 # docfx.ps1
-$VisualStudioVersion = "17.5.0";
-$DotnetSDKVersion = "7.0.203";
+$VisualStudioVersion = "15.0";
+$DotnetSDKVersion = "2.0.0";
 
 # Get dotnet paths
 $MSBuildExtensionsPath = "C:\Program Files\dotnet\sdk\" + $DotnetSDKVersion;
@@ -18,4 +18,4 @@ $env:MSBuildExtensionsPath = $MSBuildExtensionsPath;
 $env:MSBuildSDKsPath = $MSBuildSDKsPath;
 
 # Build our docs
-& .\tools\docfx\docfx @args
+& .\tools\docfx.console\tools\docfx @args

src/Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
     <Authors>Akka.NET Team</Authors>
-    <VersionPrefix>1.5.7</VersionPrefix>
+    <VersionPrefix>1.5.4</VersionPrefix>
     <PackageIcon>akkalogo.png</PackageIcon>
     <PackageProjectUrl>https://github.com/akkadotnet/akka.net</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl>
@@ -40,7 +40,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageReleaseNotes>Placeholder for nightlies*</PackageReleaseNotes>
+    <PackageReleaseNotes>placeholder for nightlies*</PackageReleaseNotes>
   </PropertyGroup>
   <!-- SourceLink support for all Akka.NET projects -->
   <ItemGroup>