From e79284db5b2fff7c69211085deb0978c18f5ebea Mon Sep 17 00:00:00 2001
From: MikhailSuendukov <110986399+MikhailSuendukov@users.noreply.github.com>
Date: Fri, 22 Sep 2023 13:28:23 +0200
Subject: [PATCH] Add dataResidencyRegion option for sending to portal (#1752)

Co-authored-by: AnatolyPristensky <v-anatpr@microsoft.com>
---
 Apps/Contoso.MAUI.Demo/App.xaml.cs            |  1 +
 Apps/Contoso.MAUI.Demo/Constants.cs           |  1 +
 .../ModulePages/AppCenterContentPage.xaml     |  7 +++++
 .../ModulePages/AppCenterContentPage.xaml.cs  |  9 +++++++
 .../Contoso.WinUI.Desktop.Demo/App.xaml.cs    |  2 ++
 .../Contoso.WinUI.Desktop.Demo/Constants.cs   |  1 +
 .../MainWindow.xaml                           | 11 ++++++++
 .../MainWindow.xaml.cs                        | 12 +++++++++
 .../Contoso.WinUI.Desktop.Puppet/App.xaml.cs  |  2 ++
 .../Contoso.WinUI.Desktop.Puppet/Constants.cs |  1 +
 .../MainWindow.xaml                           | 11 ++++++++
 .../MainWindow.xaml.cs                        | 12 +++++++++
 CHANGELOG.md                                  |  4 ++-
 .../Microsoft.AppCenter.Android/AppCenter.cs  | 10 +++++++
 .../ApiDefinition.cs                          | 10 +++++++
 .../Microsoft.AppCenter.Apple/AppCenter.cs    | 10 +++++++
 .../AppCenter.cs                              | 27 +++++++++++++++++--
 .../Channel/Channel.cs                        |  1 +
 .../Ingestion/Models/Log.cs                   | 12 ++++++++-
 .../Ingestion/Models/LogWithProperties.cs     |  5 ++--
 .../Ingestion/Models/StartServiceLog.cs       |  5 ++--
 .../AppCenter.Shared.cs                       | 20 ++++++++++++++
 .../Microsoft.AppCenter/AppCenter.cs          |  9 +++++++
 .../Analytics.cs                              |  2 +-
 .../Ingestion/Models/EventLog.cs              |  5 ++--
 .../Ingestion/Models/PageLog.cs               |  5 ++--
 .../Ingestion/Models/StartSessionLog.cs       |  5 ++--
 .../Crashes.cs                                |  3 ++-
 .../Ingestion/Models/AbstractErrorLog.cs      |  5 ++--
 .../Ingestion/Models/HandledErrorLog.cs       |  5 ++--
 .../Ingestion/Models/ManagedErrorLog.cs       |  5 ++--
 .../Utils/ErrorLogHelper.cs                   |  1 +
 .../Distribute/DistributeUpdateTest.cs        |  6 +++--
 .../AppCenterTest.cs                          | 16 +++++++++++
 .../Ingestion/Models/LogTest.cs               | 12 +++++++++
 .../Ingestion/Models/LogWithPropertiesTest.cs |  2 +-
 scripts/configuration/ac-build-config.xml     |  4 +--
 37 files changed, 232 insertions(+), 27 deletions(-)

diff --git a/Apps/Contoso.MAUI.Demo/App.xaml.cs b/Apps/Contoso.MAUI.Demo/App.xaml.cs
index a1694e441..491153b91 100644
--- a/Apps/Contoso.MAUI.Demo/App.xaml.cs
+++ b/Apps/Contoso.MAUI.Demo/App.xaml.cs
@@ -77,6 +77,7 @@ private void StartAppCenter()
             {
                 AppCenter.SetMaxStorageSizeAsync(Preferences.Get(Constants.StorageMaxSize, 0));
             }
+            AppCenter.PlatformSetDataResidencyRegion(Preferences.Get(Constants.DataResidencyRegion, null));
 
             var appSecret = GetTokensString();
             AppCenter.Start(appSecret, typeof(Analytics), typeof(Crashes), typeof(Distribute));
diff --git a/Apps/Contoso.MAUI.Demo/Constants.cs b/Apps/Contoso.MAUI.Demo/Constants.cs
index 44e96fb59..f8c421579 100644
--- a/Apps/Contoso.MAUI.Demo/Constants.cs
+++ b/Apps/Contoso.MAUI.Demo/Constants.cs
@@ -12,5 +12,6 @@ public static class Constants
     public const string StorageMaxSize = "storage-max-size";
     public const string EnableManualSessionTracker = "enable-manual-session-tracker";
     public const string CountryCode = "country-code";
+    public const string DataResidencyRegion = "data-residency-region";
     public const string EnabledForDebuggableBuild = "enabled-for-debuggable-build";
 }
