Merge pull request #2233 from Microsoft/dev

Sync from dev

Author: sibille

templates/Uwp/Pages/Map.CaliburnMicro/ViewModels/MapPageViewModel.cs

@@ -82,8 +82,7 @@ protected override async void OnInitialize()
             }
 
             // TODO WTS: Set your map service token. If you don't have one, request from https://www.bingmapsportal.com/
-            MapServiceToken = string.Empty;
-
+            // MapServiceToken = string.Empty;
             var view = GetView() as IMapPageView;
 
             view?.AddMapIcon(Center, "Map_YourLocation".GetLocalized());

templates/Uwp/Pages/Map.CodeBehind/Views/MapPagePage.xaml.cs

@@ -74,8 +74,7 @@ public async Task InitializeAsync()
             if (mapControl != null)
             {
                 // TODO WTS: Set your map service token. If you don't have one, request from https://www.bingmapsportal.com/
-                mapControl.MapServiceToken = string.Empty;
-
+                // mapControl.MapServiceToken = string.Empty;
                 AddMapIcon(Center, "Map_YourLocation".GetLocalized());
             }
         }

templates/Uwp/Pages/Map.CodeBehindVB/Views/MapPagePage.xaml.vb

@@ -68,8 +68,7 @@ Namespace Views
 
             If mapControl IsNot Nothing Then
                 ' TODO WTS: Set your map service token. If you don't have one, request from https://www.bingmapsportal.com/
-                mapControl.MapServiceToken = String.Empty
-
+                ' mapControl.MapServiceToken = String.Empty
                 AddMapIcon(Center, "Map_YourLocation".GetLocalized())
             End If
         End Function

templates/Uwp/Pages/Map.Prism/ViewModels/MapPageViewModel.cs

@@ -65,7 +65,7 @@ public MapPageViewModel(ILocationService locationServiceInstance)
             ZoomLevel = DefaultZoomLevel;
 
             // TODO WTS: Set your map service token. If you don't have one, request from https://www.bingmapsportal.com/
-            MapServiceToken = string.Empty;
+            // MapServiceToken = string.Empty;
         }
 
         public override async void OnNavigatedTo(NavigatedToEventArgs e, Dictionary<string, object> viewModelState)

templates/Uwp/Pages/Map/ViewModels/MapPageViewModel.cs

@@ -73,8 +73,7 @@ public async Task InitializeAsync(MapControl map)
             if (map != null)
             {
                 // TODO WTS: Set your map service token. If you don't have one, request from https://www.bingmapsportal.com/
-                map.MapServiceToken = string.Empty;
-
+                // map.MapServiceToken = string.Empty;
                 AddMapIcon(map, Center, "Map_YourLocation".GetLocalized());
             }
         }

templates/Uwp/Pages/MapVB/ViewModels/MapPageViewModel.vb

@@ -66,8 +66,7 @@ Namespace ViewModels
 
             If map IsNot Nothing Then
                 ' TODO WTS: Set your map service token. If you don't have one, request from https://www.bingmapsportal.com/
-                map.MapServiceToken = String.Empty
-
+                ' map.MapServiceToken = String.Empty
                 AddMapIcon(map, Center, "Map_YourLocation".GetLocalized())
             End If
         End Function