Merge pull request #14752 from unoplatform/mergify/bp/release/stable/…

…5.0/pr-14733 chore: Move to docfx dotnet tool (backport #14733)
unoplatform · Dec 8, 2023 · 028a4bc · 028a4bc
2 parents 9c5c2e0 + 6a10a5b
commit 028a4bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -16,17 +16,17 @@
 
 		<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
 		<_isWindows>$([MSBuild]::IsOsPlatform(Windows))</_isWindows>
-
-		<!-- Disable automatic documentation generation as the step is executed explicitly through GenerateDoc -->
-		<BuildDocFx>false</BuildDocFx>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<None Include="..\src\Directory.Build.targets" Link="Directory.Build.targets" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<DocfxVersion>2.73.2</DocfxVersion>
+	</PropertyGroup>
+
 	<ItemGroup>
-		<PackageReference Include="docfx.console" Version="2.59.3" GeneratePathProperty="true" />
 		<PackageReference Include="MSBuildTasks" Version="1.5.0.235" />
 		<PackageReference Include="NUnit.Runners" Version="3.12.0" />
 	</ItemGroup>
@@ -249,7 +249,6 @@
 	</Target>
 
 	<Target Name="GenerateDoc" DependsOnTargets="BuildSyncGenerator">
-
 		<MSBuild Properties="Configuration=Debug"
 				 Projects="..\src\Uno.Foundation.Logging\Uno.Foundation.Logging.csproj"
 				 Targets="Restore;Build"
@@ -258,7 +257,8 @@
 
 		<Exec Command="..\src\Uno.UWPSyncGenerator\Bin\Release\Uno.UWPSyncGenerator.exe &quot;doc&quot;" />
 		<Exec Command="powershell .\import_external_docs.ps1" WorkingDirectory="..\doc" />
-		<Exec Command="$(Pkgdocfx_console)\tools\docfx.exe ..\doc\docfx.json -o $(OutputDir)\doc" />
+		<Exec Command="dotnet tool install --tool-path $(MSBuildThisFileDirectory)\tools docfx --version $(DocfxVersion)" Condition="!exists('$(MSBuildThisFileDirectory)\tools\docfx.exe')" />
+		<Exec Command="$(MSBuildThisFileDirectory)\tools\docfx.exe ..\doc\docfx.json --debug -o $(OutputDir)\doc" />
 	</Target>
 
 	<Target Name="RunAPISyncTool" DependsOnTargets="BuildSyncGenerator">

diff --git a/build/convert-sourcetree-to-winui.cmd b/build/convert-sourcetree-to-winui.cmd
@@ -14,6 +14,10 @@ set myvar=%cd%
 pushd ..\src\Uno.WinUIRevert
 dotnet run %myvar%\..
 popd
+
+set UnoDisableNetCurrentMobile=true
+set UnoDisableNetCurrent=true
+
 msbuild Uno.UI.Build.csproj "/p:CombinedConfiguration=Release|AnyCPU;BUILD_BUILDNUMBER=test_test_8888" /m /t:RunAPISyncTool /clp:PerformanceSummary;Summary /bl
 pause
 goto end

diff --git a/build/run-doc-generation.cmd b/build/run-doc-generation.cmd
@@ -4,5 +4,9 @@ echo - This script runs on Windows and in a Developer Command Prompt for Visual
 echo - crosstargeting_override.props is not defininig UnoTargetFrameworkOverride
 echo - This script is run from the build folder (not src/build)
 pause
-msbuild Uno.UI.Build.csproj /r "/p:CombinedConfiguration=Release|AnyCPU;BUILD_BUILDNUMBER=test_test_8888" /m /t:GenerateDoc /clp:Summary /bl
+
+set UnoDisableNetCurrentMobile=true
+set UnoDisableNetCurrent=true
+
+msbuild Uno.UI.Build.csproj /r "/p:CombinedConfiguration=Release|AnyCPU;BUILD_BUILDNUMBER=test_test_8888" /t:GenerateDoc /bl
 pause