diff --git a/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml b/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml
index 4678a7c4c..206b3683e 100644
--- a/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml
+++ b/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml
@@ -28,5 +28,12 @@
         <StackLayout Margin="0, 8, 0, 0">
             <Button Text="Save Storage Size" Padding="16, 8, 16, 8" Clicked="SaveStorageSize_Clicked" VerticalOptions="Center" />
         </StackLayout>
+        <StackLayout Margin="0, 8, 0, 0" Orientation="Horizontal">
+            <Label FontSize="Small" Text="Data Residency Region" HorizontalOptions="FillAndExpand" VerticalOptions="Center" />
+            <Entry FontSize="Small" BackgroundColor="LightGrey" x:Name="DataResidencyRegion" Margin="4, 0, 4, 0" HorizontalOptions="FillAndExpand" VerticalOptions="Center" HorizontalTextAlignment="End" />
+        </StackLayout>
+        <StackLayout Margin="0, 8, 0, 0">
+            <Button Text="Save Data Residency Region" Padding="16, 8, 16, 8" Clicked="SaveDataResidencyRegion_Clicked" VerticalOptions="Center" />
+        </StackLayout>
     </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml.cs b/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml.cs
index 8f4efc6b2..20a2eab11 100644
--- a/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml.cs
+++ b/Apps/Contoso.MAUI.Demo/ModulePages/AppCenterContentPage.xaml.cs
@@ -20,6 +20,8 @@ public AppCenterContentPage()
             StorageMaxSize.Text = Preferences.Get(Constants.StorageMaxSize, 0).ToString();
         }
 
+        DataResidencyRegion.Text = Preferences.Get(Constants.DataResidencyRegion, "").ToString();
+
         // Setup start type dropdown choices.
         foreach (var startType in StartTypeUtils.GetStartTypeChoiceStrings())
         {
@@ -77,6 +79,13 @@ private void SaveStorageSize_Clicked(object sender, System.EventArgs e)
         }
     }
 
