Fix docfx build

Author: Morten Nielsen

.github/workflows/ghpages.yml

@@ -28,10 +28,10 @@ jobs:
     - name: Download DocFX
       run: |
         mkdir .tools/docfx
-        Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx.zip" -OutFile ".tools/docfx/docfx.zip"
+        Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx-win-x64-v${env:DOCFXVERSION}.zip" -OutFile ".tools/docfx/docfx.zip"
         [System.IO.Compression.ZipFile]::ExtractToDirectory(".tools/docfx/docfx.zip", ".tools/docfx" )
       env:
-        DOCFXVERSION: 2.59.4
+        DOCFXVERSION: 2.77.0
 
     - name: Download .NET xrefmap
       run: |

docs/BuildDoc.cmd

@@ -1,20 +1,39 @@
 @ECHO OFF
 
-SET DocFXVersion=2.59.4
+SET DocFXVersion=2.77.0
 SET DocFxFolder=%~dp0..\.tools\docfx
 
 REM Download DocFx
 
 IF NOT EXIST "%DocFxFolder%\v%DocFXVersion%\docfx.exe" (
    MKDIR "%DocFXFolder%\v%DocFXVersion%"
-   powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v%DocFXVersion%/docfx.zip" -OutFile '%DocFxFolder%\docfx_v%DocFXVersion%.zip'"
+   powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v%DocFXVersion%/docfx-win-x64-v${env:DOCFXVERSION}.zip" -OutFile '%DocFxFolder%\docfx_v%DocFXVersion%.zip'"
    powershell -ExecutionPolicy ByPass -command "Expand-Archive -LiteralPath '%DocFxFolder%\docfx_v%DocFXVersion%.zip' -DestinationPath '%DocFxFolder%\v%DocFXVersion%'"
    DEL "%DocFxFolder%\docfx_v%DocFXVersion%.zip" /Q
 )
 IF NOT EXIST "../Output/dotnet.xrefmap.json" (
    powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/raw/main/.xrefmap.json" -OutFile '../Output/dotnet.xrefmap.json'"
 )
 
+ECHO SEARCHING FOR VISUAL STUDIO...
+"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -prerelease -version [17.12,18.0) -sort -requires Microsoft.Component.MSBuild -products * -property InstallationPath > %TEMP%\vsinstalldir.txt
+SET /p _VSINSTALLDIR=<%TEMP%\vsinstalldir.txt
+ECHO VISUAL STUDIO FOUND IN: %_VSINSTALLDIR%
+DEL %TEMP%\vsinstalldir.txt
+IF "%_VSINSTALLDIR%"=="" (
+  ECHO ERROR: VISUAL STUDIO NOT FOUND
+  EXIT /B 1
+)
+IF "%VSINSTALLDIR%"=="" (
+  CALL "%_VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat"
+)
+
+msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.WPF/Esri.ArcGISRuntime.Toolkit.WPF.csproj /p:Configuration=Release
+msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj /p:Configuration=Release
+msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.UWP/Esri.ArcGISRuntime.Toolkit.UWP.csproj /p:Configuration=Release
+msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj /p:Configuration=Release
+
+
 REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder)
 %DocFxFolder%\v%DocFXVersion%\docfx.exe %~dp0\docfx.json
 ECHO Fixing API Reference Links

docs/api/netstd/index.md

@@ -13,7 +13,8 @@
       "dest": "../output/docs/api/netfx",
       "properties": { "TargetFramework": "net472" },
       "disableGitFeatures": false,
-      "disableDefaultFilter": false
+      "disableDefaultFilter": false,
+	  "memberLayout": "separatePages"
     },    
     {
       "src": [
@@ -28,44 +29,43 @@
         }
       ],
       "dest": "../Output/docs/api/netwin",
-      "properties": { "TargetFramework": "net9.0-windows10.0.19041.0" },
+      "properties": { "NETWinOnly": "true", "_MauiBindingInterceptorsSupport": "false" },
       "disableGitFeatures": false,
-      "disableDefaultFilter": false
+      "disableDefaultFilter": false,
+	  "memberLayout": "separatePages"
     },
     {
       "src": [
         {
           "files": [
             "Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj",
-            "ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj",
-            "ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj"
           ],
           "exclude": [ "**/bin/**", "**/obj/**" ],
           "src" : "../src/"
         }
       ],
       "dest": "../Output/docs/api/android",
-      "properties": { "TargetFramework": "net9.0-android" },
+      "properties": { "TargetFramework": "net9.0-android35.0", "_MauiBindingInterceptorsSupport": "false" },
       "filter": "filterConfig.yml",
       "disableGitFeatures": false,
-      "disableDefaultFilter": false
+      "disableDefaultFilter": false,
+	  "memberLayout": "separatePages"
     },
     {
       "src": [
         {
           "files": [
             "Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj",
-            "ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj",
-            "ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj"
           ],
           "exclude": [ "**/bin/**", "**/obj/**" ],
           "src" : "../src/"
         }
       ],
       "dest": "../Output/docs/api/ios",
-      "properties": { "TargetFramework": "net9.0-ios" },
+      "properties": { "TargetFramework": "net9.0-ios18.0", "_MauiBindingInterceptorsSupport": "false" },
       "disableGitFeatures": false,
-      "disableDefaultFilter": false
+      "disableDefaultFilter": false,
+	  "memberLayout": "separatePages"
     },
     {
       "src": [
@@ -78,10 +78,11 @@
         }
       ],
       "dest": "../output/docs/api/uwp",
-      "properties": { "TargetFramework": "uap10.0.19041" },
+      "properties": { "TargetFramework": "uap10.0.19041", "DocfxBuild": "true", "MSBuildExtensionsPath": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\MSBuild" },
       "filter": "filterConfig.yml",
       "disableGitFeatures": false,
-      "disableDefaultFilter": false
+      "disableDefaultFilter": false,
+	  "memberLayout": "separatePages"
     }
   ],
   "build": {
@@ -126,7 +127,8 @@
       "_gitContribute": {
         "branch": "main",
         "apiSpecFolder": "docs/api"
-      }
+      },
+	  "memberLayout": "separatePages"
     },
     "dest": "../Output/docs_site",
     "globalMetadataFiles": [],

docs/docfx.json

@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFrameworks>$(NETMauiTarget);$(NetAndroidTargetFramework);$(NetiOSTargetFramework);$(NetCatalystTargetFramework)</TargetFrameworks>
+		<TargetFrameworks Condition="$(NETWinOnly)">$(NETMauiTarget)</TargetFrameworks>
         <Description>ArcGIS Maps SDK for .NET controls and utilities for .NET MAUI apps including .NET for Android, .NET for iOS, .NET for macOS, or Windows UI 3 (WinUI 3)</Description>
         <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D WinUI Android iOS Mac Catalyst MacCatalyst Windows UI 3 toolkit</PackageTags>
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetMauiWindowsTargetFramework)</TargetFrameworks>

src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(DotNetTargetFramework);$(NetWindowsTargetFramework)</TargetFrameworks>
+	<TargetFrameworks Condition="$(NETWinOnly)">$(NetWindowsTargetFramework)</TargetFrameworks>
     <Description>ArcGIS Maps SDK for .NET controls and utilities for WPF apps.</Description>
     <PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D  WPF toolkit</PackageTags>
     <ImplicitUsings>enable</ImplicitUsings>