From 5ce852c3e664fa9aad1f2255801df0fa10d9baea Mon Sep 17 00:00:00 2001
From: Preeti Maske <pmaske@esri.com>
Date: Tue, 18 Jun 2024 14:17:21 -0700
Subject: [PATCH 1/5] Updated API key instructions for citra update on June
 26th

---
 src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml    | 4 ++--
 src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs | 4 ++--
 src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml     | 4 ++--
 src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml   | 4 ++--
 src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
index 101204495..4dd0eaadd 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
@@ -36,8 +36,8 @@
                         <Label MaxLines="5" Margin="0,10,0,0" >
                             <Label.FormattedText>
                                 <FormattedString>
-                                    <Span Text="You can get or create an API key from " />
-                                    <Span Text="your developer dashboard" TextDecorations="Underline" TextColor="{AppThemeBinding Light={StaticResource Blue100Accent}, Dark={StaticResource Blue300Accent}}" >
+                                    <Span Text="You can create an API key by following" />
+                                    <Span Text="this tutorial" TextDecorations="Underline" TextColor="{AppThemeBinding Light={StaticResource Blue100Accent}, Dark={StaticResource Blue300Accent}}" >
                                         <Span.GestureRecognizers>
                                             <TapGestureRecognizer Tapped="DashboardLinkTapped" />
                                         </Span.GestureRecognizers>
diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
index 52f6f9b4e..a07bf0ba8 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
@@ -91,11 +91,11 @@ private async void SaveApiKey_Click(object sender, EventArgs e)
 
     private void DashboardLinkTapped(object sender, TappedEventArgs e)
     {
-        Microsoft.Maui.ApplicationModel.Launcher.OpenAsync("https://developers.arcgis.com/api-keys/");
+        Microsoft.Maui.ApplicationModel.Launcher.OpenAsync("https://links.esri.com/create-an-api-key");
     }
 
     private void MoreInfoLinkTapped(object sender, TappedEventArgs e)
     {
-        Microsoft.Maui.ApplicationModel.Launcher.OpenAsync("https://developers.arcgis.com/net/security-and-authentication/#api-keys");
+        Microsoft.Maui.ApplicationModel.Launcher.OpenAsync("https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/");
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
index 9af5a9dd4..9163f04e4 100644
--- a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
@@ -71,8 +71,8 @@
                                 Background="CornflowerBlue" Foreground="White"
                                 Click="SaveApiKey_Click" />
                                 <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                            <Span>You can get or create an API key from <Hyperlink NavigateUri="https://developers.arcgis.com/api-keys/">your developer dashboard</Hyperlink>.</Span><LineBreak></LineBreak>
-                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/#api-keys">More info on API Keys</Hyperlink>
+                            <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span><LineBreak></LineBreak>
+                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/">More info on API Keys</Hyperlink>
                                 </TextBlock>
                             </StackPanel>
                         </Border>
diff --git a/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
index d795a6b3e..04e2a921b 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
+++ b/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
@@ -59,8 +59,8 @@
                                 Click="SaveApiKey_Click"
                                 />
                         <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                            <Span>You can get or create an API key from <Hyperlink NavigateUri="https://developers.arcgis.com/api-keys/" RequestNavigate="Hyperlink_RequestNavigate">your developer dashboard</Hyperlink>.</Span><LineBreak></LineBreak>
-                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/#api-keys" RequestNavigate="Hyperlink_RequestNavigate">More info on API Keys</Hyperlink>
+                            <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key" RequestNavigate="Hyperlink_RequestNavigate">this tutorial</Hyperlink>.</Span><LineBreak></LineBreak>
+                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/" RequestNavigate="Hyperlink_RequestNavigate">More info on API Keys</Hyperlink>
                         </TextBlock>
                     </StackPanel>
                 </Border>
diff --git a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
index 5638f02bf..54822d9f5 100644
--- a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
+++ b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
@@ -64,8 +64,8 @@
                                 Background="CornflowerBlue" Foreground="White"
                                 Click="SaveApiKey_Click" />
                                 <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                            <Span>You can get or create an API key from <Hyperlink NavigateUri="https://developers.arcgis.com/api-keys/">your developer dashboard</Hyperlink>.</Span><LineBreak></LineBreak>
-                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/#api-keys">More info on API Keys</Hyperlink>
+                                  <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span><LineBreak></LineBreak>
+                                  <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/">More info on API Keys</Hyperlink>
                                 </TextBlock>
                             </StackPanel>
                         </Border>

From e1535e00b76e01bdc4983ba6f0e65cc23af015bb Mon Sep 17 00:00:00 2001
From: Preeti Maske <pmaske@esri.com>
Date: Tue, 18 Jun 2024 14:30:01 -0700
Subject: [PATCH 2/5] Removed duplicate hyperlinks since it is one tutorial now

---
 src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml     | 3 +--
 src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml   | 3 +--
 src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
index 9163f04e4..d80c1caa2 100644
--- a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
@@ -71,8 +71,7 @@
                                 Background="CornflowerBlue" Foreground="White"
                                 Click="SaveApiKey_Click" />
                                 <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                            <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span><LineBreak></LineBreak>
-                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/">More info on API Keys</Hyperlink>
+                                  <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span>
                                 </TextBlock>
                             </StackPanel>
                         </Border>
diff --git a/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
index 04e2a921b..1e542b0fa 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
+++ b/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
@@ -59,8 +59,7 @@
                                 Click="SaveApiKey_Click"
                                 />
                         <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                            <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key" RequestNavigate="Hyperlink_RequestNavigate">this tutorial</Hyperlink>.</Span><LineBreak></LineBreak>
-                            <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/" RequestNavigate="Hyperlink_RequestNavigate">More info on API Keys</Hyperlink>
+                            <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key" RequestNavigate="Hyperlink_RequestNavigate">this tutorial</Hyperlink>.</Span>
                         </TextBlock>
                     </StackPanel>
                 </Border>
diff --git a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
index 54822d9f5..63ece0df4 100644
--- a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
+++ b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
@@ -64,8 +64,7 @@
                                 Background="CornflowerBlue" Foreground="White"
                                 Click="SaveApiKey_Click" />
                                 <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                                  <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span><LineBreak></LineBreak>
-                                  <Hyperlink NavigateUri="https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/">More info on API Keys</Hyperlink>
+                                  <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span>
                                 </TextBlock>
                             </StackPanel>
                         </Border>

From 8af8b2498ca7b4c24088585a7da89d0c14717332 Mon Sep 17 00:00:00 2001
From: Preeti Maske <pmaske@esri.com>
Date: Tue, 18 Jun 2024 15:07:59 -0700
Subject: [PATCH 3/5] Removed info link from MAUI

---
 src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml    | 5 -----
 src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
index 4dd0eaadd..786129d69 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
@@ -46,11 +46,6 @@
                                 </FormattedString>
                             </Label.FormattedText>
                         </Label>
-                        <Label MaxLines="5" Margin="0,10,0,0" TextDecorations="Underline" TextColor="{AppThemeBinding Light={StaticResource Blue100Accent}, Dark={StaticResource Blue300Accent}}" Text="More info on API Keys">
-                            <Label.GestureRecognizers>
-                                <TapGestureRecognizer Tapped="MoreInfoLinkTapped" />
-                            </Label.GestureRecognizers>
-                        </Label>
                     </VerticalStackLayout>
                 </Border>
             </Grid>
diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
index a07bf0ba8..83a514067 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
@@ -93,9 +93,4 @@ private void DashboardLinkTapped(object sender, TappedEventArgs e)
     {
         Microsoft.Maui.ApplicationModel.Launcher.OpenAsync("https://links.esri.com/create-an-api-key");
     }
-
-    private void MoreInfoLinkTapped(object sender, TappedEventArgs e)
-    {
-        Microsoft.Maui.ApplicationModel.Launcher.OpenAsync("https://developers.arcgis.com/net/security-and-authentication/tutorials/create-an-api-key/");
-    }
 }