+    private void SaveDataResidencyRegion_Clicked(object sender, System.EventArgs e)
+    {
+        var inputText = DataResidencyRegion.Text;
+        AppCenter.PlatformSetDataResidencyRegion(inputText);
+        Preferences.Set(Constants.DataResidencyRegion, inputText);
+    }
+
     void AllowedNetworkRequestEnabled(System.Object sender, ToggledEventArgs e)
     {
         AppCenter.IsNetworkRequestsAllowed = e.Value;
diff --git a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/App.xaml.cs b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/App.xaml.cs
index 7a01e1c94..bad893a4b 100644
--- a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/App.xaml.cs
+++ b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/App.xaml.cs
@@ -47,6 +47,8 @@ public App()
             {
                 AppCenter.SetCountryCode(countryCode);
             }
+            var dataResidencyRegion = localSettings.Values[Constants.KeyDataResidencyRegion] as string;
+            AppCenter.PlatformSetDataResidencyRegion(dataResidencyRegion);
             var storageSize = localSettings.Values[Constants.KeyStorageMaxSize] as long?;
             if (storageSize != null && storageSize > 0)
             {
diff --git a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Constants.cs b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Constants.cs
index 8f5442d6a..0111bded1 100644
--- a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Constants.cs
+++ b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/Constants.cs
@@ -8,6 +8,7 @@ public class Constants
         public static string KeyStorageMaxSize = "StorageMaxSize";
         public static string KeyUserId = "UserId";
         public static string KeyCountryCode = "CountryCode";
+        public static string KeyDataResidencyRegion = "DataResidencyRegion";
         public static string KeyFileErrorAttachments = "FileErrorAttachments";
         public static string KeyTextErrorAttachments = "TextErrorAttachments";
         public static string KeyEnableManualSessionTracker = "EnableManualSessionTrackerKey";
diff --git a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml
index 8e2d1a1bb..6aead320b 100644
--- a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml
+++ b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml
@@ -48,6 +48,17 @@
                                 <TextBlock Visibility="Collapsed" Text="Country code has been updated. This value will only be applied to the following sessions." Foreground="Red" Name="CountryCodeNotice" TextWrapping="Wrap"/>
                             </StackPanel>
                         </StackPanel>
+
+                        <!-- Set data residency region -->
+                        <StackPanel Orientation="Horizontal" Height="1" Background="Gray"/>
+                        <StackPanel  Margin="0, 16, 0, 16">
+                            <StackPanel Name="DataResidencyRegionPanel">
+                                <TextBlock Text="Data residency region" Name="DataResidencyRegionLabel"/>
+                                <TextBox Name="DataResidencyRegionText"  VerticalAlignment="Center"/>
+                                <Button Name="SaveDataResidencyRegionButton" Content="Save" Margin="0, 8, 0, 8" Click="SaveDataResidencyRegionButton_Click"/>
+                                <TextBlock Visibility="Collapsed" Text="Data residency region has been updated." Foreground="Red" Name="DataResidencyRegionNotice" TextWrapping="Wrap"/>
+                            </StackPanel>
+                        </StackPanel>
                     </StackPanel>
                 </muxc:TabViewItem>
                 <muxc:TabViewItem Header="Analytics" IsClosable="False">
diff --git a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml.cs b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml.cs
index 4e724affe..3bfd7f37b 100644
--- a/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml.cs
+++ b/Apps/Contoso.WinUI.Desktop.Demo/Contoso.WinUI.Desktop.Demo/MainWindow.xaml.cs
@@ -170,6 +170,18 @@ private void SaveCountryCode()
             AppCenter.SetCountryCode(CountryCodeText.Text.Length > 0 ? CountryCodeText.Text : null);
         }
 
+        private void SaveDataResidencyRegionButton_Click(object sender, RoutedEventArgs e)
+        {
+            SaveDataResidencyRegion();
+        }
+
+        private void SaveDataResidencyRegion()
+        {
+            DataResidencyRegionNotice.Visibility = Visibility.Visible;
+            localSettings.Values[Constants.KeyDataResidencyRegion] = DataResidencyRegionText.Text;
+            AppCenter.PlatformSetDataResidencyRegion(!string.IsNullOrEmpty(DataResidencyRegionText.Text) ? DataResidencyRegionText.Text : null);
+        }
+
         private void SaveStorageSize_Click(object sender, RoutedEventArgs e)
         {
             var storageSize = StorageMaxSize.Text;
diff --git a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/App.xaml.cs b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/App.xaml.cs
index fb962cf72..a982c4e52 100644
--- a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/App.xaml.cs
+++ b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/App.xaml.cs
@@ -48,6 +48,8 @@ public App()
             {
                 AppCenter.SetCountryCode(countryCode);
             }
+            var dataResidencyRegion = localSettings.Values[Constants.KeyDataResidencyRegion] as string;
+            AppCenter.PlatformSetDataResidencyRegion(dataResidencyRegion);
             var storageSize = localSettings.Values[Constants.KeyStorageMaxSize] as long?;
             if (storageSize != null && storageSize > 0)
             {
diff --git a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/Constants.cs b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/Constants.cs
index 70846062c..130831d20 100644
--- a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/Constants.cs
+++ b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/Constants.cs
@@ -8,6 +8,7 @@ public class Constants
         public static string KeyStorageMaxSize = "StorageMaxSize";
         public static string KeyUserId = "UserId";
         public static string KeyCountryCode = "CountryCode";
+        public static string KeyDataResidencyRegion = "DataResidencyRegion";
         public static string KeyFileErrorAttachments = "FileErrorAttachments";
         public static string KeyTextErrorAttachments = "TextErrorAttachments";
         public static string KeyEnableManualSessionTracker = "EnableManualSessionTrackerKey";
diff --git a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml
index 581db1a90..20efb110a 100644
--- a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml
+++ b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml
@@ -48,6 +48,17 @@
                                 <TextBlock Visibility="Collapsed" Text="Country code has been updated. This value will only be applied to the following sessions." Foreground="Red" Name="CountryCodeNotice" TextWrapping="Wrap"/>
                             </StackPanel>
                         </StackPanel>
+                        
+                        <!-- Set data residency region -->
+                        <StackPanel Orientation="Horizontal" Height="1" Background="Gray"/>
+                        <StackPanel  Margin="0, 16, 0, 16">
+                            <StackPanel Name="DataResidencyRegionPanel">
+                                <TextBlock Text="Data residency region" Name="DataResidencyRegionLabel"/>
+                                <TextBox Name="DataResidencyRegionText"  VerticalAlignment="Center"/>
+                                <Button Name="SaveDataResidencyRegionButton" Content="Save" Margin="0, 8, 0, 8" Click="SaveDataResidencyRegionButton_Click"/>
+                                <TextBlock Visibility="Collapsed" Text="Data residency region has been updated." Foreground="Red" Name="DataResidencyRegionNotice" TextWrapping="Wrap"/>
+                            </StackPanel>
+                        </StackPanel>
                     </StackPanel>
                 </muxc:TabViewItem>
                 <muxc:TabViewItem Header="Analytics" IsClosable="False">
diff --git a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml.cs b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml.cs
index 2930929ce..49b0ef980 100644
--- a/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml.cs
+++ b/Apps/Contoso.WinUI.Desktop.Puppet/Contoso.WinUI.Desktop.Puppet/MainWindow.xaml.cs
@@ -172,6 +172,18 @@ private void SaveCountryCode()
             AppCenter.SetCountryCode(CountryCodeText.Text.Length > 0 ? CountryCodeText.Text : null);
         }
 
+        private void SaveDataResidencyRegionButton_Click(object sender, RoutedEventArgs e)
+        {
+            SaveDataResidencyRegion();
+        }
+
+        private void SaveDataResidencyRegion()
+        {
+            DataResidencyRegionNotice.Visibility = Visibility.Visible;
+            localSettings.Values[Constants.KeyDataResidencyRegion] = DataResidencyRegionText.Text;
+            AppCenter.PlatformSetDataResidencyRegion(!string.IsNullOrEmpty(DataResidencyRegionText.Text) ? DataResidencyRegionText.Text : null);
+        }
+
         private void SaveStorageSize_Click(object sender, RoutedEventArgs e)
         {
             var storageSize = StorageMaxSize.Text;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a5ebd356..ef8f2409c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
 # App Center SDK for .NET Change Log
 
-## Version 5.0.3 (Under development)
+## Version 5.0.3
 
 ### App Center
 
+* **[Internal]** Add `dataResidencyRegion` option.
+
 #### Windows
 
 * **[Improvement]** Update SQLitePCLRaw.bundle_green to version 2.1.5
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Android/AppCenter.cs b/SDK/AppCenter/Microsoft.AppCenter.Android/AppCenter.cs
index 7d8ecba7a..778803bb3 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Android/AppCenter.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Android/AppCenter.cs
@@ -103,6 +103,16 @@ static void PlatformSetCountryCode(string countryCode)
             Android.AppCenter.SetCountryCode(countryCode);
         }
 
+        static void PlatformSetDataResidencyRegion(string dataResidencyRegion)
+        {
+            Android.AppCenter.DataResidencyRegion = dataResidencyRegion;
+        }
+
+        static string PlatformGetDataResidencyRegion()
+        {
+            return Android.AppCenter.DataResidencyRegion;
+        }
+
         static bool PlatformConfigured
         {
             get
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Apple/ApiDefinition.cs b/SDK/AppCenter/Microsoft.AppCenter.Apple/ApiDefinition.cs
index 56be4d8c5..7f60ce9e7 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Apple/ApiDefinition.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Apple/ApiDefinition.cs
@@ -213,6 +213,16 @@ interface MSACAppCenter
         [Export("setCountryCode:")]
         void SetCountryCode(string countryCode);
 
+        //+ (void)setDataResidencyRegion:(NSString *)dataResidencyRegion
+        [Static]
+        [Export("setDataResidencyRegion:")]
+        void SetDataResidencyRegion([NullAllowed] string dataResidencyRegion);
+
+        //+ (NSString *)dataResidencyRegion;
+        [Static]
+        [Export("dataResidencyRegion")]
+        NSString GetDataResidencyRegion();
+
         // + (void)setNetworkRequestsAllowed:(BOOL)isAllowed;
         [Static]
         [Export("setNetworkRequestsAllowed:")]
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Apple/AppCenter.cs b/SDK/AppCenter/Microsoft.AppCenter.Apple/AppCenter.cs
index b3d5e0bc2..be19e2507 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Apple/AppCenter.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Apple/AppCenter.cs
@@ -101,6 +101,16 @@ static void PlatformSetCountryCode(string countryCode)
             MSACAppCenter.SetCountryCode(countryCode);
         }
 
+        static void PlatformSetDataResidencyRegion(string dataResidencyRegion)
+        {
+            MSACAppCenter.SetDataResidencyRegion(dataResidencyRegion);
+        }
+
+        static string PlatformGetDataResidencyRegion()
+        {
+            return MSACAppCenter.GetDataResidencyRegion();
+        }
+
         static bool PlatformConfigured
         {
             get
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/AppCenter.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/AppCenter.cs
index 0bf54d1cb..9444346eb 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/AppCenter.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/AppCenter.cs
@@ -48,6 +48,7 @@ public partial class AppCenter
         private bool _instanceConfigured;
         private string _appSecret;
         private long _storageMaxSize;
+        private string _dataResidencyResion;
         private TaskCompletionSource<bool> _storageTaskCompletionSource;
 
         #region static
@@ -132,6 +133,28 @@ public static void PlatformSetCountryCode(string countryCode)
             DeviceInformationHelper.SetCountryCode(countryCode);
         }
 
+        /// <summary>
+        /// Sets the data residency region to send to the backend.
+        /// </summary>
+        /// <param name="dataResidencyRegion">The data residency region code.
+        /// Verify list of supported regions on <link>. Value outside of supported range is treated as ANY</param>
+        public static void PlatformSetDataResidencyRegion(string dataResidencyRegion)
+        {
+            lock (AppCenterLock)
+            {
+                Instance._dataResidencyResion = dataResidencyRegion;
+            }
+        }
+
+        /// <summary>
+        /// Get the data residency region.
+        /// </summary>
+        /// <returns>Data residency region code.</returns>
+        public static string PlatformGetDataResidencyRegion()
+        {
+            return Instance._dataResidencyResion;
+        }
+
         // This method must be called *before* instance of AppCenter has been created
         // for a custom application settings to be used.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -337,7 +360,7 @@ private Task SetInstanceEnabled(bool value)
             // Send started services.
             if (_startedServiceNames != null && value)
             {
-                var startServiceLog = new StartServiceLog { Services = _startedServiceNames };
+                var startServiceLog = new StartServiceLog { Services = _startedServiceNames, DataResidencyRegion = PlatformGetDataResidencyRegion() };
                 _startedServiceNames = null;
                 return _channel.EnqueueAsync(startServiceLog);
             }
@@ -454,7 +477,7 @@ internal void StartInstance(params Type[] services)
             {
                 if (InstanceEnabled)
                 {
-                    _channel.EnqueueAsync(new StartServiceLog { Services = serviceNames }).ConfigureAwait(false);
+                    _channel.EnqueueAsync(new StartServiceLog { Services = serviceNames, DataResidencyRegion = PlatformGetDataResidencyRegion() }).ConfigureAwait(false);
                 }
                 else
                 {
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Channel/Channel.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Channel/Channel.cs
index b6a8272b3..0048512c8 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Channel/Channel.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Channel/Channel.cs
@@ -199,6 +199,7 @@ private async Task PrepareLogAsync(Log log, State state)
             }
             log.Device = log.Device ?? _device;
             log.Timestamp = log.Timestamp ?? DateTime.Now;
+            log.DataResidencyRegion = log.DataResidencyRegion ?? AppCenter.PlatformGetDataResidencyRegion();
         }
 
         private async Task PersistLogAsync(Log log, State state)
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/Log.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/Log.cs
index 3ec206b1b..726d9a426 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/Log.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/Log.cs
@@ -32,12 +32,15 @@ public Log()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
-        public Log(Device device, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string))
+        /// <param name="dataResidencyRegion">optional string used for specify data residency region.
+        /// </param>
+        public Log(Device device, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string))
         {
             Timestamp = timestamp;
             Sid = sid;
             UserId = userId;
             Device = device;
+            DataResidencyRegion = dataResidencyRegion;
             CustomInit();
         }
 
