Skip to content

Commit d22602f

Browse files
dotMortennCastle1pMaske
authored
V200 (#483)
* Update toolkit for final v200 (#470) Co-authored-by: Nathan Castle <[email protected]> Co-authored-by: Preeti Maske <[email protected]>
1 parent e97f34e commit d22602f

File tree

827 files changed

+13566
-27817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

827 files changed

+13566
-27817
lines changed

.github/workflows/CIBuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Build
2929
run: |
3030
msbuild /restore /t:Build src/Esri.ArcGISRuntime.Toolkit.sln /p:Configuration=Release
31-
msbuild /restore /t:Build src/Esri.ArcGISRuntime.ARToolkit.sln /p:Configuration=Release
31+
# msbuild /restore /t:Build src/Esri.ArcGISRuntime.ARToolkit.sln /p:Configuration=Release
3232

3333
- name: Upload artfacts
3434
uses: actions/upload-artifact@v1

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,5 @@ src/ARToolkit/.vs/
124124
src/Samples/Toolkit.SampleApp.Android/Resources/Resource.Designer.cs
125125
src/Samples/Toolkit.Samples.Forms/Toolkit.Samples.Forms.UWP/BundleArtifacts
126126
src/ProjectTemplates/.vs
127+
src/Samples/Toolkit.SampleApp.WinUI/Samples
128+
src/Toolkit/Toolkit.UWP/LocalizedStrings/en-US/Resources.resw

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ We do not currently accept new PRs for full features, for example a new Toolkit
77
* Bugs you find while using the Toolkit.
88
* Requests for new Toolkit components or enhancements to existing Toolkit Components.
99

10-
## Contributing to the ArcGIS Runtime SDK for .NET Toolkit
10+
## Contributing to the ArcGIS Maps SDK for .NET Toolkit
1111

12-
This guide describes how you can contribute improvements to the ArcGIS Runtime SDK for .NET Toolkit source code.
12+
This guide describes how you can contribute improvements to the ArcGIS Maps SDK for .NET Toolkit source code.
1313

1414
1. Make sure you have a [GitHub account](https://github.com/signup/free).
1515
2. To add an enhancement or fix a problem, create an issue.
1616
* Be descriptive: Clearly describe the issue including steps to reproduce and, if possible, a sample.
1717
* If an enhancement, clearly describe the additional functionality and provide a good use case to support it.
18-
3. [Fork](https://help.github.com/articles/fork-a-repo) the [ArcGIS Runtime SDK for .NET Toolkit repo](https://github.com/Esri/arcgis-toolkit-dotnet/) on GitHub.
18+
3. [Fork](https://help.github.com/articles/fork-a-repo) the [ArcGIS Maps SDK for .NET Toolkit repo](https://github.com/Esri/arcgis-toolkit-dotnet/) on GitHub.
1919
4. Clone it to your local machine.
2020
5. Checkout the [main branch](https://github.com/Esri/arcgis-toolkit-dotnet/tree/main).
2121
6. Create a new feature branch on your local machine. The name of the branch is not important.

README.md

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
[![Link: ArcGIS Developers Home](https://img.shields.io/badge/ArcGIS%20Developers%20Home-633b9b?style=flat-square)](https://developers.arcgis.com)
22
[![Link: Documentation](https://img.shields.io/badge/Documentation-633b9b?style=flat-square)](https://developers.arcgis.com/net/)
3-
[![Link: Tutorials](https://img.shields.io/badge/Tutorials-633b9b?style=flat-square)](https://developers.arcgis.com/documentation/mapping-apis-and-services/tutorials/)
43
[![Link: Samples](https://img.shields.io/badge/Samples-633b9b?style=flat-square)](https://developers.arcgis.com/net/wpf/sample-code/)
5-
[![Link: Demos](https://img.shields.io/badge/Demos-633b9b?style=flat-square)](https://github.com/Esri/arcgis-runtime-demos-dotnet)
6-
![Badge: Toolkit](https://img.shields.io/badge/Toolkit-black?style=flat-square)
7-
[![Link: Templates](https://img.shields.io/badge/Templates-633b9b?style=flat-square&logo=visualstudio&labelColor=gray)](https://github.com/Esri/arcgis-runtime-templates-dotnet)
4+
[![Link: Templates](https://img.shields.io/badge/Templates-633b9b?style=flat-square&logo=visualstudio&labelColor=gray)](https://www.nuget.org/packages?q=ArcGIS+Runtime+Templates)
85
[![Link: NuGet](https://img.shields.io/badge/NuGet-633b9b?style=flat-square&logo=nuget&labelColor=gray)](https://www.nuget.org/profiles/Esri_Inc)
9-
[![Link: Esri Community](https://img.shields.io/badge/🙋-Get%20help%20in%20Esri%20Community-633b9b?style=flat-square)](https://community.esri.com/t5/arcgis-runtime-sdk-for-net/bd-p/arcgis-runtime-sdk-dotnet-questions)
6+
[![Link: Early Adopter Community](https://img.shields.io/badge/🙋-Get%20help%20in%20Early%20Adopter%20Community-633b9b?style=flat-square)](https://esriurl.com/agsrt200beta)
107

11-
# ArcGIS Runtime SDK for .NET - Toolkit
8+
# ArcGIS Maps SDK for .NET Toolkit
129

13-
The ArcGIS Runtime SDK for .NET Toolkit contains controls and components to accelerate your development with [ArcGIS Runtime SDK for .NET](https://developers.arcgis.com/net/).
10+
The ArcGIS Maps SDK for .NET Toolkit contains controls and components to accelerate your development with [ArcGIS Maps SDK for .NET](https://developers.arcgis.com/net/).
11+
12+
> **IMPORTANT** This branch showcases changes we will be releasing in our upcoming 200.0 release. To report any toolkit related bug or question please create an issue in this repo.
13+
For any other feedback please join the [Esri Early Adopter community](https://esriurl.com/agsrt200beta).
14+
15+
> **Note**: At version 200.0, Toolkit assemblies are now built individually for each platform. Please replace any existing `Esri.ArcGISRuntime.Toolkit` NuGet reference with Toolkit NuGet package specific to that platform. For example if you have a WPF application using Toolkit, you will need to uninstall `Esri.ArcGISRuntime.Toolkit` NuGet package and add `Esri.ArcGISRuntime.Toolkit.WPF` NuGet package.
1416
1517
# Documentation
1618

17-
[![Link: Toolkit Guide](https://img.shields.io/badge/%F0%9F%93%84-Toolkit%20Guide-633b9b?style=flat-square)](https://esri.github.io/arcgis-toolkit-dotnet/controls.html)
18-
[![Link: Toolkit API Reference (landing page)](https://img.shields.io/badge/Toolkit%20API%20Reference:-fff?style=flat-square)](https://esri.github.io/arcgis-toolkit-dotnet/api/index.html)
19-
[![Link: Toolkit API Reference - Android](https://img.shields.io/badge/Xamarin.Android-3ddc84?style=flat-square&labelColor=gray&logo=android)](https://esri.github.io/arcgis-toolkit-dotnet/api/android/index.html)
20-
[![Link: Toolkit API Reference - iOS](https://img.shields.io/badge/Xamarin.iOS-black?style=flat-square&labelColor=gray&logo=ios)](https://esri.github.io/arcgis-toolkit-dotnet/api/ios/index.html)
21-
[![Link: Toolkit API Reference - Forms](https://img.shields.io/badge/Xamarin.Forms-3498db?style=flat-square&labelColor=gray&logo=Xamarin)](https://esri.github.io/arcgis-toolkit-dotnet/api/netstd/index.html)
22-
[![Link: Toolkit API Reference - WPF](https://img.shields.io/badge/WPF-0078d6?style=flat-square&labelColor=gray&logo=windowsxp)](https://esri.github.io/arcgis-toolkit-dotnet/api/netfx/index.html)
23-
[![Link: Toolkit API Reference - UWP](https://img.shields.io/badge/UWP-0078d6?style=flat-square&labelColor=gray&logo=windows)](https://esri.github.io/arcgis-toolkit-dotnet/api/uwp/index.html)
19+
[![Link: Toolkit Guide](https://img.shields.io/badge/%F0%9F%93%84-Toolkit%20Guide-633b9b?style=flat-square)](docs/controls.md)
2420

2521
## Features
2622

2723
| Component | Screenshot | Description | Availability |
2824
|-----------|------------|-------------|--------------|
29-
|[ARSceneView](https://esri.github.io/arcgis-toolkit-dotnet/ar.html) | ![image](https://user-images.githubusercontent.com/29742178/150397609-13618fcd-9cd4-462b-a8cd-4ed71981374f.png) | Display ArcGIS content in augmented reality using ARCore and ARKit | iOS, Android, Xamarin.Forms |
30-
|[BasemapGallery](https://esri.github.io/arcgis-toolkit-dotnet/basemap-gallery.html) | <img width="150" title="Basemap Gallery" src="https://user-images.githubusercontent.com/29742178/124198151-f2dc6380-da84-11eb-8e78-4e705d14c33d.png" />| Display a list or grid of Basemaps. | UWP, WPF, Xamarin.Forms |
31-
|[BookmarksView](https://esri.github.io/arcgis-toolkit-dotnet/bookmarks-view.html) | ![image](https://user-images.githubusercontent.com/29742178/150397137-28029b87-5384-41b1-aabf-98260885152d.png) | Show and navigate to bookmarks from a map or a custom list. | iOS, Android, Xamarin.Forms, UWP, WPF |
32-
| [Compass](https://esri.github.io/arcgis-toolkit-dotnet/compass.html) | ![compass](https://user-images.githubusercontent.com/1378165/73389839-d9c8f500-4289-11ea-923c-18232489b3e0.png) | Show a compass direction when the map or scene is rotated. | iOS, Android, Xamarin.Forms, UWP, WPF |
33-
| [FeatureDataField](https://esri.github.io/arcgis-toolkit-dotnet/feature-data-field.html) | ![FeatureDataField](https://user-images.githubusercontent.com/1378165/73389879-ebaa9800-4289-11ea-8e4e-de153a6a371a.png) | Display and optionally allow editing of a single field attribute of a feature. | UWP, WPF |
34-
|[FloorFilter](https://esri.github.io/arcgis-toolkit-dotnet/floor-filter.html) | ![image](https://user-images.githubusercontent.com/29742178/158746908-71a39e28-596f-44b6-9230-e2a04bdaeb9e.png) | Browse floor-aware maps and scenes and filter the view to show levels in a facility. | WPF, Xamarin.Forms, UWP |
35-
| [Legend](https://esri.github.io/arcgis-toolkit-dotnet/legend.html) | <img src="https://user-images.githubusercontent.com/1378165/73389924-011fc200-428a-11ea-91bf-4ea1c2bf6683.png" width="105" title="Legend" />| Display a legend for a single layer in a map, optionally including sublayers. | Android, iOS, Xamarin.Forms, WPF, UWP |
36-
| [MeasureToolbar](https://esri.github.io/arcgis-toolkit-dotnet/measure-toolbar.html) | ![MeasureToolbar](https://user-images.githubusercontent.com/1378165/73389958-0f6dde00-428a-11ea-8c78-7192d49ea605.png) | Measure distances, areas, and features in a map view. | UWP, WPF |
37-
|[OverviewMap](https://esri.github.io/arcgis-toolkit-dotnet/overview-map.html) | <img src="https://user-images.githubusercontent.com/29742178/121975740-34f07000-cd37-11eb-9162-462925cb3fe7.png" width="150" title="Overview Map" /> | Display an interactive inset map for a map or scene. | Xamarin.Forms, UWP, WPF |
38-
| [PopupViewer](https://esri.github.io/arcgis-toolkit-dotnet/popup-viewer.html) | <img src="https://user-images.githubusercontent.com/1378165/73389991-1e549080-428a-11ea-81f3-b2f9c29f61ad.png" width="120" /> | Display and edit details of features and graphics with popups. | Android, iOS, Xamarin.Forms, UWP, WPF |
39-
| [ScaleLine](https://esri.github.io/arcgis-toolkit-dotnet/scale-line.html) | ![ScaleLine](https://user-images.githubusercontent.com/1378165/73390077-3debb900-428a-11ea-8b2f-dfd4914a637e.png) | Display the current scale reference for a map. | Android, iOS, Xamarin.Forms, UWP, WPF |
40-
|[SearchView](https://esri.github.io/arcgis-toolkit-dotnet/search-view.html) | <img title="Search View" width="150" src="https://user-images.githubusercontent.com/29742178/142301018-4bbeb0f2-3021-49a7-b5ec-f642c5700bd0.png" /> | Search using one or more locators, with support for suggestions, automatic zooming, and custom search sources. | Xamarin.Forms, UWP, WPF |
41-
| [SymbolDisplay](https://esri.github.io/arcgis-toolkit-dotnet/symbol-display.html) | ![SymbolDisplay](https://user-images.githubusercontent.com/1378165/73390051-31676080-428a-11ea-9feb-afb5d2aa6385.png) | Render a symbol in a control. | Android, iOS, Xamarin.Forms, UWP, WPF |
42-
|[TimeSlider](https://esri.github.io/arcgis-toolkit-dotnet/time-slider.html) | ![TimeSlider on UWP](https://user-images.githubusercontent.com/29742178/147712751-6d6db182-3e72-4dfc-ba23-3fbe97b1f934.png) | Interactively manipulate or animate the time extent for a map or scene. | Android, iOS, Xamarin.Forms, UWP, WPF|
43-
|[UtilityNetworkTraceTool](https://esri.github.io/arcgis-toolkit-dotnet/un-trace.html) | ![Utility Network Trace Tool on WPF](https://user-images.githubusercontent.com/29742178/173907265-73cd3a39-c836-433e-baf0-4c60f921ba86.png) | Use named trace configurations defined in a web map to perform connected trace operations and compare results. | WPF, UWP, Xamarin.Forms |
25+
|[BasemapGallery](docs/basemap-gallery.md) | <img width="150" title="Basemap Gallery" src="https://user-images.githubusercontent.com/29742178/124198151-f2dc6380-da84-11eb-8e78-4e705d14c33d.png" />| Display a list or grid of Basemaps. | WinUI, MAUI, UWP, WPF |
26+
|[BookmarksView](docs/bookmarks-view.md) | ![image](https://user-images.githubusercontent.com/29742178/150397137-28029b87-5384-41b1-aabf-98260885152d.png) | Show and navigate to bookmarks from a map or a custom list. | WinUI, MAUI, UWP, WPF |
27+
| [Compass](docs/compass.md) | ![compass](https://user-images.githubusercontent.com/1378165/73389839-d9c8f500-4289-11ea-923c-18232489b3e0.png) | Show a compass direction when the map or scene is rotated. | WinUI, MAUI, UWP, WPF |
28+
| [FeatureDataField](docs/feature-data-field.md) | ![FeatureDataField](https://user-images.githubusercontent.com/1378165/73389879-ebaa9800-4289-11ea-8e4e-de153a6a371a.png) | Display and optionally allow editing of a single field attribute of a feature. | UWP, WPF |
29+
|[FloorFilter](docs/floor-filter.md) | ![image](https://user-images.githubusercontent.com/29742178/158746908-71a39e28-596f-44b6-9230-e2a04bdaeb9e.png) | Browse floor-aware maps and scenes and filter the view to show levels in a facility. | WinUI, MAUI, UWP, WPF |
30+
| [Legend](docs/legend.md) | <img src="https://user-images.githubusercontent.com/1378165/73389924-011fc200-428a-11ea-91bf-4ea1c2bf6683.png" width="105" title="Legend" />| Display a legend for a single layer in a map, optionally including sublayers. | WinUI, MAUI, UWP, WPF |
31+
| [MeasureToolbar](docs/measure-toolbar.md) | ![MeasureToolbar](https://user-images.githubusercontent.com/1378165/73389958-0f6dde00-428a-11ea-8c78-7192d49ea605.png) | Measure distances, areas, and features in a map view. | UWP, WPF |
32+
|[OverviewMap](docs/overview-map.md) | <img src="https://user-images.githubusercontent.com/29742178/121975740-34f07000-cd37-11eb-9162-462925cb3fe7.png" width="150" title="Overview Map" /> | Display an interactive inset map for a map or scene. | WinUI, MAUI, UWP, WPF |
33+
| [ScaleLine](docs/scale-line.md) | ![ScaleLine](https://user-images.githubusercontent.com/1378165/73390077-3debb900-428a-11ea-8b2f-dfd4914a637e.png) | Display the current scale reference for a map. | WinUI, MAUI, UWP, WPF |
34+
|[SearchView](docs/search-view.md) | <img title="Search View" width="150" src="https://user-images.githubusercontent.com/29742178/142301018-4bbeb0f2-3021-49a7-b5ec-f642c5700bd0.png" /> | Search using one or more locators, with support for suggestions, automatic zooming, and custom search sources. | WinUI, MAUI, UWP, WPF |
35+
| [SymbolDisplay](docs/symbol-display.md) | ![SymbolDisplay](https://user-images.githubusercontent.com/1378165/73390051-31676080-428a-11ea-9feb-afb5d2aa6385.png) | Render a symbol in a control. | WinUI, MAUI, UWP, WPF |
36+
|[TimeSlider](docs/time-slider.md) | ![TimeSlider on UWP](https://user-images.githubusercontent.com/29742178/147712751-6d6db182-3e72-4dfc-ba23-3fbe97b1f934.png) | Interactively manipulate or animate the time extent for a map or scene. | WinUI, UWP, WPF |
37+
|[UtilityNetworkTraceTool](docs/un-trace.md) | ![Utility Network Trace Tool on WPF](https://user-images.githubusercontent.com/29742178/173907265-73cd3a39-c836-433e-baf0-4c60f921ba86.png) | Use named trace configurations defined in a web map to perform connected trace operations and compare results. | WPF, UWP, WinUI, MAUI |
4438

4539
## Get started
4640

47-
The simplest way to get started is to add the NuGet package(s) to your projects:
41+
> **Note**: At version 200.0, Toolkit assemblies are now built individually for each platform. Please replace any existing `Esri.ArcGISRuntime.Toolkit` NuGet reference with Toolkit NuGet package specific to that platform. For example if you have a WPF application using Toolkit, you will need to uninstall `Esri.ArcGISRuntime.Toolkit` NuGet package and add `Esri.ArcGISRuntime.Toolkit.WPF` NuGet package.
42+
43+
The simplest way to get started is to add the platform-specific NuGet package(s) to your projects:
4844

49-
[![Link: Toolkit NuGet - base package](https://img.shields.io/badge/Toolkit-007ac2?style=flat-square&labelColor=gray&logo=nuget)](https://www.nuget.org/packages/Esri.ArcGISRuntime.Toolkit/)
50-
[![Link: Toolkit NuGet - Xamarin.Forms](https://img.shields.io/badge/Xamarin.Forms%20Toolkit-007ac2?style=flat-square&labelColor=gray&logo=nuget)](https://www.nuget.org/packages/Esri.ArcGISRuntime.Toolkit.Xamarin.Forms/)
51-
[![Link: Toolkit NuGet - AR](https://img.shields.io/badge/Augmented%20Reality%20Toolkit-007ac2?style=flat-square&labelColor=gray&logo=nuget)](https://www.nuget.org/packages/Esri.ArcGISRuntime.ARToolkit/)
52-
[![Link: Toolkit NuGet - Forms AR](https://img.shields.io/badge/Xamarin.Forms%20Augmented%20Reality%20Toolkit-007ac2?style=flat-square&labelColor=gray&logo=nuget)](https://www.nuget.org/packages/Esri.ArcGISRuntime.ARToolkit.Forms/)
45+
- WPF: `Esri.ArcGISRuntime.Toolkit.WPF`
46+
- UWP: `Esri.ArcGISRuntime.Toolkit.WinUI`
47+
- UWP: `Esri.ArcGISRuntime.Toolkit.UWP`
48+
- MAUI: `Esri.ArcGISRuntime.Toolkit.Maui`
5349

5450
## Customize
5551

56-
The ArcGIS Runtime SDK Toolkit is provided as an open-source project so you can customize it for your requirements. [See the docs](https://esri.github.io/arcgis-toolkit-dotnet/buildingtoolkit.html) for instructions on building the Toolkit yourself.
52+
The ArcGIS Maps SDK for .NET Toolkit is provided as an open-source project so you can customize it for your requirements. [See the docs](https://esri.github.io/arcgis-toolkit-dotnet/buildingtoolkit.html) for instructions on building the Toolkit yourself.
53+
54+
## Compatibility
55+
56+
Nuget packages for Toolkit are tested and published in sync with the `Esri.ArcGISRuntime.*` packages. Toolkit is only supported when used with the matching ArcGIS Maps SDK for .NET API version.
5757

5858
## Contribute
5959

docs/BuildDoc.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@ECHO OFF
22

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

66
REM Download DocFx

docs/api/android/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# ArcGIS Runtime Toolkit - API Reference
1+
# ArcGIS Maps SDK for .NET Toolkit - API Reference
22

33
Select an API from the menu on the left.

docs/api/index.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@
22

33
**Select your platform:**
44

5-
- [.NET Standard API Reference](netstd/index.md)
6-
7-
- [.NET Framework API Reference](netfx/index.md)
8-
9-
- [.NET Core API Reference](netcore/index.md)
10-
11-
- [UWP API Reference](uwp/index.md)
12-
13-
- [Android API Reference](android/index.md)
14-
15-
- [iOS API Reference](ios/index.md)
16-
5+
- [.NET Framework (WPF)](netfx/index.md)
6+
- [.NET 6 (WPF, WinUI, MAUI WinUI)](net6/index.html)
7+
- [UWP](uwp/index.md)
8+
- [MAUI Android](android/index.md)
9+
- [MAUI iOS](ios/index.md)

docs/api/ios/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# ArcGIS Runtime Toolkit - API Reference
1+
# ArcGIS Maps SDK for .NET Toolkit - API Reference
22

33
Select an API from the menu on the left.

docs/api/net6/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# ArcGIS Maps SDK for .NET Toolkit - API Reference
2+
3+
Select an API from the menu on the left.

docs/api/netcore/index.md

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

0 commit comments

Comments
 (0)