\ No newline at end of file

From 9185635db7bd805c45373c54feb834ae421ceba5 Mon Sep 17 00:00:00 2001
From: Preeti Maske <pmaske@esri.com>
Date: Tue, 18 Jun 2024 15:12:54 -0700
Subject: [PATCH 4/5] fixed a typo

---
 src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
index 786129d69..4478c377c 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
@@ -36,7 +36,7 @@
                         <Label MaxLines="5" Margin="0,10,0,0" >
                             <Label.FormattedText>
                                 <FormattedString>
-                                    <Span Text="You can create an API key by following" />
+                                    <Span Text="You can get or create an API key by following" />
                                     <Span Text="this tutorial" TextDecorations="Underline" TextColor="{AppThemeBinding Light={StaticResource Blue100Accent}, Dark={StaticResource Blue300Accent}}" >
                                         <Span.GestureRecognizers>
                                             <TapGestureRecognizer Tapped="DashboardLinkTapped" />

From f24d9137c2006e984b0ef6316f379e59a6cb83ec Mon Sep 17 00:00:00 2001
From: "AVWORLD\\pree6725" <pmaske@esri.com>
Date: Fri, 21 Jun 2024 18:06:21 -0700
Subject: [PATCH 5/5] Use of words suggest by doc team - API key access token

---
 src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml    | 2 +-
 src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml     | 2 +-
 src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml   | 2 +-
 src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
index 4478c377c..4ccbc6e94 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml
@@ -36,7 +36,7 @@
                         <Label MaxLines="5" Margin="0,10,0,0" >
                             <Label.FormattedText>
                                 <FormattedString>
-                                    <Span Text="You can get or create an API key by following" />
+                                    <Span Text="You can create an API key access token as described in " />
                                     <Span Text="this tutorial" TextDecorations="Underline" TextColor="{AppThemeBinding Light={StaticResource Blue100Accent}, Dark={StaticResource Blue300Accent}}" >
                                         <Span.GestureRecognizers>
                                             <TapGestureRecognizer Tapped="DashboardLinkTapped" />
diff --git a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
index d80c1caa2..ba1b36467 100644
--- a/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
+++ b/src/Samples/Toolkit.SampleApp.UWP/MainPage.xaml
@@ -71,7 +71,7 @@
                                 Background="CornflowerBlue" Foreground="White"
                                 Click="SaveApiKey_Click" />
                                 <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                                  <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span>
+                                  <Span>You can create an API key access token as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span>
                                 </TextBlock>
                             </StackPanel>
                         </Border>
diff --git a/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
index 1e542b0fa..ef0c86b85 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
+++ b/src/Samples/Toolkit.SampleApp.WPF/MainWindow.xaml
@@ -59,7 +59,7 @@
                                 Click="SaveApiKey_Click"
                                 />
                         <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                            <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key" RequestNavigate="Hyperlink_RequestNavigate">this tutorial</Hyperlink>.</Span>
+                            <Span>You can create an API key access token as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key" RequestNavigate="Hyperlink_RequestNavigate">this tutorial</Hyperlink>.</Span>
                         </TextBlock>
                     </StackPanel>
                 </Border>
diff --git a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
index 63ece0df4..312be858c 100644
--- a/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
+++ b/src/Samples/Toolkit.SampleApp.WinUI/MainWindow.xaml
@@ -64,7 +64,7 @@
                                 Background="CornflowerBlue" Foreground="White"
                                 Click="SaveApiKey_Click" />
                                 <TextBlock TextWrapping="Wrap" Margin="0,10,0,0">
-                                  <Span>You can get or create an API key as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span>
+                                  <Span>You can create an API key access token as described in <Hyperlink NavigateUri="https://links.esri.com/create-an-api-key">this tutorial</Hyperlink>.</Span>
                                 </TextBlock>
                             </StackPanel>
                         </Border>