@@ -78,6 +81,13 @@ public Log()
         [JsonProperty(PropertyName = "device")]
         public Device Device { get; set; }
 
+        /// <summary>
+        /// Gets or sets optional string used for specify data residency region.
+        ///
+        /// </summary>
+        [JsonProperty(PropertyName = "dataResidencyRegion")]
+        public string DataResidencyRegion { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/LogWithProperties.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/LogWithProperties.cs
index d977f0bd8..05ae0061c 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/LogWithProperties.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/LogWithProperties.cs
@@ -33,10 +33,11 @@ public LogWithProperties()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
         /// <param name="properties">Additional key/value pair parameters.
         /// </param>
-        public LogWithProperties(Device device, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>))
-            : base(device, timestamp, sid, userId)
+        public LogWithProperties(Device device, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>))
+            : base(device, timestamp, sid, userId, dataResidencyRegion)
         {
             Properties = properties;
             CustomInit();
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/StartServiceLog.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/StartServiceLog.cs
index d370f974c..12f3ec12c 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/StartServiceLog.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared.Windows/Ingestion/Models/StartServiceLog.cs
@@ -39,8 +39,9 @@ public StartServiceLog()
         /// </param>
         /// <param name="services">The list of services of the MobileCenter
         /// Start API call.</param>
-        public StartServiceLog(Device device, DateTime? timestamp = default(DateTime?), Guid? sid = default(Guid?), IList<string> services = default(IList<string>))
-            : base(device, timestamp, sid)
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
+        public StartServiceLog(Device device, DateTime? timestamp = default(DateTime?), Guid? sid = default(Guid?), IList<string> services = default(IList<string>), string dataResidencyRegion = default(string))
+            : base(device, timestamp, sid, null, dataResidencyRegion)
         {
             Services = services;
         }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs
index 574373cad..ddd9e3702 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared/AppCenter.Shared.cs
@@ -114,6 +114,26 @@ public static void SetCountryCode(string countryCode)
             PlatformSetCountryCode(countryCode);
         }
 
