Skip to content

Commit e436bff

Browse files
author
Morten Nielsen
committed
Merge branch 'main' into v.next
2 parents 5affe23 + 16f78e0 commit e436bff

File tree

10 files changed

+77
-37
lines changed

10 files changed

+77
-37
lines changed

‎.github/workflows/ghpages.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,29 @@ jobs:
1414

1515
- name: Clone Repo
1616
uses: actions/checkout@v1
17+
18+
- name: Setup Visual Studio Command Prompt
19+
uses: microsoft/[email protected]
20+
21+
- name: Restore
22+
run: |
23+
msbuild /restore /t:Restore src/Toolkit/Toolkit.WPF/Esri.ArcGISRuntime.Toolkit.WPF.csproj /p:Configuration=Release
24+
msbuild /restore /t:Restore src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj /p:Configuration=Release
25+
msbuild /restore /t:Restore src/Toolkit/Toolkit.UWP/Esri.ArcGISRuntime.Toolkit.UWP.csproj /p:Configuration=Release
26+
msbuild /restore /t:Restore src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj /p:Configuration=Release
1727
1828
- name: Download DocFX
1929
run: |
2030
mkdir .tools/docfx
21-
Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v${env:DOCFXVERSION}/docfx.zip" -OutFile ".tools/docfx/docfx.zip"
31+
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"
2232
[System.IO.Compression.ZipFile]::ExtractToDirectory(".tools/docfx/docfx.zip", ".tools/docfx" )
2333
env:
24-
DOCFXVERSION: 2.59.4
34+
DOCFXVERSION: 2.77.0
35+
36+
- name: Download .NET xrefmap
37+
run: |
38+
mkdir output
39+
Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/raw/main/.xrefmap.json" -OutFile "output/dotnet.xrefmap.json"
2540
2641
- name: Build Documentation
2742
env:

‎docs/BuildDoc.cmd‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,39 @@
11
@ECHO OFF
22

3-
SET DocFXVersion=2.59.4
3+
SET DocFXVersion=2.77.0
44
SET DocFxFolder=%~dp0..\.tools\docfx
55

66
REM Download DocFx
77

88
IF NOT EXIST "%DocFxFolder%\v%DocFXVersion%\docfx.exe" (
99
MKDIR "%DocFXFolder%\v%DocFXVersion%"
10-
powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/releases/download/v%DocFXVersion%/docfx.zip" -OutFile '%DocFxFolder%\docfx_v%DocFXVersion%.zip'"
10+
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'"
1111
powershell -ExecutionPolicy ByPass -command "Expand-Archive -LiteralPath '%DocFxFolder%\docfx_v%DocFXVersion%.zip' -DestinationPath '%DocFxFolder%\v%DocFXVersion%'"
1212
DEL "%DocFxFolder%\docfx_v%DocFXVersion%.zip" /Q
1313
)
14+
IF NOT EXIST "../Output/dotnet.xrefmap.json" (
15+
powershell -ExecutionPolicy ByPass -command "Invoke-WebRequest -Uri "https://github.com/dotnet/docfx/raw/main/.xrefmap.json" -OutFile '../Output/dotnet.xrefmap.json'"
16+
)
17+
18+
ECHO SEARCHING FOR VISUAL STUDIO...
19+
"%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
20+
SET /p _VSINSTALLDIR=<%TEMP%\vsinstalldir.txt
21+
ECHO VISUAL STUDIO FOUND IN: %_VSINSTALLDIR%
22+
DEL %TEMP%\vsinstalldir.txt
23+
IF "%_VSINSTALLDIR%"=="" (
24+
ECHO ERROR: VISUAL STUDIO NOT FOUND
25+
EXIT /B 1
26+
)
27+
IF "%VSINSTALLDIR%"=="" (
28+
CALL "%_VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat"
29+
)
30+
31+
msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.WPF/Esri.ArcGISRuntime.Toolkit.WPF.csproj /p:Configuration=Release
32+
msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.WinUI/Esri.ArcGISRuntime.Toolkit.WinUI.csproj /p:Configuration=Release
33+
msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.UWP/Esri.ArcGISRuntime.Toolkit.UWP.csproj /p:Configuration=Release
34+
msbuild /restore /t:Restore %~dp0../src/Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj /p:Configuration=Release
35+
36+
1437
REM Build the output site (HTML) from the generated metadata and input files (uses configuration in docfx.json in this folder)
1538
%DocFxFolder%\v%DocFXVersion%\docfx.exe %~dp0\docfx.json
1639
ECHO Fixing API Reference Links
@@ -23,4 +46,4 @@ REM cd %~dp0..\Output\docs_site
2346
REM git init
2447
REM git add .
2548
REM git commit -m "Update doc"
26-
REM git push --force https://github.com/Esri/arcgis-toolkit-dotnet.git main:gh-pages
49+
REM git push --force https://github.com/Esri/arcgis-maps-sdk-dotnet-toolkit.git main:gh-pages

