diff --git a/build.fsx b/build.fsx index 6620ee453b5..fe4f2f4ae46 100644 --- a/build.fsx +++ b/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 -> diff --git a/build.ps1 b/build.ps1 index 57bd151a213..fa94de50ae7 100644 --- a/build.ps1 +++ b/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." + } } ########################################################################### diff --git a/docs/docfx.json b/docs/docfx.json index 1a40058b46d..ae77b338564 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -74,12 +74,9 @@ "fileMetadataFiles": [], "template": [ "default", - "modern", - "template" + "template" ], "postProcessors": ["ExtractSearchIndex"], - "noLangKeyword": false, - "warningsAsErrors": true, - "Docfx_Git_Timeout": 30000 + "noLangKeyword": false } -} +} \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index a1a16c7c6ab..29675db5c3f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -60,31 +60,41 @@ h2:before{
Asynchronous and Distributed by design. High-level abstractions like Actors and FSM.
50 million msg/sec on a single machine. Small memory footprint; ~2.5 million actors per GB of heap.
Write systems that self-heal. Remote and/or local supervisor hierarchies.
Adaptive load balancing, routing, partitioning and configuration-driven remoting.
Use Akka.NET Extensions to adapt Akka to fit your needs.
Akka.NET is released under the Apache 2 license
Actors were defined in the 1973 paper by Carl Hewitt but have been popularized by the Erlang language, and used for example at Ericsson with great success to build highly concurrent and reliable telecom systems.