+        /// <summary>
+        /// Sets the data residency region to send to the backend.
+        /// </summary>
+        /// <param> name="dataResidencyRegion">The data residency region code.
+        /// Verify list of supported regions on [link]. Value outside of supported range is treated as ANY.
+        /// </param>
+        public static void SetDataResidencyRegion(string dataResidencyRegion)
+        {
+            PlatformSetDataResidencyRegion(dataResidencyRegion);
+        }
+
+        /// <summary>
+        /// Return the data residency region.
+        /// </summary>
+        /// <returns>Data residency region code if set, otherwise null.</returns>
+        public static string GetDataResidencyRegion()
+        {
+            return PlatformGetDataResidencyRegion();
+        }
+
         /// <summary>
         ///     Set the custom user id.
         /// </summary>
diff --git a/SDK/AppCenter/Microsoft.AppCenter/AppCenter.cs b/SDK/AppCenter/Microsoft.AppCenter/AppCenter.cs
index ff633072f..7560719ad 100644
--- a/SDK/AppCenter/Microsoft.AppCenter/AppCenter.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter/AppCenter.cs
@@ -50,6 +50,15 @@ static void PlatformSetCountryCode(string countryCode)
         {
         }
 
+        static void PlatformSetDataResidencyRegion(string dataResidencyRegion)
+        {
+        }
+
+        static string PlatformGetDataResidencyRegion()
+        {
+            return null;
+        }
+
         static bool PlatformConfigured { get; }
 
         static void PlatformConfigure(string appSecret)
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Analytics.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Analytics.cs
index d2b6ada32..91d4bd891 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Analytics.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Analytics.cs
@@ -187,7 +187,7 @@ private void InstanceTrackEvent(string name, IDictionary<string, string> propert
                 if (ValidateName(ref name, type))
                 {
                     properties = PropertyValidator.ValidateProperties(properties, $"{type} '{name}'");
-                    var log = new EventLog(null, Guid.NewGuid(), name, null, null, null, properties);
+                    var log = new EventLog(null, Guid.NewGuid(), name, null, null, null, AppCenter.PlatformGetDataResidencyRegion(), properties);
                     Channel.EnqueueAsync(log);
                 }
             }
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/EventLog.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/EventLog.cs
index 24d402086..4e482919f 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/EventLog.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/EventLog.cs
@@ -44,10 +44,11 @@ public EventLog()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
         /// <param name="properties">Additional key/value pair parameters.
         /// </param>