‎docs/FixApiRefLinks.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function FixApiLinks([string]$path)
77
foreach ($file in $files)
88
{
99
$content = Get-Content -Path $file
10-
$newContent = $content -replace "../(android|ios|uwp|netcore|netstd|netfx)/", ''
10+
$newContent = $content -replace "../(android|ios|uwp|netwin|netstd|netfx)/", ''
1111
$newContent | Set-Content -Path $file
1212
}
1313
}

‎docs/api/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
**Select your platform:**
44

55
- [.NET Framework (WPF)](netfx/index.md)
6-
- [.NET 6 (WPF, WinUI, MAUI WinUI)](net6/index.html)
6+
- [.NET Windows (WPF, WinUI, MAUI WinUI)](netwin/index.md)
77
- [UWP](uwp/index.md)
88
- [MAUI Android](android/index.md)
99
- [MAUI iOS](ios/index.md)

‎docs/api/netstd/index.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎docs/api/net6/index.md‎ renamed to ‎docs/api/netwin/index.md‎

File renamed without changes.

‎docs/docfx.json‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"dest": "../output/docs/api/netfx",
1414
"properties": { "TargetFramework": "net472" },
1515
"disableGitFeatures": false,
16-
"disableDefaultFilter": false
16+
"disableDefaultFilter": false,
17+
"memberLayout": "separatePages"
1718
},
1819
{
1920
"src": [
@@ -27,45 +28,44 @@
2728
"src" : "../src/"
2829
}
2930
],
30-
"dest": "../output/docs/api/net6",
31-
"properties": { "TargetFramework": "net6.0-windows10.0.19041.0" },
31+
"dest": "../Output/docs/api/netwin",
32+
"properties": { "NETWinOnly": "true", "_MauiBindingInterceptorsSupport": "false" },
3233
"disableGitFeatures": false,
33-
"disableDefaultFilter": false
34+
"disableDefaultFilter": false,
35+
"memberLayout": "separatePages"
3436
},
3537
{
3638
"src": [
3739
{
3840
"files": [
3941
"Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj",
40-
"ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj",
41-
"ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj"
4242
],
4343
"exclude": [ "**/bin/**", "**/obj/**" ],
4444
"src" : "../src/"
4545
}
4646
],
47-
"dest": "../output/docs/api/android",
48-
"properties": { "TargetFramework": "net6.0-android" },
47+
"dest": "../Output/docs/api/android",
48+
"properties": { "TargetFramework": "net9.0-android35.0", "_MauiBindingInterceptorsSupport": "false" },
4949
"filter": "filterConfig.yml",
5050
"disableGitFeatures": false,
51-
"disableDefaultFilter": false
51+
"disableDefaultFilter": false,
52+
"memberLayout": "separatePages"
5253
},
5354
{
5455
"src": [
5556
{
5657
"files": [
5758
"Toolkit/Toolkit.Maui/Esri.ArcGISRuntime.Toolkit.Maui.csproj",
58-
"ARToolkit/Esri.ArcGISRuntime.ARToolkit.csproj",
59-
"ARToolkit.Maui/Esri.ArcGISRuntime.ARToolkit.Maui.csproj"
6059
],
6160
"exclude": [ "**/bin/**", "**/obj/**" ],
6261
"src" : "../src/"
6362
}
6463
],
65-
"dest": "../output/docs/api/ios",
66-
"properties": { "TargetFramework": "net6.0-ios" },
64+
"dest": "../Output/docs/api/ios",
65+
"properties": { "TargetFramework": "net9.0-ios18.0", "_MauiBindingInterceptorsSupport": "false" },
6766
"disableGitFeatures": false,
68-
"disableDefaultFilter": false
67+
"disableDefaultFilter": false,
68+
"memberLayout": "separatePages"
6969
},
7070
{
7171
"src": [
@@ -78,10 +78,11 @@
7878
}
7979
],
8080
"dest": "../output/docs/api/uwp",
81-
"properties": { "TargetFramework": "uap10.0.19041" },
81+
"properties": { "TargetFramework": "uap10.0.19041", "DocfxBuild": "true", "MSBuildExtensionsPath": "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\MSBuild" },
8282
"filter": "filterConfig.yml",
8383
"disableGitFeatures": false,
84-
"disableDefaultFilter": false
84+
"disableDefaultFilter": false,
85+
"memberLayout": "separatePages"
8586
}
8687
],
8788
"build": {
@@ -125,23 +126,25 @@
125126
"_appLogoPath": "images/logo.png",
126127
"_gitContribute": {
127128
"branch": "main",
128-
"apiSpecFolder": "docs/apidoc"
129-
}
129+
"apiSpecFolder": "docs/api"
130+
},
131+
"memberLayout": "separatePages"
130132
},
131133
"dest": "../Output/docs_site",
132134
"globalMetadataFiles": [],
133135
"fileMetadataFiles": [],
134136
"template": [
135137
"default", "template-override"
136138
],
137-
"xrefService": [
138-
"https://xref.docs.microsoft.com/query?uid={uid}",
139-
"https://omds.xaml.dev/xrefmap/net.xrefmap.json",
140-
"https://omds.xaml.dev/xrefmap/netstandard.xrefmap.json",
141-
"https://omds.xaml.dev/xrefmap/netwin.xrefmap.json",
142-
"https://omds.xaml.dev/xrefmap/netios.xrefmap.json",
143-
"https://omds.xaml.dev/xrefmap/netandroid.xrefmap.json",
144-
"https://omds.xaml.dev/xrefmap/netuwp.xrefmap.json",
139+
"xref": [
140+
"../Output/dotnet.xrefmap.json",
141+
"https://developers.arcgis.com/net/api-reference/net.xrefmap.yml",
142+
"https://developers.arcgis.com/net/api-reference/netfx.xrefmap.yml",
143+
"https://developers.arcgis.com/net/api-reference/netstandard.xrefmap.yml",
144+
"https://developers.arcgis.com/net/api-reference/netwin.xrefmap.yml",
145+
"https://developers.arcgis.com/net/api-reference/ios.xrefmap.yml",
146+
"https://developers.arcgis.com/net/api-reference/android.xrefmap.yml",
147+
"https://developers.arcgis.com/net/api-reference/uwp.xrefmap.yml",
145148
],
146149
"postProcessors": [],
147150
"markdownEngineName": "markdig",

‎docs/toc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
- name: API Reference
66
href: api/index.md
77
- name: GitHub
8-
href: https://github.com/Esri/arcgis-toolkit-dotnet
8+
href: https://github.com/Esri/arcgis-maps-sdk-dotnet-toolkit

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>$(NETMauiTarget);$(NetAndroidTargetFramework);$(NetiOSTargetFramework);$(NetCatalystTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(NETWinOnly)'=='true'">$(NETMauiTarget)</TargetFrameworks>
56
<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>
67
<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>
78
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetMauiWindowsTargetFramework)</TargetFrameworks>

‎src/Toolkit/Toolkit.WPF/Esri.ArcGISRuntime.Toolkit.WPF.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>$(DotNetTargetFramework);$(NetWindowsTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(NETWinOnly)'=='true'">$(NetWindowsTargetFramework)</TargetFrameworks>
56
<Description>ArcGIS Maps SDK for .NET controls and utilities for WPF apps.</Description>
67
<PackageTags>ArcGIS Cartography Geo Geographic Geography Geolocation Geospatial GIS Latitude Location Longitude Map Mapping Maps Places Spatial 3D WPF toolkit</PackageTags>
78
<ImplicitUsings>enable</ImplicitUsings>

0 commit comments

Comments
 (0)