File tree 5 files changed +20
-18
lines changed
5 files changed +20
-18
lines changed Original file line number Diff line number Diff line change @@ -488,14 +488,13 @@ Target "DocFx" (fun _ ->
488
488
{ p with
489
489
ExcludeVersion = true
490
490
Version = " 0.1.0-alpha-1611021200"
491
- OutputDirectory = currentDirectory @@ " tools" }) " msdn.4.5.2"
491
+ OutputDirectory = currentDirectory @@ " tools" }) " msdn.4.5.2"
492
492
493
493
let docsPath = FullName " ./docs"
494
- let docFxPath = FullName( findToolInSubPath " docfx.exe" " tools/docfx.console/tools " )
494
+ let docFxPath = FullName( findToolInSubPath " docfx.exe" " tools/docfx/ " )
495
495
496
496
let args = StringBuilder()
497
497
|> append ( docsPath @@ " docfx.json" )
498
- |> append ( " --warningsAsErrors" )
499
498
|> toText
500
499
501
500
let result = ExecProcess( fun info ->
Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ $FakeVersion = "4.63.0"
33
33
$NugetVersion = " 5.8.0" ;
34
34
$NugetUrl = " https://dist.nuget.org/win-x86-commandline/v$NugetVersion /nuget.exe"
35
35
$ProtobufVersion = " 3.21.5"
36
- $DocfxVersion = " 2.59.4 "
36
+ $DocfxVersion = " 2.67.0 "
37
37
38
38
$IncrementalistVersion = " 0.8.0" ;
39
39
@@ -89,13 +89,14 @@ if (!(Test-Path $ProtobufExePath)) {
89
89
# ##########################################################################
90
90
91
91
# Make sure Docfx has been installed.
92
- $DocfxExePath = Join-Path $ToolPath " docfx.console/tools/docfx.exe"
93
- if (! (Test-Path $DocfxExePath )) {
92
+ # Make sure the Incrementalist has been installed
93
+ if (Get-Command docfx - ErrorAction SilentlyContinue) {
94
+ Write-Host " Found docfx. Skipping install."
95
+ }
96
+ else {
97
+ $DocfxExePath = Join-Path $ToolPath " docfx"
94
98
Write-Host " Installing Docfx..."
95
- Invoke-Expression " &`" $NugetPath `" install docfx.console -ExcludeVersion -Version $DocfxVersion -OutputDirectory `" $ToolPath `" " | Out-Null ;
96
- if ($LASTEXITCODE -ne 0 ) {
97
- Throw " An error occured while restoring docfx.console from NuGet."
98
- }
99
+ dotnet tool install docfx -- version $DocfxVersion -- tool- path " $DocfxExePath "
99
100
}
100
101
101
102
# ##########################################################################
Original file line number Diff line number Diff line change 13
13
" **/*Tests*.csproj" ,
14
14
" **/*Tests.*.csproj"
15
15
],
16
- "src " : " ../src"
16
+ "cwd " : " ../src"
17
17
}],
18
18
"dest" : " api" ,
19
19
"filter" : " filterConfig.yml"
23
23
"files" : [
24
24
" api/**.yml" ,
25
25
" api/index.md"
26
- ]
26
+ ]
27
27
}, {
28
28
"files" : [
29
29
" articles/**.md" ,
77
77
" template"
78
78
],
79
79
"postProcessors" : [" ExtractSearchIndex" ],
80
- "noLangKeyword" : false
80
+ "noLangKeyword" : false ,
81
+ "warningsAsErrors" : true ,
82
+ "Docfx_Git_Timeout" : 30000
81
83
}
82
84
}
Original file line number Diff line number Diff line change 1
1
# docfx.ps1
2
- $VisualStudioVersion = " 15 .0" ;
3
- $DotnetSDKVersion = " 2 .0.0 " ;
2
+ $VisualStudioVersion = " 17.5 .0" ;
3
+ $DotnetSDKVersion = " 7 .0.203 " ;
4
4
5
5
# Get dotnet paths
6
6
$MSBuildExtensionsPath = " C:\Program Files\dotnet\sdk\" + $DotnetSDKVersion ;
@@ -18,4 +18,4 @@ $env:MSBuildExtensionsPath = $MSBuildExtensionsPath;
18
18
$env: MSBuildSDKsPath = $MSBuildSDKsPath ;
19
19
20
20
# Build our docs
21
- & .\tools\docfx.console\tools \docfx @args
21
+ & .\tools\docfx\docfx @args
Original file line number Diff line number Diff line change 2
2
<PropertyGroup >
3
3
<Copyright >Copyright © 2013-2023 Akka.NET Team</Copyright >
4
4
<Authors >Akka.NET Team</Authors >
5
- <VersionPrefix >1.5.4 </VersionPrefix >
5
+ <VersionPrefix >1.5.7 </VersionPrefix >
6
6
<PackageIcon >akkalogo.png</PackageIcon >
7
7
<PackageProjectUrl >https://github.com/akkadotnet/akka.net</PackageProjectUrl >
8
8
<PackageLicenseUrl >https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl >
40
40
<CopyLocalLockFileAssemblies >true</CopyLocalLockFileAssemblies >
41
41
</PropertyGroup >
42
42
<PropertyGroup >
43
- <PackageReleaseNotes >placeholder for nightlies*</PackageReleaseNotes >
43
+ <PackageReleaseNotes >Placeholder for nightlies*</PackageReleaseNotes >
44
44
</PropertyGroup >
45
45
<!-- SourceLink support for all Akka.NET projects -->
46
46
<ItemGroup >
You can’t perform that action at this time.
0 commit comments