-        public EventLog(Device device, System.Guid id, string name, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>))
-            : base(device, timestamp, sid, userId, properties)
+        public EventLog(Device device, System.Guid id, string name, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>))
+            : base(device, timestamp, sid, userId, dataResidencyRegion, properties)
         {
             Id = id;
             Name = name;
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/PageLog.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/PageLog.cs
index bd64dd328..0595639b5 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/PageLog.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/PageLog.cs
@@ -42,10 +42,11 @@ public PageLog()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
         /// <param name="properties">Additional key/value pair parameters.
         /// </param>
-        public PageLog(Device device, string name, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>))
-            : base(device, timestamp, sid, userId, properties)
+        public PageLog(Device device, string name, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>))
+            : base(device, timestamp, sid, userId, dataResidencyRegion, properties)
         {
             Name = name;
             CustomInit();
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/StartSessionLog.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/StartSessionLog.cs
index d5692dc9f..d742ba6f5 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/StartSessionLog.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Shared.Windows/Ingestion/Models/StartSessionLog.cs
@@ -38,8 +38,9 @@ public StartSessionLog() { }
         /// Concrete types like StartSessionLog or PageLog are always part of a
         /// session and always include this identifier.
         /// </param>
-        public StartSessionLog(Device device, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?))
-            : base(device, timestamp, sid)
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
+        public StartSessionLog(Device device, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string dataResidencyRegion = default(string))
+            : base(device, timestamp, sid, null, dataResidencyRegion)
         {
         }
 
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Crashes.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Crashes.cs
index d52a539a3..070c06fb0 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Crashes.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Crashes.cs
@@ -390,7 +390,7 @@ private void InstanceTrackError(System.Exception exception, IDictionary<string,
                 var exceptionAndBinaries = ErrorLogHelper.CreateModelExceptionAndBinaries(exception);
                 var errorId = Guid.NewGuid();
                 exceptionAndBinaries.Exception.StackTrace = ErrorLogHelper.ObfuscateUserName(exceptionAndBinaries.Exception.StackTrace);
-                var log = new HandledErrorLog(exception: exceptionAndBinaries.Exception, binaries: exceptionAndBinaries.Binaries, properties: properties, id: errorId, device: null, userId: UserIdContext.Instance.UserId);
+                var log = new HandledErrorLog(exception: exceptionAndBinaries.Exception, binaries: exceptionAndBinaries.Binaries, properties: properties, id: errorId, device: null, userId: UserIdContext.Instance.UserId, dataResidencyRegion: AppCenter.PlatformGetDataResidencyRegion());
                 Channel.EnqueueAsync(log);
                 SendErrorAttachmentsAsync(errorId, attachments);
             }
