V200 (#483)

* Update toolkit for final v200 (#470) Co-authored-by: Nathan Castle <[email protected]> Co-authored-by: Preeti Maske <[email protected]>
Esri · Dec 14, 2022 · d22602f · d22602f
1 parent e97f34e
commit d22602f
Show file tree

Hide file tree

Showing 827 changed files with 13,566 additions and 27,817 deletions.
diff --git a/.github/workflows/CIBuild.yml b/.github/workflows/CIBuild.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Build
       run: |
         msbuild /restore /t:Build src/Esri.ArcGISRuntime.Toolkit.sln /p:Configuration=Release
-        msbuild /restore /t:Build src/Esri.ArcGISRuntime.ARToolkit.sln /p:Configuration=Release
+#       msbuild /restore /t:Build src/Esri.ArcGISRuntime.ARToolkit.sln /p:Configuration=Release
 
     - name: Upload artfacts
       uses: actions/upload-artifact@v1

diff --git a/.gitignore b/.gitignore
@@ -124,3 +124,5 @@ src/ARToolkit/.vs/
 src/Samples/Toolkit.SampleApp.Android/Resources/Resource.Designer.cs
 src/Samples/Toolkit.Samples.Forms/Toolkit.Samples.Forms.UWP/BundleArtifacts
 src/ProjectTemplates/.vs
+src/Samples/Toolkit.SampleApp.WinUI/Samples
+src/Toolkit/Toolkit.UWP/LocalizedStrings/en-US/Resources.resw
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -7,15 +7,15 @@ We do not currently accept new PRs for full features, for example a new Toolkit
 * Bugs you find while using the Toolkit.
 * Requests for new Toolkit components or enhancements to existing Toolkit Components.
 
-## Contributing to the ArcGIS Runtime SDK for .NET Toolkit
+## Contributing to the ArcGIS Maps SDK for .NET Toolkit
 
-This guide describes how you can contribute improvements to the ArcGIS Runtime SDK for .NET Toolkit source code.
+This guide describes how you can contribute improvements to the ArcGIS Maps SDK for .NET Toolkit source code.
 
 1. Make sure you have a [GitHub account](https://github.com/signup/free).
 2. To add an enhancement or fix a problem, create an issue.
     * Be descriptive: Clearly describe the issue including steps to reproduce and, if possible, a sample.
     * If an enhancement, clearly describe the additional functionality and provide a good use case to support it.
-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.
+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.
 4. Clone it to your local machine.
 5. Checkout the [main branch](https://github.com/Esri/arcgis-toolkit-dotnet/tree/main).
 6. Create a new feature branch on your local machine. The name of the branch is not important.

diff --git a/README.md b/README.md
@@ -1,59 +1,59 @@
 [![Link: ArcGIS Developers Home](https://img.shields.io/badge/ArcGIS%20Developers%20Home-633b9b?style=flat-square)](https://developers.arcgis.com)
 [![Link: Documentation](https://img.shields.io/badge/Documentation-633b9b?style=flat-square)](https://developers.arcgis.com/net/)
-[![Link: Tutorials](https://img.shields.io/badge/Tutorials-633b9b?style=flat-square)](https://developers.arcgis.com/documentation/mapping-apis-and-services/tutorials/)
 [![Link: Samples](https://img.shields.io/badge/Samples-633b9b?style=flat-square)](https://developers.arcgis.com/net/wpf/sample-code/)
-[![Link: Demos](https://img.shields.io/badge/Demos-633b9b?style=flat-square)](https://github.com/Esri/arcgis-runtime-demos-dotnet)
-![Badge: Toolkit](https://img.shields.io/badge/Toolkit-black?style=flat-square)
-[![Link: Templates](https://img.shields.io/badge/Templates-633b9b?style=flat-square&logo=visualstudio&labelColor=gray)](https://github.com/Esri/arcgis-runtime-templates-dotnet)
+[![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)
 [![Link: NuGet](https://img.shields.io/badge/NuGet-633b9b?style=flat-square&logo=nuget&labelColor=gray)](https://www.nuget.org/profiles/Esri_Inc)
-[![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)
+[![Link: Early Adopter Community](https://img.shields.io/badge/🙋-Get%20help%20in%20Early%20Adopter%20Community-633b9b?style=flat-square)](https://esriurl.com/agsrt200beta)
 
-# ArcGIS Runtime SDK for .NET - Toolkit
+# ArcGIS Maps SDK for .NET Toolkit
 
-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/).
+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/).
+
+> **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. 
+For any other feedback please join the [Esri Early Adopter community](https://esriurl.com/agsrt200beta).
+
+> **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.
 
 # Documentation
 
-[![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)
-[![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)
-[![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)
-[![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)
-[![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)
-[![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)
-[![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)
+[![Link: Toolkit Guide](https://img.shields.io/badge/%F0%9F%93%84-Toolkit%20Guide-633b9b?style=flat-square)](docs/controls.md)
 
 ## Features
 
 | Component | Screenshot | Description | Availability |
 |-----------|------------|-------------|--------------|
-|[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 |
-|[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 |
-|[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 |
-| [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 |
-| [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 |
-|[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 |
-| [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 |
-| [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 |
-|[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 |
-| [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 |
-| [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 |
-|[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 |
-| [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 |
-|[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|
-|[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 |
+|[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 |
+|[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 |
+| [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 |
+| [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 |
+|[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 |
+| [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 |
+| [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 |
+|[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 |
+| [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 |
+|[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 |
+| [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 |
+|[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 |
+|[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 |
 
 ## Get started
 
-The simplest way to get started is to add the NuGet package(s) to your projects:
+> **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.
+
+The simplest way to get started is to add the platform-specific NuGet package(s) to your projects:
 
-[![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/)
-[![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/)
-[![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/)
-[![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/)
+- WPF: `Esri.ArcGISRuntime.Toolkit.WPF`
+- UWP: `Esri.ArcGISRuntime.Toolkit.WinUI`
+- UWP: `Esri.ArcGISRuntime.Toolkit.UWP`
+- MAUI: `Esri.ArcGISRuntime.Toolkit.Maui`
 
 ## Customize
 
-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.
+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.
+
+## Compatibility
+
+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.
 
 ## Contribute
 

diff --git a/docs/BuildDoc.cmd b/docs/BuildDoc.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 
-SET DocFXVersion=2.58
+SET DocFXVersion=2.59.4
 SET DocFxFolder=%~dp0..\.tools\docfx
 
 REM Download DocFx

diff --git a/docs/api/android/index.md b/docs/api/android/index.md
@@ -1,3 +1,3 @@
-# ArcGIS Runtime Toolkit - API Reference
+# ArcGIS Maps SDK for .NET Toolkit - API Reference
 
 Select an API from the menu on the left.
diff --git a/docs/api/index.md b/docs/api/index.md
@@ -2,15 +2,8 @@
 
 **Select your platform:**
 
-- [.NET Standard API Reference](netstd/index.md)
-
-- [.NET Framework API Reference](netfx/index.md)
-
-- [.NET Core API Reference](netcore/index.md)
-
-- [UWP API Reference](uwp/index.md)
-
-- [Android API Reference](android/index.md)
-
-- [iOS API Reference](ios/index.md)
-
+- [.NET Framework (WPF)](netfx/index.md)
+- [.NET 6 (WPF, WinUI, MAUI WinUI)](net6/index.html)
+- [UWP](uwp/index.md)
+- [MAUI Android](android/index.md)
+- [MAUI iOS](ios/index.md)
diff --git a/docs/api/ios/index.md b/docs/api/ios/index.md
@@ -1,3 +1,3 @@
-# ArcGIS Runtime Toolkit - API Reference
+# ArcGIS Maps SDK for .NET Toolkit - API Reference
 
 Select an API from the menu on the left.
diff --git a/docs/api/net6/index.md b/docs/api/net6/index.md
@@ -0,0 +1,3 @@
+# ArcGIS Maps SDK for .NET Toolkit - API Reference
+
+Select an API from the menu on the left.
diff --git a/docs/api/netcore/index.md b/docs/api/netcore/index.md
diff --git a/docs/api/netfx/index.md b/docs/api/netfx/index.md
@@ -1,3 +1,3 @@
-# ArcGIS Runtime Toolkit - API Reference
+# ArcGIS Maps SDK for .NET Toolkit - API Reference
 
 Select an API from the menu on the left.
diff --git a/docs/api/netstd/index.md b/docs/api/netstd/index.md
@@ -1,3 +1,3 @@
-# ArcGIS Runtime Toolkit - API Reference
+# ArcGIS Maps SDK for .NET Toolkit - API Reference
 
 Select an API from the menu on the left.
diff --git a/docs/api/uwp/index.md b/docs/api/uwp/index.md
@@ -1,3 +1,3 @@
-# ArcGIS Runtime Toolkit - API Reference
+# ArcGIS Maps SDK for .NET Toolkit - API Reference
 
 Select an API from the menu on the left.