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{
+ +
@@ -93,6 +103,7 @@ h2:before{
+

Actor Model

@@ -101,7 +112,9 @@ The Actor Model provides a higher level of abstraction for writing concurrent an

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.

Read more

+
+
@@ -115,6 +128,7 @@ Everything in Akka.NET is designed to work in a distributed setting: all interac

Read more

+
@@ -129,10 +143,10 @@ As a parent, the actor is responsible for handling its children’s failures (so This enables a clean set of semantics for managing failures in a concurrent, distributed system and allows for writing highly fault-tolerant systems that self-heal.

Read more

+
-
diff --git a/docs/template/styles/main.css b/docs/template/styles/main.css index 98ca3b62516..f7e02841d11 100644 --- a/docs/template/styles/main.css +++ b/docs/template/styles/main.css @@ -247,6 +247,12 @@ ul li::marker{ } +footer{ + position: relative !important; + opacity: 1 !important; + display: block !important; +} + .footer{ background: url(/images/footer.png) no-repeat left top, linear-gradient(270deg, #FFFFFF, #6DC9ED); diff --git a/serve-docs.ps1 b/serve-docs.ps1 index 251831e3c70..91dbe9fb263 100644 --- a/serve-docs.ps1 +++ b/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 \ No newline at end of file +& .\tools\docfx.console\tools\docfx @args \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 38f3a3bf0fa..595cdd552d2 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ Copyright © 2013-2023 Akka.NET Team Akka.NET Team - 1.5.7 + 1.5.4 akkalogo.png https://github.com/akkadotnet/akka.net https://github.com/akkadotnet/akka.net/blob/master/LICENSE @@ -40,7 +40,7 @@ true - Placeholder for nightlies* + placeholder for nightlies*