@@ -405,6 +405,7 @@ private Task SendErrorAttachmentsAsync(Guid errorId, IEnumerable<ErrorAttachment
                 {
                     attachment.Id = Guid.NewGuid();
                     attachment.ErrorId = errorId;
+                    attachment.DataResidencyRegion = attachment.DataResidencyRegion ?? AppCenter.PlatformGetDataResidencyRegion();
                     if (!attachment.ValidatePropertiesForAttachment())
                     {
                         AppCenterLog.Error(LogTag, "Not all required fields are present in ErrorAttachmentLog.");
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/AbstractErrorLog.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/AbstractErrorLog.cs
index 49c656f87..df76b3711 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/AbstractErrorLog.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/AbstractErrorLog.cs
@@ -42,6 +42,7 @@ public AbstractErrorLog()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
         /// <param name="parentProcessId">Parent's process identifier.</param>
         /// <param name="parentProcessName">Parent's process name.</param>
         /// <param name="errorThreadId">Error thread identifier.</param>
@@ -50,8 +51,8 @@ public AbstractErrorLog()
         /// launched, example: '2017-03-13T18:05:42Z'.
         /// </param>
         /// <param name="architecture">CPU architecture.</param>
-        public AbstractErrorLog(Microsoft.AppCenter.Ingestion.Models.Device device, System.Guid id, int processId, string processName, bool fatal, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), int? parentProcessId = default(int?), string parentProcessName = default(string), long? errorThreadId = default(long?), string errorThreadName = default(string), System.DateTime? appLaunchTimestamp = default(System.DateTime?), string architecture = default(string))
-            : base(device, timestamp, sid, userId)
+        public AbstractErrorLog(Microsoft.AppCenter.Ingestion.Models.Device device, System.Guid id, int processId, string processName, bool fatal, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string), int? parentProcessId = default(int?), string parentProcessName = default(string), long? errorThreadId = default(long?), string errorThreadName = default(string), System.DateTime? appLaunchTimestamp = default(System.DateTime?), string architecture = default(string))
+            : base(device, timestamp, sid, userId, dataResidencyRegion)
         {
             Id = id;
             ProcessId = processId;
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/HandledErrorLog.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/HandledErrorLog.cs
index 5aaca79fb..fceb84fc8 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/HandledErrorLog.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/HandledErrorLog.cs
@@ -42,12 +42,13 @@ public HandledErrorLog()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
         /// <param name="properties">Additional key/value pair parameters.
         /// </param>
         /// <param name="id">Unique identifier for this Error.
         /// </param>
-        public HandledErrorLog(Microsoft.AppCenter.Ingestion.Models.Device device, Exception exception, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>), System.Guid? id = default(System.Guid?), IList<Binary> binaries = default(IList<Binary>))
-            : base(device, timestamp, sid, userId, properties)
+        public HandledErrorLog(Microsoft.AppCenter.Ingestion.Models.Device device, Exception exception, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string), IDictionary<string, string> properties = default(IDictionary<string, string>), System.Guid? id = default(System.Guid?), IList<Binary> binaries = default(IList<Binary>))
+            : base(device, timestamp, sid, userId, dataResidencyRegion, properties)
         {
             Id = id;
             Binaries = binaries;
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/ManagedErrorLog.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/ManagedErrorLog.cs
index 58e128f95..7abc9aed5 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/ManagedErrorLog.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Ingestion/Models/ManagedErrorLog.cs
@@ -47,6 +47,7 @@ public ManagedErrorLog()
         /// <param name="userId">optional string used for associating logs with
         /// users.
         /// </param>
+        /// <param name="dataResidencyRegion">The data residency region code.</param>
         /// <param name="parentProcessId">Parent's process identifier.</param>
         /// <param name="parentProcessName">Parent's process name.</param>
         /// <param name="errorThreadId">Error thread identifier.</param>
@@ -57,8 +58,8 @@ public ManagedErrorLog()
         /// <param name="architecture">CPU architecture.</param>
         /// <param name="buildId">Unique ID for a Xamarin build or another
         /// similar technology.</param>
-        public ManagedErrorLog(Microsoft.AppCenter.Ingestion.Models.Device device, System.Guid id, int processId, string processName, bool fatal, Exception exception, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), int? parentProcessId = default(int?), string parentProcessName = default(string), long? errorThreadId = default(long?), string errorThreadName = default(string), System.DateTime? appLaunchTimestamp = default(System.DateTime?), string architecture = default(string), IList<Binary> binaries = default(IList<Binary>), string buildId = default(string))
-            : base(device, id, processId, processName, fatal, timestamp, sid, userId, parentProcessId, parentProcessName, errorThreadId, errorThreadName, appLaunchTimestamp, architecture)
+        public ManagedErrorLog(Microsoft.AppCenter.Ingestion.Models.Device device, System.Guid id, int processId, string processName, bool fatal, Exception exception, System.DateTime? timestamp = default(System.DateTime?), System.Guid? sid = default(System.Guid?), string userId = default(string), string dataResidencyRegion = default(string), int? parentProcessId = default(int?), string parentProcessName = default(string), long? errorThreadId = default(long?), string errorThreadName = default(string), System.DateTime? appLaunchTimestamp = default(System.DateTime?), string architecture = default(string), IList<Binary> binaries = default(IList<Binary>), string buildId = default(string))
+            : base(device, id, processId, processName, fatal, timestamp, sid, userId, dataResidencyRegion, parentProcessId, parentProcessName, errorThreadId, errorThreadName, appLaunchTimestamp, architecture)
         {
             Binaries = binaries;
             BuildId = buildId;
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Utils/ErrorLogHelper.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Utils/ErrorLogHelper.cs
index 6217f9489..fab00c2e7 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Utils/ErrorLogHelper.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Shared.Windows/Utils/ErrorLogHelper.cs
@@ -177,6 +177,7 @@ private ManagedErrorLog InstanceCreateErrorLog(System.Exception exception)
                 Exception = exceptionAndBinaries.Exception,
                 Sid = SessionContext.SessionId,
                 UserId = UserIdContext.Instance.UserId,
+                DataResidencyRegion = AppCenter.PlatformGetDataResidencyRegion(),
                 Binaries = exceptionAndBinaries.Binaries
             };
         }
diff --git a/Tests/Microsoft.AppCenter.Test.Functional/Distribute/DistributeUpdateTest.cs b/Tests/Microsoft.AppCenter.Test.Functional/Distribute/DistributeUpdateTest.cs
index 6d84b675f..03732534a 100644
--- a/Tests/Microsoft.AppCenter.Test.Functional/Distribute/DistributeUpdateTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Functional/Distribute/DistributeUpdateTest.cs
@@ -67,7 +67,8 @@ public async Task GetLastReleaseDetailsAsync()
 
             // Verify response.
             Assert.Equal("GET", result.Method);
-            Assert.Contains("releases/latest?release_hash", result.Uri);
+            Assert.Contains("releases/latest?", result.Uri);
+            Assert.Contains("release_hash=", result.Uri);
             Assert.Contains(Config.ResolveAppSecret(), result.Uri);
 
             // Clear.
@@ -149,7 +150,8 @@ public async Task SetUpdateTrackPrivateTest()
             // Verify response.
             Assert.Equal("GET", result.Method);
             Assert.DoesNotContain("public", result.Uri);
-            Assert.Contains("releases/private/latest?release_hash", result.Uri);
+            Assert.Contains("releases/private/latest?", result.Uri);
+            Assert.Contains("release_hash=", result.Uri);
             Assert.Contains(Config.ResolveAppSecret(), result.Uri);
 
             // Clear.
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/AppCenterTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/AppCenterTest.cs
index 153ff2603..14f86ed70 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/AppCenterTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/AppCenterTest.cs
@@ -139,6 +139,22 @@ public void SetCountryCode()
             DeviceInformationHelper.InformationInvalidated -= mockInformationInvalidated.Object;
         }
 
+        /// <summary>
+        /// Verify data residency region setter
+        /// </summary>
+        [TestMethod]
+        public void SetDataResidencyRegion()
+        {
+            // Not null data residency region
+            var dataResidencyRegion = "RG";
+            AppCenter.SetDataResidencyRegion(dataResidencyRegion);
+            Assert.AreEqual(AppCenter.PlatformGetDataResidencyRegion(), dataResidencyRegion);
+
+            // Null data residency region
+            AppCenter.SetDataResidencyRegion(null);
+            Assert.IsNull(AppCenter.PlatformGetDataResidencyRegion());
+        }
+
         /// <summary>
         /// Verify that starting the same service twice (separately) only calls its OnChannelGroupReady
         /// </summary>
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogTest.cs
index 923bc9715..05e8b189d 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogTest.cs
@@ -34,6 +34,18 @@ public void TestInstanceConstruction()
             Assert.AreEqual(mockDevice.Object, log.Device);
         }
 
+        /// <summary>
+        /// Verify that data residency region is set properly.
+        /// </summary>
+        [TestMethod]
+        public void TestDataResidencyRegionSetter()
+        {
+            var dataResidencyRegion = "RG";
+            Log log = new TestLog();
+            log.DataResidencyRegion = dataResidencyRegion;
+            Assert.AreEqual(dataResidencyRegion, log.DataResidencyRegion);
+        }
+
         /// <summary>
         /// Verify that Validate method throws ValidationException when device == null.
         /// </summary>
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogWithPropertiesTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogWithPropertiesTest.cs
index 1b9d3c37d..d310f2a76 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogWithPropertiesTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Models/LogWithPropertiesTest.cs
@@ -38,6 +38,6 @@ class TestLogWithProperties : LogWithProperties
     {
         public TestLogWithProperties() { }
         public TestLogWithProperties(DateTime? timestamp, Device device, Guid? sid = default(Guid?), IDictionary<string, string> properties = default(IDictionary<string, string>))
-            : base(device, timestamp, sid, null, properties) { }
+            : base(device, timestamp, sid, null, null, properties) { }
     }
 }
diff --git a/scripts/configuration/ac-build-config.xml b/scripts/configuration/ac-build-config.xml
index c1abec45b..add26a6d8 100644
--- a/scripts/configuration/ac-build-config.xml
+++ b/scripts/configuration/ac-build-config.xml
@@ -2,8 +2,8 @@
 <config>
     <sdkInfo>
         <sdkVersion>5.0.3-SNAPSHOT</sdkVersion>
-        <appleVersion>5.0.2</appleVersion>
-        <androidVersion>5.0.1</androidVersion>
+        <appleVersion>5.0.3-4+e375e3002b3e23a619164002729c6ddf7dd4fc4c</appleVersion>
+        <androidVersion>5.0.3</androidVersion>
     </sdkInfo>
     <group id="ios" buildGroup="mac">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.Apple/bin/Release/xamarin.ios/Microsoft.AppCenter.dll"/>