diff --git a/Apps/Contoso.Android.Puppet/ModulePages/CrashesFragment.cs b/Apps/Contoso.Android.Puppet/ModulePages/CrashesFragment.cs
index 469f924fc..217bc43b5 100644
--- a/Apps/Contoso.Android.Puppet/ModulePages/CrashesFragment.cs
+++ b/Apps/Contoso.Android.Puppet/ModulePages/CrashesFragment.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using Android.Content;
 using Android.OS;
 using Android.Views;
@@ -19,6 +20,7 @@ public class CrashesFragment : PageFragment
         private Button CrashWithNullReferenceExceptionButton;
         private Button CatchNullReferenceExceptionButton;
         private Button CrashAsyncButton;
+        private Button CrashDotNetThreadButton;
         private Button CrashSuperNotCalledButton;
         private Button CrashJavaFromDotNetButton;
 
@@ -39,6 +41,7 @@ public override void OnViewCreated(View view, Bundle savedInstanceState)
             CrashWithNullReferenceExceptionButton = view.FindViewById(Resource.Id.crash_with_null_reference_exception) as Button;
             CatchNullReferenceExceptionButton = view.FindViewById(Resource.Id.catch_null_reference_exception) as Button;
             CrashAsyncButton = view.FindViewById(Resource.Id.crash_async) as Button;
+            CrashDotNetThreadButton = view.FindViewById(Resource.Id.crash_from_dotnet_thread) as Button;
             CrashSuperNotCalledButton = view.FindViewById(Resource.Id.crash_super_not_called) as Button;
             CrashJavaFromDotNetButton = view.FindViewById(Resource.Id.crash_java_from_dotnet) as Button;
 
@@ -50,6 +53,7 @@ public override void OnViewCreated(View view, Bundle savedInstanceState)
             CrashWithNullReferenceExceptionButton.Click += CrashWithNullReferenceException;
             CatchNullReferenceExceptionButton.Click += CatchNullReferenceException;
             CrashAsyncButton.Click += CrashAsync;
+            CrashDotNetThreadButton.Click += CrashDotNetThread;
             CrashSuperNotCalledButton.Click += CrashSuperNotCalled;
             CrashJavaFromDotNetButton.Click += CrashJavaFromDotNet;
 
@@ -123,6 +127,11 @@ async private void CrashAsync(object sender, EventArgs e)
             await FakeService.DoStuffInBackground();
         }
 
+        private void CrashDotNetThread(object sender, EventArgs e)
+        {
+            new Thread(() => throw new Exception("oops")).Start();
+        }
+
         private void CrashSuperNotCalled(object sender, EventArgs e)
         {
             StartActivity(new Intent(Activity, typeof(CrashActivity)));
diff --git a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
index 56bdeabaa..79cc647d5 100644
--- a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
+++ b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.puppet" android:versionCode="48" android:versionName="1.5.0-SNAPSHOT" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.appcenter.xamarin.puppet" android:versionCode="50" android:versionName="1.6.0-SNAPSHOT" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
 	<application android:label="SXPuppet" android:icon="@drawable/Icon" android:theme="@style/PuppetTheme">
 		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />
diff --git a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
index 1133ae393..5256f5816 100644
--- a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/Apps/Contoso.Android.Puppet/Resources/layout/Crashes.axml b/Apps/Contoso.Android.Puppet/Resources/layout/Crashes.axml
index a1f49ce21..444e2cc98 100644
--- a/Apps/Contoso.Android.Puppet/Resources/layout/Crashes.axml
+++ b/Apps/Contoso.Android.Puppet/Resources/layout/Crashes.axml
@@ -60,6 +60,11 @@
                 android:text="@string/CrashAsync"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
+            <Button
+                android:id="@+id/crash_from_dotnet_thread"
+                android:text="@string/CrashDotNetThread"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
             <Button
                 android:id="@+id/crash_super_not_called"
                 android:text="@string/CrashSuperNotCalled"
diff --git a/Apps/Contoso.Android.Puppet/Resources/values/Strings.xml b/Apps/Contoso.Android.Puppet/Resources/values/Strings.xml
index 12f351b35..8b10835e4 100644
--- a/Apps/Contoso.Android.Puppet/Resources/values/Strings.xml
+++ b/Apps/Contoso.Android.Puppet/Resources/values/Strings.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="ApplicationName">App Center Puppet</string>
-	<string name="AppCenterTitle">App Center</string>
-	<string name="AnalyticsTitle">Analytics</string>
-	<string name="CrashesTitle">Crashes</string>
-	<string name="OthersTitle">Others</string>
-	<string name="AppCenterEnabled">App Center Enabled</string>
-	<string name="AppCenterLogLevel">Log Level</string>
-	<string name="AppCenterLogMessage">Log Message</string>
-	<string name="AppCenterLogTag">Log Tag</string>
-	<string name="AppCenterWriteLog">Write Log</string>
-	<string name="AnalyticsEnabled">Analytics Enabled</string>
-	<string name="AnalyticsEventName">Event Name</string>
-	<string name="AnalyticsProperties">Properties</string>
-	<string name="AnalyticsAddProperty">Add Property</string>
-	<string name="AnalyticsTrackEvent">Track Event</string>
-	<string name="CrashesEnabled">Crashes Enabled</string>
-	<string name="TestCrash">Generate Test Crash</string>
-	<string name="PushEnabled">Push Enabled</string>
-	<string name="FirebaseAnalyticsEnabled">Firebase Analytics Enabled</string>
-	<string name="DivideByZero">Divide 42 by 0</string>
-	<string name="CrashWithAggregateException">Crash With Aggregate Exception</string>
-	<string name="CrashWithNullReferenceException">Crash With NullReferenceException</string>
-	<string name="CatchNullReferenceException">Test Catching NullReferenceException</string>
-	<string name="CrashAsync">Crash Inside Async Task</string>
-	<string name="CrashSuperNotCalled">Crash Pure Java: SuperNotCalledException</string>
-	<string name="CrashJavaFromDotNet">Crash Java from .NET</string>
-	<string name="DistributeEnabled">Distribute Enabled</string>
-	<string name="crash_confirmation_dialog_title">Unexpected crash found</string>
-	<string name="crash_confirmation_dialog_message">Would you like to send an anonymous report so we can fix the problem?</string>
-	<string name="crash_confirmation_dialog_not_send_button">Don\'t Send</string>
-	<string name="crash_confirmation_dialog_always_send_button">Always Send</string>
-	<string name="crash_confirmation_dialog_send_button">Send</string>
-	<string name="version_x_available">Version {0} available!</string>
-	<string name="add_property_dialog_title">Add Property</string>
-	<string name="add_property_dialog_message">Please enter a property values to add to the event</string>
-	<string name="add_property_dialog_add_button">Add Property</string>
-	<string name="add_property_dialog_cancel_button">Cancel</string>
+    <string name="ApplicationName">App Center Puppet</string>
+    <string name="AppCenterTitle">App Center</string>
+    <string name="AnalyticsTitle">Analytics</string>
+    <string name="CrashesTitle">Crashes</string>
+    <string name="OthersTitle">Others</string>
+    <string name="AppCenterEnabled">App Center Enabled</string>
+    <string name="AppCenterLogLevel">Log Level</string>
+    <string name="AppCenterLogMessage">Log Message</string>
+    <string name="AppCenterLogTag">Log Tag</string>
+    <string name="AppCenterWriteLog">Write Log</string>
+    <string name="AnalyticsEnabled">Analytics Enabled</string>
+    <string name="AnalyticsEventName">Event Name</string>
+    <string name="AnalyticsProperties">Properties</string>
+    <string name="AnalyticsAddProperty">Add Property</string>
+    <string name="AnalyticsTrackEvent">Track Event</string>
+    <string name="CrashesEnabled">Crashes Enabled</string>
+    <string name="TestCrash">Generate Test Crash</string>
+    <string name="PushEnabled">Push Enabled</string>
+    <string name="FirebaseAnalyticsEnabled">Firebase Analytics Enabled</string>
+    <string name="DivideByZero">Divide 42 by 0</string>
+    <string name="CrashWithAggregateException">Crash With Aggregate Exception</string>
+    <string name="CrashWithNullReferenceException">Crash With NullReferenceException</string>
+    <string name="CatchNullReferenceException">Test Catching NullReferenceException</string>
+    <string name="CrashAsync">Crash Inside Async Task</string>
+    <string name="CrashDotNetThread">Crash Inside .NET Thread</string>
+    <string name="CrashSuperNotCalled">Crash Pure Java: SuperNotCalledException</string>
+    <string name="CrashJavaFromDotNet">Crash Java from .NET</string>
+    <string name="DistributeEnabled">Distribute Enabled</string>
+    <string name="crash_confirmation_dialog_title">Unexpected crash found</string>
+    <string name="crash_confirmation_dialog_message">Would you like to send an anonymous report so we can fix the problem?</string>
+    <string name="crash_confirmation_dialog_not_send_button">Don\'t Send</string>
+    <string name="crash_confirmation_dialog_always_send_button">Always Send</string>
+    <string name="crash_confirmation_dialog_send_button">Send</string>
+    <string name="version_x_available">Version {0} available!</string>
+    <string name="add_property_dialog_title">Add Property</string>
+    <string name="add_property_dialog_message">Please enter a property values to add to the event</string>
+    <string name="add_property_dialog_add_button">Add Property</string>
+    <string name="add_property_dialog_cancel_button">Cancel</string>
 </resources>
\ No newline at end of file
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
index f0930ab70..49c1a5da0 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
@@ -19,14 +19,6 @@ public partial class App : Application
         const string androidKey = "987b5941-4fac-4968-933e-98a7ff29237c";
         const string iosKey = "fe2bf05d-f4f9-48a6-83d9-ea8033fbb644";
 
-        static App()
-        {
-            Crashes.SendingErrorReport += SendingErrorReportHandler;
-            Crashes.SentErrorReport += SentErrorReportHandler;
-            Crashes.FailedToSendErrorReport += FailedToSendErrorReportHandler;
-            Push.PushNotificationReceived += OnPushNotificationReceived;
-        }
-
         public App()
         {
             InitializeComponent();
@@ -35,26 +27,33 @@ public App()
 
         protected override void OnStart()
         {
-            AppCenter.LogLevel = LogLevel.Verbose;
-            Crashes.ShouldProcessErrorReport = ShouldProcess;
-            Crashes.ShouldAwaitUserConfirmation = ConfirmationHandler;
-            Crashes.GetErrorAttachments = GetErrorAttachments;
-            Distribute.ReleaseAvailable = OnReleaseAvailable;
-            AppCenter.Start($"uwp={uwpKey};android={androidKey};ios={iosKey}",
-                               typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Push));
-
-            AppCenter.GetInstallIdAsync().ContinueWith(installId =>
-            {
-                AppCenterLog.Info(LogTag, "AppCenter.InstallId=" + installId.Result);
-            });
-            Crashes.HasCrashedInLastSessionAsync().ContinueWith(hasCrashed =>
-            {
-                AppCenterLog.Info(LogTag, "Crashes.HasCrashedInLastSession=" + hasCrashed.Result);
-            });
-            Crashes.GetLastSessionCrashReportAsync().ContinueWith(report =>
-            {
-                AppCenterLog.Info(LogTag, "Crashes.LastSessionCrashReport.Exception=" + report.Result?.Exception);
-            });
+            if (!AppCenter.Configured)
+            {
+                AppCenter.LogLevel = LogLevel.Verbose;
+                Crashes.SendingErrorReport += SendingErrorReportHandler;
+                Crashes.SendingErrorReport += SendingErrorReportHandler;
+                Crashes.SentErrorReport += SentErrorReportHandler;
+                Crashes.FailedToSendErrorReport += FailedToSendErrorReportHandler;
+                Crashes.ShouldProcessErrorReport = ShouldProcess;
+                Crashes.ShouldAwaitUserConfirmation = ConfirmationHandler;
+                Crashes.GetErrorAttachments = GetErrorAttachments;
+                Distribute.ReleaseAvailable = OnReleaseAvailable;
+                Push.PushNotificationReceived += OnPushNotificationReceived;
+                AppCenter.Start($"uwp={uwpKey};android={androidKey};ios={iosKey}",
+                                   typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Push));
+                AppCenter.GetInstallIdAsync().ContinueWith(installId =>
+                {
+                    AppCenterLog.Info(LogTag, "AppCenter.InstallId=" + installId.Result);
+                });
+                Crashes.HasCrashedInLastSessionAsync().ContinueWith(hasCrashed =>
+                {
+                    AppCenterLog.Info(LogTag, "Crashes.HasCrashedInLastSession=" + hasCrashed.Result);
+                });
+                Crashes.GetLastSessionCrashReportAsync().ContinueWith(report =>
+                {
+                    AppCenterLog.Info(LogTag, "Crashes.LastSessionCrashReport.Exception=" + report.Result?.Exception);
+                });
+            }
         }
 
         protected override void OnSleep()
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
index 389f82c2e..cc4860ae9 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Contoso.Forms.Puppet.Droid</RootNamespace>
     <AssemblyName>Contoso.Forms.Puppet.Droid</AssemblyName>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -155,6 +155,8 @@
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
+    <AndroidResource Include="Resources\drawable\ic_appcenter_logo.xml" />
+    <AndroidResource Include="Resources\values\colors.xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Contoso.Forms.Puppet\Contoso.Forms.Puppet.csproj">
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
index a51c6b0ad..e75477593 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="49" android:versionName="1.5.0-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
-	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="26" />
-	<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-	<permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
-	<application android:label="ACFPuppet" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="51" android:versionName="1.6.0-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
+    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="26" />
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+    <permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <application android:label="ACFPuppet">
+        <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_appcenter_logo" />
+        <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/appcenter_logo" />
+    </application>
 </manifest>
\ No newline at end of file
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs
index c05b2aefb..317304a17 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs
@@ -19,8 +19,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Resources/drawable/ic_appcenter_logo.xml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Resources/drawable/ic_appcenter_logo.xml
new file mode 100644
index 000000000..71534290d
--- /dev/null
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Resources/drawable/ic_appcenter_logo.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="256.0"
+    android:viewportWidth="256.0">
+    <path
+        android:fillColor="#CB2E62"
+        android:pathData="M188,110.4l0,104.7 -3.2,-0.6c-1.8,-0.3 -42,-6.2 -89.3,-13 -47.3,-6.9 -86.9,-12.7 -87.9,-12.9 -9.4,-2.3 13,5.5 90.7,31.4l90.8,30.2 21.7,-9c11.9,-5 25.6,-10.7 30.5,-12.7l8.7,-3.7 0,-96.7 0,-96.7 -29.5,-12.2c-16.2,-6.8 -30.2,-12.5 -31,-12.8 -1.3,-0.5 -1.5,11.2 -1.5,104z" />
+    <path
+        android:fillColor="#CB2E62"
+        android:pathData="M46.3,64.8l-20.3,17.7 0,7.7 0,7.6 11.7,7.5 11.6,7.5 -11.6,7.7 -11.7,7.7 0,7.6 0.1,7.7 20.5,17.9 20.5,17.8 6.7,-1.6c3.7,-1 8.4,-2.1 10.4,-2.7l3.8,-1 0.2,-17.8 0.3,-17.8 19.8,12.9 19.7,12.8 18,-5.1 18,-5.2 0,-40.8 0,-40.8 -6.7,-2c-3.8,-1.1 -11.8,-3.4 -18,-5.2l-11.2,-3.2 -19.4,12.7c-10.7,6.9 -19.7,12.6 -20,12.6 -0.4,0 -0.8,-8 -0.9,-17.7l-0.3,-17.7 -9,-2.3c-4.9,-1.2 -9.7,-2.2 -10.5,-2.2 -0.8,0 -10.6,7.9 -21.7,17.7zM66.8,93.4l-0.3,8.4 -13.3,-6.7 -13.4,-6.7 13.4,-10 13.3,-10.1 0.3,8.4c0.1,4.6 0.1,12.1 0,16.7zM127.6,131.7c-0.2,0.2 -9.1,-3.9 -19.7,-9.3l-19.4,-9.7 19.5,-9.7 19.5,-9.8 0.3,19.1c0.1,10.4 0.1,19.2 -0.2,19.4zM67,140.5c0,9.1 -0.2,16.5 -0.5,16.5 -0.5,0 -23.6,-17 -25.9,-19.1 -0.7,-0.6 23.4,-13.7 25.7,-13.8 0.4,-0.1 0.7,7.3 0.7,16.4z" />
+</vector>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Resources/values/colors.xml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Resources/values/colors.xml
new file mode 100644
index 000000000..36f3476a1
--- /dev/null
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Resources/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="appcenter_logo">#CB2E62</color>
+</resources>
\ No newline at end of file
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
index dba6d9a15..46f3cd33c 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="1.5.0.0" />
+  <Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="1.6.0.0" />
   <mp:PhoneIdentity PhoneProductId="55497ed8-b2ac-4485-ba79-e2b65bb720ed" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>AppCenter-Contoso.Forms.Puppet.UWP</DisplayName>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
index f24b5d2a3..085dac125 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
index 870aee578..988b61ac2 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.microsoft.appcenter.xamarin.forms.puppet</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
index 33cfef79b..f29699224 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
@@ -16,18 +16,9 @@ public partial class App
         public const string LogTag = "AppCenterXamarinPuppet";
 
         // App Center keys
-        private const string UwpKey = "a678b499-1912-4a94-9d97-25b569284d3a";
-        private const string AndroidKey = "bff0949b-7970-439d-9745-92cdc59b10fe";
-        private const string IosKey = "b889c4f2-9ac2-4e2e-ae16-dae54f2c5899";
-
-        static App()
-        {
-            // Set event handlers in static constructor to avoid duplication
-            Crashes.SendingErrorReport += SendingErrorReportHandler;
-            Crashes.SentErrorReport += SentErrorReportHandler;
-            Crashes.FailedToSendErrorReport += FailedToSendErrorReportHandler;
-            Push.PushNotificationReceived += PrintNotification;
-        }
+        const string UwpKey = "a678b499-1912-4a94-9d97-25b569284d3a";
+        const string AndroidKey = "bff0949b-7970-439d-9745-92cdc59b10fe";
+        const string IosKey = "b889c4f2-9ac2-4e2e-ae16-dae54f2c5899";
 
         public App()
         {
@@ -37,39 +28,48 @@ public App()
 
         protected override void OnStart()
         {
-            AppCenterLog.Assert(LogTag, "AppCenter.LogLevel=" + AppCenter.LogLevel);
-            AppCenter.LogLevel = LogLevel.Verbose;
-            AppCenterLog.Info(LogTag, "AppCenter.LogLevel=" + AppCenter.LogLevel);
-            AppCenterLog.Info(LogTag, "AppCenter.Configured=" + AppCenter.Configured);
-
-            // Set callbacks
-            Crashes.ShouldProcessErrorReport = ShouldProcess;
-            Crashes.ShouldAwaitUserConfirmation = ConfirmationHandler;
-            Crashes.GetErrorAttachments = GetErrorAttachments;
-            Distribute.ReleaseAvailable = OnReleaseAvailable;
-
-            AppCenterLog.Assert(LogTag, "AppCenter.Configured=" + AppCenter.Configured);
-            AppCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
-            Distribute.SetInstallUrl("http://install.appcenter-int.trafficmanager.net");
-            Distribute.SetApiUrl("https://appcenter-int.trafficmanager.net/api/v0.1");            
-            AppCenter.Start($"uwp={UwpKey};android={AndroidKey};ios={IosKey}", typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Push));
-            AppCenter.IsEnabledAsync().ContinueWith(enabled =>
-            {
-                AppCenterLog.Info(LogTag, "AppCenter.Enabled=" + enabled.Result);
-            });
-            AppCenter.GetInstallIdAsync().ContinueWith(installId =>
-            {
-                AppCenterLog.Info(LogTag, "AppCenter.InstallId=" + installId.Result);
-            });
-            AppCenterLog.Info(LogTag, "AppCenter.SdkVersion=" + AppCenter.SdkVersion);
-            Crashes.HasCrashedInLastSessionAsync().ContinueWith(hasCrashed =>
-            {
-                AppCenterLog.Info(LogTag, "Crashes.HasCrashedInLastSession=" + hasCrashed.Result);
-            });
-            Crashes.GetLastSessionCrashReportAsync().ContinueWith(report =>
-            {
-                AppCenterLog.Info(LogTag, "Crashes.LastSessionCrashReport.Exception=" + report.Result?.Exception);
-            });
+            if (!AppCenter.Configured)
+            {
+                AppCenterLog.Assert(LogTag, "AppCenter.LogLevel=" + AppCenter.LogLevel);
+                AppCenter.LogLevel = LogLevel.Verbose;
+                AppCenterLog.Info(LogTag, "AppCenter.LogLevel=" + AppCenter.LogLevel);
+                AppCenterLog.Info(LogTag, "AppCenter.Configured=" + AppCenter.Configured);
+
+                // Set callbacks
+                Crashes.ShouldProcessErrorReport = ShouldProcess;
+                Crashes.ShouldAwaitUserConfirmation = ConfirmationHandler;
+                Crashes.GetErrorAttachments = GetErrorAttachments;
+                Distribute.ReleaseAvailable = OnReleaseAvailable;
+
+                // Event handlers
+                Crashes.SendingErrorReport += SendingErrorReportHandler;
+                Crashes.SentErrorReport += SentErrorReportHandler;
+                Crashes.FailedToSendErrorReport += FailedToSendErrorReportHandler;
+                Push.PushNotificationReceived += PrintNotification;
+
+                AppCenterLog.Assert(LogTag, "AppCenter.Configured=" + AppCenter.Configured);
+                AppCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
+                Distribute.SetInstallUrl("http://install.appcenter-int.trafficmanager.net");
+                Distribute.SetApiUrl("https://appcenter-int.trafficmanager.net/api/v0.1");
+                AppCenter.Start($"uwp={UwpKey};android={AndroidKey};ios={IosKey}", typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Push));
+                AppCenter.IsEnabledAsync().ContinueWith(enabled =>
+                {
+                    AppCenterLog.Info(LogTag, "AppCenter.Enabled=" + enabled.Result);
+                });
+                AppCenter.GetInstallIdAsync().ContinueWith(installId =>
+                {
+                    AppCenterLog.Info(LogTag, "AppCenter.InstallId=" + installId.Result);
+                });
+                AppCenterLog.Info(LogTag, "AppCenter.SdkVersion=" + AppCenter.SdkVersion);
+                Crashes.HasCrashedInLastSessionAsync().ContinueWith(hasCrashed =>
+                {
+                    AppCenterLog.Info(LogTag, "Crashes.HasCrashedInLastSession=" + hasCrashed.Result);
+                });
+                Crashes.GetLastSessionCrashReportAsync().ContinueWith(report =>
+                {
+                    AppCenterLog.Info(LogTag, "Crashes.LastSessionCrashReport.Exception=" + report.Result?.Exception);
+                });
+            }
         }
 
         static void PrintNotification(object sender, PushNotificationReceivedEventArgs e)
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs
index 39af58350..3db7e5a6e 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Apps/Contoso.UWP.Puppet/Package.appxmanifest b/Apps/Contoso.UWP.Puppet/Package.appxmanifest
index 42c768fb2..34dd18d7c 100644
--- a/Apps/Contoso.UWP.Puppet/Package.appxmanifest
+++ b/Apps/Contoso.UWP.Puppet/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="10805zumoTestUser.AppCenter-Contoso.UWP.Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="1.5.0.0" />
+  <Identity Name="10805zumoTestUser.AppCenter-Contoso.UWP.Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="1.6.0.0" />
   <mp:PhoneIdentity PhoneProductId="ce1e8604-09a9-4ffb-846b-8762beb84188" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>AppCenter-Contoso.UWP.Puppet</DisplayName>
diff --git a/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
index adee8c654..e49fc60b0 100644
--- a/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Demo/App.config b/Apps/Contoso.WPF.Demo/App.config
index 88fa4027b..d1428ad71 100644
--- a/Apps/Contoso.WPF.Demo/App.config
+++ b/Apps/Contoso.WPF.Demo/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj b/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj
index 8660b504f..e2f9e51eb 100644
--- a/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj
+++ b/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj
@@ -8,11 +8,12 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Contoso.WPF.Demo</RootNamespace>
     <AssemblyName>Contoso.WPF.Demo</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs b/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs
index a9a1b4e41..b27b0578b 100644
--- a/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs
+++ b/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WPF.Demo.Properties
-{
-
-
+namespace Contoso.WPF.Demo.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace Contoso.WPF.Demo.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Contoso.WPF.Demo.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs b/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs
index 8a90a3b19..9695453de 100644
--- a/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs
+++ b/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WPF.Demo.Properties
-{
-
-
+namespace Contoso.WPF.Demo.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/Apps/Contoso.WPF.Demo/project.json b/Apps/Contoso.WPF.Demo/project.json
index 3b5e3b06f..714d6c18f 100644
--- a/Apps/Contoso.WPF.Demo/project.json
+++ b/Apps/Contoso.WPF.Demo/project.json
@@ -4,7 +4,7 @@
     "Microsoft.AppCenter.Crashes": "1.5.0"
   },
   "frameworks": {
-    "net452": {}
+    "net45": {}
   },
   "runtimes": {
     "win": {}
diff --git a/Apps/Contoso.WPF.Puppet/App.config b/Apps/Contoso.WPF.Puppet/App.config
index 88fa4027b..d1428ad71 100644
--- a/Apps/Contoso.WPF.Puppet/App.config
+++ b/Apps/Contoso.WPF.Puppet/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj b/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj
index caf7a2020..360533e16 100644
--- a/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj
+++ b/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj
@@ -8,13 +8,14 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Contoso.WPF.Puppet</RootNamespace>
     <AssemblyName>Contoso.WPF.Puppet</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
index ba8d249ee..70d59da24 100644
--- a/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
@@ -27,5 +27,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs b/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs
index 534c182ae..671b808a8 100644
--- a/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs
+++ b/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WPF.Puppet.Properties
-{
-
-
+namespace Contoso.WPF.Puppet.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace Contoso.WPF.Puppet.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Contoso.WPF.Puppet.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs b/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs
index ce64fcd05..0e0696516 100644
--- a/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs
+++ b/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WPF.Puppet.Properties
-{
-
-
+namespace Contoso.WPF.Puppet.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/Apps/Contoso.WPF.Puppet/project.json b/Apps/Contoso.WPF.Puppet/project.json
index e0cf888d4..cac48da3c 100644
--- a/Apps/Contoso.WPF.Puppet/project.json
+++ b/Apps/Contoso.WPF.Puppet/project.json
@@ -3,7 +3,7 @@
     "sqlite-net-pcl": "1.3.1"
   },
   "frameworks": {
-    "net452": {}
+    "net45": {}
   },
   "runtimes": {
     "win": {}
diff --git a/Apps/Contoso.WinForms.Demo/App.config b/Apps/Contoso.WinForms.Demo/App.config
index 88fa4027b..d1428ad71 100644
--- a/Apps/Contoso.WinForms.Demo/App.config
+++ b/Apps/Contoso.WinForms.Demo/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj b/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj
index af11e61e1..4d0ea68ad 100644
--- a/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj
+++ b/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj
@@ -8,9 +8,10 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Contoso.WinForms.Demo</RootNamespace>
     <AssemblyName>Contoso.WinForms.Demo</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs b/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs
index b4caafebc..e527abbc4 100644
--- a/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs
+++ b/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WinForms.Demo.Properties
-{
-
-
+namespace Contoso.WinForms.Demo.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace Contoso.WinForms.Demo.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Contoso.WinForms.Demo.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs b/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs
index a16bfc753..45db7c05d 100644
--- a/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs
+++ b/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WinForms.Demo.Properties
-{
-
-
+namespace Contoso.WinForms.Demo.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/Apps/Contoso.WinForms.Demo/project.json b/Apps/Contoso.WinForms.Demo/project.json
index 3b5e3b06f..714d6c18f 100644
--- a/Apps/Contoso.WinForms.Demo/project.json
+++ b/Apps/Contoso.WinForms.Demo/project.json
@@ -4,7 +4,7 @@
     "Microsoft.AppCenter.Crashes": "1.5.0"
   },
   "frameworks": {
-    "net452": {}
+    "net45": {}
   },
   "runtimes": {
     "win": {}
diff --git a/Apps/Contoso.WinForms.Puppet/App.config b/Apps/Contoso.WinForms.Puppet/App.config
index 8227adb98..d1428ad71 100644
--- a/Apps/Contoso.WinForms.Puppet/App.config
+++ b/Apps/Contoso.WinForms.Puppet/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
 </configuration>
diff --git a/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj b/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj
index 22bc83831..73a9e1e05 100644
--- a/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj
+++ b/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Contoso.WinForms.Puppet</RootNamespace>
     <AssemblyName>Contoso.WinForms.Puppet</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs
index d98088941..6345d5ed9 100644
--- a/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs b/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs
index 81ae7ad81..04a675eb0 100644
--- a/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs
+++ b/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WinForms.Demo.Properties {
+namespace Contoso.WinForms.Puppet.Properties {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace Contoso.WinForms.Demo.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs b/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs
index a73de79d7..4fc6c59a6 100644
--- a/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs
+++ b/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs
@@ -8,11 +8,11 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Contoso.WinForms.Demo.Properties {
+namespace Contoso.WinForms.Puppet.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Apps/Contoso.WinForms.Puppet/project.json b/Apps/Contoso.WinForms.Puppet/project.json
index e0cf888d4..cac48da3c 100644
--- a/Apps/Contoso.WinForms.Puppet/project.json
+++ b/Apps/Contoso.WinForms.Puppet/project.json
@@ -3,7 +3,7 @@
     "sqlite-net-pcl": "1.3.1"
   },
   "frameworks": {
-    "net452": {}
+    "net45": {}
   },
   "runtimes": {
     "win": {}
diff --git a/Apps/Contoso.iOS.Puppet/Info.plist b/Apps/Contoso.iOS.Puppet/Info.plist
index df36ae1c2..c6d7ebf95 100644
--- a/Apps/Contoso.iOS.Puppet/Info.plist
+++ b/Apps/Contoso.iOS.Puppet/Info.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.microsoft.appcenter.xamarin.puppet</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..5380925ae
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,32 @@
+<!--
+    Thanks for your interest in using the App Center SDK for .NET platforms.
+    If your issue is not related to using our .NET SDK but rather about the product experience like the portal or CI,
+    please create a ticket using the blue chat button on any page of the https://appcenter.ms portal instead.
+-->
+
+### **Description**
+
+Please describe the issue you are facing or a feature you would like to be added to the SDK.
+
+### **Repro Steps**
+
+Please list the steps used to reproduce your issue.
+
+1.
+2.
+
+### **Details**
+
+1. What is your app platform (Xamarin.Android or Xamarin.iOS or UWP)?
+    - e.g. Xamarin.Forms on all 3 platforms (Android, iOS and UWP).
+2. If using Xamarin.Forms or if using portable/shared code to call our SDK APIs, are you using shared project, PCL code or .NET standard code for the application? Which .NET standard version or which PCL profile?
+    - e.g. .NET standard 2.0.
+2. Which SDK version are you using?
+    - e.g. 1.5.0
+4. Which OS version did you experience the issue on?
+    - e.g. iOS 11, Android 8.1.0
+5. What device version did you see this error on?  Were you using an emulator or a physical device?
+    - e.g. iPhone X physical device, Google Pixel 2 emulator
+6. What third party libraries are you using? <!-- For .NET, you can find these in your .csproj, package.json, or package.config files -->
+    - example
+7. Please enable verbose logging for your app using `AppCenter.LogLevel = LogLevel.Verbose` before your call to `AppCenter.Start(...)` and include the logs here:
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenter/Microsoft.AppCenter.Android.Bindings/Properties/AssemblyInfo.cs
index 72271c7b2..b63ae6c68 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Android.Bindings/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Android/Properties/AssemblyInfo.cs b/SDK/AppCenter/Microsoft.AppCenter.Android/Properties/AssemblyInfo.cs
index ae27cc369..caed38b12 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Android/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Android/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs b/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs
index ac17cedb0..cb061f33e 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Shared/WrapperSdk.cs
@@ -5,6 +5,6 @@ public static class WrapperSdk
         public const string Name = "appcenter.xamarin";
 
         /* We can't use reflection for assemblyInformationalVersion on iOS with "Link All" optimization. */
-        internal const string Version = "1.5.0-SNAPSHOT";
+        internal const string Version = "1.6.0-SNAPSHOT";
     }
 }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.UWP/Properties/AssemblyInfo.cs b/SDK/AppCenter/Microsoft.AppCenter.UWP/Properties/AssemblyInfo.cs
index 3906102b1..c21a85a6b 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.UWP/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 [assembly: ComVisible(false)]
 [assembly: InternalsVisibleTo("Microsoft.AppCenter.Test.UWP")]
\ No newline at end of file
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/Channel.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/Channel.cs
index cdde3ea18..317535d01 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/Channel.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/Channel.cs
@@ -16,19 +16,35 @@ namespace Microsoft.AppCenter.Channel
     public sealed class Channel : IChannelUnit
     {
         private const int ClearBatchSize = 100;
+
         private Ingestion.Models.Device _device;
+
         private readonly string _appSecret;
+
         private readonly IStorage _storage;
+
         private readonly IIngestion _ingestion;
+
         private readonly IDeviceInformationHelper _deviceInfoHelper = new DeviceInformationHelper();
-        private readonly Dictionary<string, List<Log>> _sendingBatches = new Dictionary<string, List<Log>>();
+
+        private readonly IDictionary<string, List<Log>> _sendingBatches = new Dictionary<string, List<Log>>();
+
+        private readonly ISet<IServiceCall> _calls = new HashSet<IServiceCall>();
+
         private readonly int _maxParallelBatches;
+
         private readonly int _maxLogsPerBatch;
+
         private long _pendingLogCount;
+
         private bool _enabled;
+
         private bool _discardLogs;
+
         private bool _batchScheduled;
+
         private TimeSpan _batchTimeInterval;
+
         private readonly StatefulMutex _mutex = new StatefulMutex();
 
         internal Channel(string name, int maxLogsPerBatch, TimeSpan batchTimeInterval, int maxParallelBatches,
@@ -100,8 +116,8 @@ public bool IsEnabled
         /// Invoked when a log failed to send properly.
         /// </summary>
         public event EventHandler<FailedToSendLogEventArgs> FailedToSendLog;
-        #endregion
 
+        #endregion
 
         /// <summary>
         /// Enable or disable this channel unit.
@@ -147,12 +163,16 @@ public async Task EnqueueAsync(Log log)
                 if (discardLogs)
                 {
                     AppCenterLog.Warn(AppCenterLog.LogTag, "Channel is disabled; logs are discarded");
+                    AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke SendingLog event for channel '{Name}'");
                     SendingLog?.Invoke(this, new SendingLogEventArgs(log));
+                    AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke FailedToSendLog event for channel '{Name}'");
                     FailedToSendLog?.Invoke(this, new FailedToSendLogEventArgs(log, new CancellationException()));
                     return;
                 }
+                AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke EnqueuingLog event for channel '{Name}'");
                 EnqueuingLog?.Invoke(this, new EnqueuingLogEventArgs(log));
                 await PrepareLogAsync(log, state).ConfigureAwait(false);
+                AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke FilteringLog event for channel '{Name}'");
                 var filteringLogEventArgs = new FilteringLogEventArgs(log);
                 FilteringLog?.Invoke(this, filteringLogEventArgs);
                 if (filteringLogEventArgs.FilterRequested)
@@ -250,6 +270,7 @@ public async Task ClearAsync()
 
         private void Resume(State state)
         {
+            AppCenterLog.Debug(AppCenterLog.LogTag, $"Resume channel: '{Name}'");
             try
             {
                 using (_mutex.GetLock(state))
@@ -261,16 +282,18 @@ private void Resume(State state)
             }
             catch (StatefulMutexException)
             {
-                AppCenterLog.Warn(AppCenterLog.LogTag, "The Resume operation has been cancelled");
+                AppCenterLog.Warn(AppCenterLog.LogTag, "The resume operation has been cancelled");
             }
             CheckPendingLogs(state);
         }
 
         private void Suspend(State state, bool deleteLogs, Exception exception)
         {
+            AppCenterLog.Debug(AppCenterLog.LogTag, $"Suspend channel: '{Name}'");
             try
             {
-                List<Log> unsentLogs = null;
+                IList<string> sendingBatches = null;
+                IList<Log> unsentLogs = null;
                 using (_mutex.GetLock(state))
                 {
                     _enabled = false;
@@ -278,6 +301,7 @@ private void Suspend(State state, bool deleteLogs, Exception exception)
                     _discardLogs = deleteLogs;
                     if (deleteLogs)
                     {
+                        sendingBatches = _sendingBatches.Keys.ToList();
                         unsentLogs = _sendingBatches.Values.SelectMany(batch => batch).ToList();
                         _sendingBatches.Clear();
                     }
@@ -287,65 +311,69 @@ private void Suspend(State state, bool deleteLogs, Exception exception)
                 {
                     foreach (var log in unsentLogs)
                     {
+                        AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke FailedToSendLog event for channel '{Name}'");
                         FailedToSendLog?.Invoke(this, new FailedToSendLogEventArgs(log, exception));
                     }
                 }
                 if (deleteLogs)
                 {
-                    try
-                    {
-                        _ingestion.Close();
-                    }
-                    catch (IngestionException e)
-                    {
-                        AppCenterLog.Error(AppCenterLog.LogTag, "Failed to close ingestion", e);
-                    }
+                    IList<IServiceCall> calls;
                     using (_mutex.GetLock(state))
                     {
+                        calls = _calls.ToList();
+                        _calls.Clear();
                         _pendingLogCount = 0;
-                        TriggerDeleteLogsOnSuspending();
+                        TriggerDeleteLogsOnSuspending(sendingBatches);
+                    }
+                    foreach (var call in calls)
+                    {
+                        call.Cancel();
                     }
                 }
                 _storage.ClearPendingLogState(Name);
             }
             catch (StatefulMutexException)
             {
-                AppCenterLog.Warn(AppCenterLog.LogTag, "The Suspend operation has been cancelled");
+                AppCenterLog.Warn(AppCenterLog.LogTag, "The suspend operation has been cancelled");
             }
         }
 
-        private void TriggerDeleteLogsOnSuspending()
+        private void TriggerDeleteLogsOnSuspending(IList<string> sendingBatches)
         {
             if (SendingLog == null && FailedToSendLog == null)
             {
                 _storage.DeleteLogs(Name);
                 return;
             }
-            SignalDeletingLogs().ContinueWith(completedTask => _storage.DeleteLogs(Name));
+            SignalDeletingLogs(sendingBatches).ContinueWith(completedTask => _storage.DeleteLogs(Name));
         }
 
-        private Task SignalDeletingLogs()
+        private async Task SignalDeletingLogs(IList<string> sendingBatches)
         {
             var logs = new List<Log>();
-            return _storage.GetLogsAsync(Name, ClearBatchSize, logs)
-                .ContinueWith(completedTask =>
+            try
+            {
+                do
                 {
-                    if (completedTask.IsFaulted)
+                    var batchId = await _storage.GetLogsAsync(Name, ClearBatchSize, logs).ConfigureAwait(false);
+                    if (sendingBatches.Contains(batchId))
                     {
-                        AppCenterLog.Warn(AppCenterLog.LogTag,
-                            "Failed to invoke events for logs being deleted.");
-                        return;
+                        continue;
                     }
                     foreach (var log in logs)
                     {
+                        AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke SendingLog for channel '{Name}'");
                         SendingLog?.Invoke(this, new SendingLogEventArgs(log));
+                        AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke FailedToSendLog event for channel '{Name}'");
                         FailedToSendLog?.Invoke(this, new FailedToSendLogEventArgs(log, new CancellationException()));
                     }
-                    if (logs.Count >= ClearBatchSize)
-                    {
-                        SignalDeletingLogs();
-                    }
-                });
+                }
+                while (logs.Count >= ClearBatchSize);
+            }
+            catch
+            {
+                AppCenterLog.Warn(AppCenterLog.LogTag, "Failed to invoke events for logs being deleted.");
+            }
         }
 
         private async Task TriggerIngestionAsync(State state)
@@ -357,12 +385,12 @@ private async Task TriggerIngestionAsync(State state)
                     return;
                 }
                 AppCenterLog.Debug(AppCenterLog.LogTag,
-                    $"triggerIngestion({Name}) pendingLogCount={_pendingLogCount}");
+                    $"TriggerIngestion({Name}) pending log count: {_pendingLogCount}");
                 _batchScheduled = false;
                 if (_sendingBatches.Count >= _maxParallelBatches)
                 {
                     AppCenterLog.Debug(AppCenterLog.LogTag,
-                        "Already sending " + _maxParallelBatches + " batches of analytics data to the server");
+                        $"Already sending {_maxParallelBatches} batches of analytics data to the server");
                     return;
                 }
             }
@@ -379,7 +407,24 @@ private async Task TriggerIngestionAsync(State state)
                 }
                 try
                 {
-                    TriggerIngestion(state, logs, batchId);
+                    // Before sending logs, trigger the sending event for this channel
+                    if (SendingLog != null)
+                    {
+                        foreach (var log in logs)
+                        {
+                            AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke SendingLog event for channel '{Name}'");
+                            SendingLog?.Invoke(this, new SendingLogEventArgs(log));
+                        }
+                    }
+
+                    // If the optional Install ID has no value, default to using empty GUID
+                    var installId = await AppCenter.GetInstallIdAsync().ConfigureAwait(false) ?? Guid.Empty;
+                    var ingestionCall = _ingestion.Call(_appSecret, installId, logs);
+                    using (await _mutex.GetLockAsync(state).ConfigureAwait(false))
+                    {
+                        _calls.Add(ingestionCall);
+                    }
+                    ingestionCall.ContinueWith(call => HandleSendingResult(state, batchId, call));
                     CheckPendingLogs(state);
                 }
                 catch (StorageException)
@@ -389,43 +434,65 @@ private async Task TriggerIngestionAsync(State state)
             }
         }
 
-        private void TriggerIngestion(State state, IList<Log> logs, string batchId)
+        private void HandleSendingResult(State state, string batchId, IServiceCall call)
         {
-            // Before sending logs, trigger the sending event for this channel
-            if (SendingLog != null)
+            // Get a lock without checking the state here.
+            using (_mutex.GetLock())
             {
-                foreach (var eventArgs in logs.Select(log => new SendingLogEventArgs(log)))
-                {
-                    SendingLog?.Invoke(this, eventArgs);
-                }
+                _calls.Remove(call);
             }
-
-            // If the optional Install ID has no value, default to using empty GUID
-            // TODO When InstallId will really be async, we should not use Result anymore
-            var rawInstallId = AppCenter.GetInstallIdAsync().Result;
-            var installId = rawInstallId.HasValue ? rawInstallId.Value : Guid.Empty;
-            using (var serviceCall = _ingestion.PrepareServiceCall(_appSecret, installId, logs))
+            try
             {
-                serviceCall.ExecuteAsync().ContinueWith(completedTask =>
+                if (call.IsCanceled)
                 {
-                    var ingestionException = completedTask.Exception?.InnerException as IngestionException;
-                    if (ingestionException == null)
+                    AppCenterLog.Debug(AppCenterLog.LogTag, $"Sending logs for channel '{Name}', batch '{batchId}' canceled");
+                    HandleSendingFailure(state, batchId, new CancellationException());
+                }
+                else if (call.IsFaulted)
+                {
+                    AppCenterLog.Error(AppCenterLog.LogTag, $"Sending logs for channel '{Name}', batch '{batchId}' failed: {call.Exception?.Message}");
+                    var isRecoverable = call.Exception is IngestionException ingestionException && ingestionException.IsRecoverable;
+                    if (isRecoverable)
                     {
-                        HandleSendingSuccess(state, batchId);
+                        using (_mutex.GetLock(state))
+                        {
+                            var removedLogs = _sendingBatches[batchId];
+                            _sendingBatches.Remove(batchId);
+                            _pendingLogCount += removedLogs.Count;
+                        }
                     }
                     else
                     {
-                        HandleSendingFailure(state, batchId, ingestionException);
+                        HandleSendingFailure(state, batchId, call.Exception);
                     }
-                });
+                    Suspend(state, !isRecoverable, call.Exception);
+                }
+                else
+                {
+                    HandleSendingSuccess(state, batchId);
+                }
+            }
+            catch (StatefulMutexException)
+            {
+                AppCenterLog.Debug(AppCenterLog.LogTag, "Handle sending operation has been canceled. Callbacks were invoked when channel suspended.");
             }
         }
 
         private void HandleSendingSuccess(State state, string batchId)
         {
-            if (!_mutex.IsCurrent(state))
+            IList<Log> removedLogs;
+            using (_mutex.GetLock(state))
             {
-                return;
+                removedLogs = _sendingBatches[batchId];
+                _sendingBatches.Remove(batchId);
+            }
+            if (SentLog != null)
+            {
+                foreach (var log in removedLogs)
+                {
+                    AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke SentLog event for channel '{Name}'");
+                    SentLog?.Invoke(this, new SentLogEventArgs(log));
+                }
             }
             try
             {
@@ -435,52 +502,31 @@ private void HandleSendingSuccess(State state, string batchId)
             {
                 AppCenterLog.Warn(AppCenterLog.LogTag, $"Could not delete logs for batch {batchId}", e);
             }
-            finally
-            {
-                List<Log> removedLogs;
-                using (_mutex.GetLock(state))
-                {
-                    removedLogs = _sendingBatches[batchId];
-                    _sendingBatches.Remove(batchId);
-                }
-                if (SentLog != null)
-                {
-                    foreach (var log in removedLogs)
-                    {
-                        SentLog?.Invoke(this, new SentLogEventArgs(log));
-                    }
-                }
-            }
         }
 
-        private void HandleSendingFailure(State state, string batchId, IngestionException e)
+        private void HandleSendingFailure(State state, string batchId, Exception exception)
         {
-            AppCenterLog.Error(AppCenterLog.LogTag, $"Sending logs for channel '{Name}', batch '{batchId}' failed: {e?.Message}");
-            try
+            IList<Log> removedLogs;
+            using (_mutex.GetLock(state))
             {
-                var isRecoverable = e?.IsRecoverable ?? false;
-                List<Log> removedLogs;
-                using (_mutex.GetLock(state))
-                {
-                    removedLogs = _sendingBatches[batchId];
-                    _sendingBatches.Remove(batchId);
-                    if (isRecoverable)
-                    {
-                        _pendingLogCount += removedLogs.Count;
-                    }
-                }
-                if (!isRecoverable && FailedToSendLog != null)
+                removedLogs = _sendingBatches[batchId];
+                _sendingBatches.Remove(batchId);
+            }
+            if (FailedToSendLog != null)
+            {
+                foreach (var log in removedLogs)
                 {
-                    foreach (var log in removedLogs)
-                    {
-                        FailedToSendLog?.Invoke(this, new FailedToSendLogEventArgs(log, e));
-                    }
+                    AppCenterLog.Debug(AppCenterLog.LogTag, $"Invoke FailedToSendLog event for channel '{Name}'");
+                    FailedToSendLog?.Invoke(this, new FailedToSendLogEventArgs(log, exception));
                 }
-                Suspend(state, !isRecoverable, e);
             }
-            catch (StatefulMutexException)
+            try
             {
-                AppCenterLog.Debug(AppCenterLog.LogTag, "Handle sending failure operation has been canceled. Callbacks were invoked when channel suspended.");
+                _storage.DeleteLogs(Name, batchId);
+            }
+            catch (StorageException e)
+            {
+                AppCenterLog.Warn(AppCenterLog.LogTag, $"Could not delete logs for batch {batchId}", e);
             }
         }
 
@@ -521,7 +567,7 @@ private void CheckPendingLogs(State state)
         }
 
         /// <summary>
-        /// Stop sending logs.
+        /// Stop all calls in progress and deactivate this channel.
         /// </summary>
         /// <returns>The Task to represent this async operation.</returns>
         public Task ShutdownAsync()
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/ChannelGroup.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/ChannelGroup.cs
index 090766794..04091477e 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/ChannelGroup.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Channel/ChannelGroup.cs
@@ -103,6 +103,7 @@ public void SetEnabled(bool enabled)
         public async Task ShutdownAsync()
         {
             ThrowIfDisposed();
+            var tasks = new List<Task>();
             lock (_channelGroupLock)
             {
                 if (_isShutdown)
@@ -111,10 +112,7 @@ public async Task ShutdownAsync()
                     return;
                 }
                 _isShutdown = true;
-            }
-            var tasks = new List<Task>();
-            lock (_channelGroupLock)
-            {
+                _ingestion.Close();
                 foreach (var channel in _channels)
                 {
                     tasks.Add(channel.ShutdownAsync());
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/HttpServiceCall.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/HttpServiceCall.cs
deleted file mode 100644
index 88c98309d..000000000
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/HttpServiceCall.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.AppCenter.Ingestion.Models;
-
-namespace Microsoft.AppCenter.Ingestion.Http
-{
-    public class HttpServiceCall : ServiceCall
-    {
-        public HttpServiceCall(IIngestion ingestion, IList<Log> logs, string appSecret, Guid installId)
-            : base(ingestion, logs, appSecret, installId)
-        {
-        }
-    }
-}
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionDecorator.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionDecorator.cs
index b20568cb0..1cfea95f0 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionDecorator.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionDecorator.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Models;
 
 namespace Microsoft.AppCenter.Ingestion.Http
@@ -14,35 +13,24 @@ protected IngestionDecorator(IIngestion decoratedApi)
             DecoratedApi = decoratedApi;
         }
 
-        public virtual void Close()
-        {
-            DecoratedApi.Close();
-        }
-
-        public virtual IServiceCall PrepareServiceCall(string appSecret, Guid installId, IList<Log> logs)
-        {
-            return DecoratedApi.PrepareServiceCall(appSecret, installId, logs);
-        }
-
-        public virtual Task ExecuteCallAsync(IServiceCall call)
+        public virtual void SetLogUrl(string logUrl)
         {
-            return DecoratedApi.ExecuteCallAsync(call);
+            DecoratedApi.SetLogUrl(logUrl);
         }
 
-        public virtual void SetLogUrl(string logUrl)
+        public virtual IServiceCall Call(string appSecret, Guid installId, IList<Log> logs)
         {
-            DecoratedApi.SetLogUrl(logUrl);
+            return DecoratedApi.Call(appSecret, installId, logs);
         }
 
-        public void Dispose()
+        public virtual void Close()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            DecoratedApi.Close();
         }
 
-        protected virtual void Dispose(bool disposing)
+        public virtual void Dispose()
         {
-            /* No-op */
+            DecoratedApi.Dispose();
         }
     }
 }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionHttp.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionHttp.cs
index 526ddb6a2..a18135e14 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionHttp.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/IngestionHttp.cs
@@ -1,13 +1,15 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
+
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Models;
 using Microsoft.AppCenter.Ingestion.Models.Serialization;
 
 namespace Microsoft.AppCenter.Ingestion.Http
 {
-    public sealed class IngestionHttp : IIngestion
+    internal sealed class IngestionHttp : IIngestion
     {
         internal const string DefaultBaseUrl = "https://in.appcenter.ms";
         internal const string ApiVersion = "/logs?api-version=1.0.0";
@@ -15,7 +17,9 @@ public sealed class IngestionHttp : IIngestion
         internal const string InstallId = "Install-ID";
 
         private const int MaximumCharactersDisplayedForAppSecret = 8;
+
         private string _baseLogUrl;
+
         private readonly IHttpNetworkAdapter _httpNetwork;
 
         public IngestionHttp(IHttpNetworkAdapter httpNetwork)
@@ -23,33 +27,54 @@ public IngestionHttp(IHttpNetworkAdapter httpNetwork)
             _httpNetwork = httpNetwork;
         }
 
-        /// <exception cref="IngestionException"/>
-        public async Task ExecuteCallAsync(IServiceCall call)
+        public IServiceCall Call(string appSecret, Guid installId, IList<Log> logs)
         {
-            if (call.CancellationToken.IsCancellationRequested)
+            var call = new ServiceCall(appSecret, installId, logs);
+            CallAsync(appSecret, installId, logs, call.CancellationToken).ContinueWith(task =>
             {
-                return;
-            }
+                // Cancellation token is already shared.
+                if (task.IsCanceled)
+                {
+                    return;
+                }
+
+                // If task is faulted.
+                if (task.IsFaulted)
+                {
+                    call.SetException(task.Exception?.InnerException);
+                    return;
+                }
+
+                // If task is succeeded.
+                call.SetResult(task.Result);
+            });
+            return call;
+        }
+
+        /// <exception cref="IngestionException"/>
+        private async Task<string> CallAsync(string appSecret, Guid installId, IList<Log> logs, CancellationToken token)
+        {
+            token.ThrowIfCancellationRequested();
             var baseUrl = string.IsNullOrEmpty(_baseLogUrl) ? DefaultBaseUrl : _baseLogUrl;
             AppCenterLog.Verbose(AppCenterLog.LogTag, $"Calling {baseUrl + ApiVersion}...");
 
             // Create request headers.
-            var requestHeaders = CreateHeaders(call.AppSecret, call.InstallId);
+            var requestHeaders = CreateHeaders(appSecret, installId);
             AppCenterLog.Verbose(AppCenterLog.LogTag, "Headers: " +
-                    $"{AppSecret}={GetRedactedAppSecret(call.AppSecret)}, " +
-                    $"{InstallId}={call.InstallId}");
+                    $"{AppSecret}={GetRedactedAppSecret(appSecret)}, " +
+                    $"{InstallId}={installId}");
 
             // Create request content.
-            var requestContent = CreateLogsContent(call.Logs);
+            var requestContent = CreateLogsContent(logs);
             AppCenterLog.Verbose(AppCenterLog.LogTag, requestContent);
 
             // Send request.
-            await _httpNetwork.SendAsync(baseUrl + ApiVersion, "POST", requestHeaders, requestContent, call.CancellationToken).ConfigureAwait(false);
+            return await _httpNetwork.SendAsync(baseUrl + ApiVersion, "POST", requestHeaders, requestContent, token).ConfigureAwait(false);
         }
 
         public void Close()
         {
-            //No-op
+            // No-op
         }
 
         public void SetLogUrl(string logUrl)
@@ -69,11 +94,6 @@ private static string GetRedactedAppSecret(string appSecret)
             return redactedAppSecret;
         }
 
-        public IServiceCall PrepareServiceCall(string appSecret, Guid installId, IList<Log> logs)
-        {
-            return new HttpServiceCall(this, logs, appSecret, installId);
-        }
-
         internal IDictionary<string, string> CreateHeaders(string appSecret, Guid installId)
         {
             return new Dictionary<string, string>
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateIngestion.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateIngestion.cs
index 1c51d144c..d750dec65 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateIngestion.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateIngestion.cs
@@ -1,124 +1,103 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Models;
 
 namespace Microsoft.AppCenter.Ingestion.Http
 {
-    public class NetworkStateIngestion : IngestionDecorator
+    internal sealed class NetworkStateIngestion : IngestionDecorator
     {
-        private readonly HashSet<IServiceCall> _calls = new HashSet<IServiceCall>();
-        private readonly SemaphoreSlim _mutex = new SemaphoreSlim(1, 1);
+        private readonly ISet<ServiceCall> _calls = new HashSet<ServiceCall>();
+
         private readonly INetworkStateAdapter _networkStateAdapter;
 
         public NetworkStateIngestion(IIngestion decoratedApi, INetworkStateAdapter networkStateAdapter)
             : base(decoratedApi)
         {
             _networkStateAdapter = networkStateAdapter;
+            _networkStateAdapter.NetworkStatusChanged += OnNetworkStateChange;
         }
 
-        public override void Close()
+        private void OnNetworkStateChange(object sender, EventArgs e)
         {
-            _mutex.Wait();
-            foreach (var call in _calls)
+            if (!_networkStateAdapter.IsConnected)
             {
-                PauseServiceCall(call);
+                return;
+            }
+            var calls = new List<ServiceCall>();
+            lock (_calls)
+            {
+                calls.AddRange(_calls);
+                _calls.Clear();
+            }
+            foreach (var call in calls)
+            {
+                RetryCall(call);
             }
-            _calls.Clear();
-            _mutex.Release();
-            base.Close();
         }
 
-        internal async Task WaitAllCalls()
+        private void RetryCall(ServiceCall call)
         {
-            int callsCount;
-            do
+            if (call.IsCanceled)
             {
-                await _mutex.WaitAsync().ConfigureAwait(false);
-                callsCount = _calls.Count;
-                _mutex.Release();
-            } while (callsCount > 0);
-        }
+                return;
+            }
+            var result = base.Call(call.AppSecret, call.InstallId, call.Logs);
 
-        private void PauseServiceCall(IServiceCall call)
-        {
-            call?.Cancel();
-        }
+            // Cancel retry if cancel call.
+            call.ContinueWith(_ =>
+            {
+                if (call.IsCanceled && !result.IsCanceled)
+                {
+                    result.Cancel();
+                }
+            });
 
-        public override IServiceCall PrepareServiceCall(string appSecret, Guid installId, IList<Log> logs)
-        {
-            var call = base.PrepareServiceCall(appSecret, installId, logs);
-            return new NetworkStateServiceCall(call, this);
+            // Pass result.
+            result.ContinueWith(call.CopyState);
         }
 
-        public override async Task ExecuteCallAsync(IServiceCall call)
+        public override IServiceCall Call(string appSecret, Guid installId, IList<Log> logs)
         {
-            await _mutex.WaitAsync().ConfigureAwait(false);
-            _calls.Add(call);
-            _mutex.Release();
-            try
+            if (_networkStateAdapter.IsConnected)
             {
-                await ExecuteCallAsyncHelper(call);
+                return base.Call(appSecret, installId, logs);
             }
-            finally
+            var call = new ServiceCall(appSecret, installId, logs);
+            lock (_calls)
             {
-                // Regardless of success, the call must be removed from the collection
-                RemoveCall(call);
+                _calls.Add(call);
             }
+            return call;
         }
-        private async Task ExecuteCallAsyncHelper(IServiceCall call)
+
+        public override void Close()
         {
-            if (_networkStateAdapter.IsConnected)
-            {
-                try
-                {
-                    await base.ExecuteCallAsync(call).ConfigureAwait(false);
-                }
-                // Recursion case in case network goes out during the base ExecuteCallAsync call
-                catch (NetworkIngestionException)
-                {
-                    // Since we caught a NetworkIngestionException, just wait for network and then retry
-                    await PauseExecutionUntilNetworkBecomesAvailable().ConfigureAwait(false);
-                    await ExecuteCallAsyncHelper(call).ConfigureAwait(false);
-                }
-                return;
-            }
+            CancelAllCalls();
+            base.Close();
+        }
 
-            // Recursion case
-            await PauseExecutionUntilNetworkBecomesAvailable().ConfigureAwait(false);
-            await ExecuteCallAsyncHelper(call).ConfigureAwait(false);
+        public override void Dispose()
+        {
+            _networkStateAdapter.NetworkStatusChanged -= OnNetworkStateChange;
+            CancelAllCalls();
+            base.Dispose();
         }
 
-        private async Task PauseExecutionUntilNetworkBecomesAvailable()
+        private void CancelAllCalls()
         {
-            // No connection; wait until network returns to continue execution
-            var networkSemaphore = new SemaphoreSlim(0);
-            void NetworkStateChangeHandler(object sender, EventArgs e)
+            IList<ServiceCall> calls;
+            lock (_calls)
             {
-                if (_networkStateAdapter.IsConnected)
+                if (_calls.Count == 0)
                 {
-                    networkSemaphore.Release();
+                    return;
                 }
+                calls = new List<ServiceCall>(_calls);
+                _calls.Clear();
             }
-            _networkStateAdapter.NetworkStatusChanged += NetworkStateChangeHandler;
-            await networkSemaphore.WaitAsync().ConfigureAwait(false);
-            _networkStateAdapter.NetworkStatusChanged -= NetworkStateChangeHandler;
-        }
-
-        private void RemoveCall(IServiceCall call)
-        {
-            _mutex.Wait();
-            _calls.Remove(call);
-            _mutex.Release();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (disposing)
+            foreach (var call in calls)
             {
-                _mutex.Dispose();
+                call.Cancel();
             }
         }
     }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateServiceCall.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateServiceCall.cs
deleted file mode 100644
index 3b20cc8e3..000000000
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/NetworkStateServiceCall.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AppCenter.Ingestion.Http
-{
-    public class NetworkStateServiceCall : ServiceCallDecorator
-    {
-        private readonly NetworkStateIngestion _networkIngestion;
-
-        public NetworkStateServiceCall(IServiceCall decoratedApi, NetworkStateIngestion networkIngestion) : base(decoratedApi)
-        {
-            _networkIngestion = networkIngestion;
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            await _networkIngestion.ExecuteCallAsync(DecoratedApi).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableIngestion.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableIngestion.cs
index 94bde7620..f3e7292c1 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableIngestion.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableIngestion.cs
@@ -1,80 +1,153 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Models;
 
 namespace Microsoft.AppCenter.Ingestion.Http
 {
-    public class RetryableIngestion : IngestionDecorator
+    internal sealed class RetryableIngestion : IngestionDecorator
     {
-        private static readonly Random Random = new Random();
-        private static readonly SemaphoreSlim RandomMutex = new SemaphoreSlim(1, 1);
         private static readonly TimeSpan[] DefaultIntervals =
-            {
-                TimeSpan.FromSeconds(10),
-                TimeSpan.FromMinutes(.5),
-                TimeSpan.FromMinutes(20)
-            };
+        {
+            TimeSpan.FromSeconds(10),
+            TimeSpan.FromSeconds(30),
+            TimeSpan.FromMinutes(20)
+        };
+        
+        private readonly IDictionary<ServiceCall, Timer> _calls = new Dictionary<ServiceCall, Timer>();
 
-        private readonly Func<Task>[] _retryIntervals;
+        private readonly TimeSpan[] _retryIntervals;
 
         public RetryableIngestion(IIngestion decoratedApi)
-            : this(decoratedApi, DefaultIntervals)
+            : base(decoratedApi)
         {
+            var random = new Random();
+            _retryIntervals = DefaultIntervals.Select(defaultInterval =>
+            {
+                var interval = (int)(defaultInterval.TotalMilliseconds / 2.0);
+                interval += random.Next(interval);
+                return TimeSpan.FromMilliseconds(interval);
+            }).ToArray();
         }
 
-        public RetryableIngestion(IIngestion decoratedApi, TimeSpan[] retryIntervals) : base(decoratedApi)
+        public RetryableIngestion(IIngestion decoratedApi, TimeSpan[] retryIntervals)
+            : base(decoratedApi)
         {
-            if (retryIntervals == null) throw new ArgumentNullException(nameof(retryIntervals));
-            _retryIntervals = new Func<Task>[retryIntervals.Length];
-            for (int i = 0; i < retryIntervals.Length; i++)
-            {
-                _retryIntervals[i] = GetDelayFunc(retryIntervals, i);
-            }
+            _retryIntervals = retryIntervals ?? throw new ArgumentNullException(nameof(retryIntervals));
         }
 
-        public RetryableIngestion(IIngestion decoratedApi, Func<Task>[] retryIntervals) : base(decoratedApi)
+        private Timer IntervalCall(int retry, Action action)
         {
-            if (retryIntervals == null) throw new ArgumentNullException(nameof(retryIntervals));
-            _retryIntervals = retryIntervals;
+            var interval = (int)_retryIntervals[retry - 1].TotalMilliseconds;
+            AppCenterLog.Warn(AppCenterLog.LogTag, $"Try #{retry} failed and will be retried in {interval} ms");
+            return new Timer(state => action(), null, interval, Timeout.Infinite);
         }
 
-        public override IServiceCall PrepareServiceCall(string appSecret, Guid installId, IList<Log> logs)
+        private void RetryCall(ServiceCall call, int retry)
         {
-            var decoratedCall = DecoratedApi.PrepareServiceCall(appSecret, installId, logs);
-            return new RetryableServiceCall(decoratedCall, _retryIntervals);
+            if (call.IsCanceled)
+            {
+                return;
+            }
+            var result = base.Call(call.AppSecret, call.InstallId, call.Logs);
+
+            // Cancel retry if cancel call.
+            call.ContinueWith(_ =>
+            {
+                if (call.IsCanceled && !result.IsCanceled)
+                {
+                    result.Cancel();
+                }
+            });
+            result.ContinueWith(_ => RetryCallContinuation(call, result, retry + 1));
         }
 
-        public override async Task ExecuteCallAsync(IServiceCall call)
+        private void RetryCallContinuation(ServiceCall call, IServiceCall result, int retry)
         {
-            var retryableCall = call as RetryableServiceCall;
-            if (retryableCall == null)
+            // Canceled.
+            if (call.IsCanceled)
+            {
+                return;
+            }
+            if (result.IsCanceled)
+            {
+                call.Cancel();
+                return;
+            }
+
+            // Faulted.
+            if (result.IsFaulted)
             {
-                await base.ExecuteCallAsync(call).ConfigureAwait(false);
+                var isRecoverable = result.Exception is IngestionException ingestionException && ingestionException.IsRecoverable;
+                if (!isRecoverable || retry - 1 >= _retryIntervals.Length)
+                {
+                    call.SetException(result.Exception);
+                    return;
+                }
+
+                // Shedule next retry.
+                var timer = IntervalCall(retry, () =>
+                {
+                    lock (_calls)
+                    {
+                        if (!_calls.Remove(call))
+                        {
+                            return;
+                        }
+                    }
+                    RetryCall(call, retry);
+                });
+                lock (_calls)
+                {
+                    _calls.Add(call, timer);
+                }
                 return;
             }
-            await retryableCall.ExecuteAsync().ConfigureAwait(false);
+
+            // Succeeded.
+            call.SetResult(result.Result);
         }
 
-        private static Func<Task> GetDelayFunc(TimeSpan[] intervals, int retry)
+        public override IServiceCall Call(string appSecret, Guid installId, IList<Log> logs)
         {
-            return async () =>
-            {
-                var delayMilliseconds = (int)(intervals[retry].TotalMilliseconds / 2.0);
-                delayMilliseconds += await GetRandomIntAsync(delayMilliseconds).ConfigureAwait(false);
-                var message = $"Try #{retry} failed and will be retried in {delayMilliseconds} ms";
-                AppCenterLog.Warn(AppCenterLog.LogTag, message);
-                await Task.Delay(delayMilliseconds).ConfigureAwait(false);
-            };
+            var call = new ServiceCall(appSecret, installId, logs);
+            RetryCall(call, 0);
+            return call;
+        }
+
+        public override void Close()
+        {
+            CancelAllCalls();
+            base.Close();
         }
 
-        private static async Task<int> GetRandomIntAsync(int max)
+        public override void Dispose()
         {
-            await RandomMutex.WaitAsync().ConfigureAwait(false);
-            var randomInt = Random.Next(max);
-            RandomMutex.Release();
-            return randomInt;
+            CancelAllCalls();
+            base.Dispose();
+        }
+
+        private void CancelAllCalls()
+        {
+            IList<ServiceCall> calls;
+            lock (_calls)
+            {
+                if (_calls.Count == 0)
+                {
+                    return;
+                }
+                calls = _calls.Select(i => i.Key).ToList();
+                foreach (var timer in _calls.Values)
+                {
+                    timer.Dispose();
+                }
+                _calls.Clear();
+            }
+            foreach (var call in calls)
+            {
+                call.Cancel();
+            }
         }
     }
 }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableServiceCall.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableServiceCall.cs
deleted file mode 100644
index fcda954c9..000000000
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/RetryableServiceCall.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.AppCenter.Ingestion.Http
-{
-    public class RetryableServiceCall : ServiceCallDecorator
-    {
-        private CancellationTokenSource _tokenSource = new CancellationTokenSource();
-        private int _retryCount;
-        private readonly SemaphoreSlim _mutex = new SemaphoreSlim(1, 1);
-        private readonly Func<Task>[] _retryIntervals;
-
-        public override CancellationToken CancellationToken => _tokenSource.Token;
-
-        public RetryableServiceCall(IServiceCall decoratedApi, Func<Task>[] retryIntervals) : base(decoratedApi)
-        {
-            _retryIntervals = retryIntervals;
-        }
-
-        ///<exception cref="IngestionException"/>
-        private async Task ExecuteAsyncHelper()
-        {
-            while (true)
-            {
-                try
-                {
-                    await Ingestion.ExecuteCallAsync(this).ConfigureAwait(false);
-                    return;
-                }
-                catch (IngestionException e)
-                {
-                    if (!e.IsRecoverable || _retryCount >= _retryIntervals.Length)
-                    {
-                        throw;
-                    }
-                    AppCenterLog.Warn(AppCenterLog.LogTag, "Failed to execute service call", e);
-                }
-                await _retryIntervals[_retryCount++]().ConfigureAwait(false);
-                if (_tokenSource.Token.IsCancellationRequested)
-                {
-                    throw new IngestionException("The operation has been cancelled");
-                }
-            }
-        }
-
-        public override void Cancel()
-        {
-            _tokenSource?.Cancel();
-        }
-
-        public override async Task ExecuteAsync()
-        {
-            await _mutex.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                _tokenSource = new CancellationTokenSource();
-                await ExecuteAsyncHelper().ConfigureAwait(false);
-            }
-            finally
-            {
-                _mutex.Release();
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (disposing)
-            {
-                _tokenSource?.Dispose();
-                _mutex?.Dispose();
-            }
-        }
-    }
-}
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/ServiceCallDecorator.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/ServiceCallDecorator.cs
deleted file mode 100644
index 9b189bcf2..000000000
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/Http/ServiceCallDecorator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AppCenter.Ingestion.Models;
-
-namespace Microsoft.AppCenter.Ingestion.Http
-{
-    public abstract class ServiceCallDecorator : IServiceCall
-    {
-        protected IServiceCall DecoratedApi { get; }
-
-        public IIngestion Ingestion => DecoratedApi.Ingestion;
-        public IList<Log> Logs => DecoratedApi.Logs;
-        public string AppSecret => DecoratedApi.AppSecret;
-        public Guid InstallId => DecoratedApi.InstallId;
-        public virtual CancellationToken CancellationToken => DecoratedApi.CancellationToken;
-
-        protected ServiceCallDecorator(IServiceCall decoratedApi)
-        {
-            DecoratedApi = decoratedApi;
-        }
-        public virtual Task ExecuteAsync()
-        {
-            return DecoratedApi.ExecuteAsync();
-        }
-
-        public virtual void Cancel()
-        {
-            DecoratedApi.Cancel();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            /* No-op */
-        }
-    }
-}
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IIngestion.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IIngestion.cs
index c1fd37ee6..d25fadbef 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IIngestion.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IIngestion.cs
@@ -1,18 +1,33 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 
-using Microsoft.AppCenter.Ingestion.Models;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using System;
+using System.Collections.Generic;
+using Microsoft.AppCenter.Ingestion.Models;
 
 namespace Microsoft.AppCenter.Ingestion
 {
+    /// <summary>
+    /// Interface to send logs to the Ingestion service.
+    /// </summary>
     public interface IIngestion : IDisposable
     {
-        IServiceCall PrepareServiceCall(string appSecret, Guid installId, IList<Log> logs);
-        Task ExecuteCallAsync(IServiceCall call);
-        void Close();
+        /// <summary>
+        /// Update log URL.
+        /// </summary>
+        /// <param name="logUrl"></param>
         void SetLogUrl(string logUrl);
+
+        /// <summary>
+        /// Send logs to the Ingestion service.
+        /// </summary>
+        /// <param name="appSecret">A unique and secret key used to identify the application</param>
+        /// <param name="installId">Install identifier</param>
+        /// <param name="logs">Payload</param>
+        IServiceCall Call(string appSecret, Guid installId, IList<Log> logs);
+
+        /// <summary>
+        /// Close all current calls.
+        /// </summary>
+        void Close();
     }
 }
-
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IServiceCall.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IServiceCall.cs
index 345f37acb..38eeb0806 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IServiceCall.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/IServiceCall.cs
@@ -1,21 +1,43 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AppCenter.Ingestion.Models;
 
 namespace Microsoft.AppCenter.Ingestion
 {
     public interface IServiceCall : IDisposable
     {
-        IIngestion Ingestion { get; }
-        IList<Log> Logs { get; }
-        string AppSecret { get; }
-        Guid InstallId { get; }
-        CancellationToken CancellationToken { get; }
+        /// <summary>
+        /// Check if the call is completed due to cancellation.
+        /// </summary>
+        bool IsCanceled { get; }
 
-        ///<exception cref="IngestionException"/>
-        Task ExecuteAsync();
+        /// <summary>
+        /// Check if the call is completed.
+        /// </summary>
+        bool IsCompleted { get; }
+
+        /// <summary>
+        /// Check if the call is completed due to an unhandled exception.
+        /// </summary>
+        bool IsFaulted { get; }
+
+        /// <summary>
+        /// HTTP payload.
+        /// </summary>
+        string Result { get; }
+
+        /// <summary>
+        /// The exception thrown from the pipeline.
+        /// </summary>
+        Exception Exception { get; }
+
+        /// <summary>
+        /// Handle call results.
+        /// </summary>
+        /// <param name="continuationAction">The action to perform when the call is completed.</param>
+        void ContinueWith(Action<IServiceCall> continuationAction);
+
+        /// <summary>
+        /// Cancel the call if possible.
+        /// </summary>
         void Cancel();
     }
 }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/ServiceCall.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/ServiceCall.cs
index c1ab1e1e3..be1034532 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/ServiceCall.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Ingestion/ServiceCall.cs
@@ -1,54 +1,164 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Models;
 
-namespace Microsoft.AppCenter.Ingestion.Http
+namespace Microsoft.AppCenter.Ingestion
 {
-    public abstract class ServiceCall : IServiceCall
+    /// <inheritdoc />
+    internal class ServiceCall : IServiceCall
     {
-        private CancellationTokenSource _tokenSource = new CancellationTokenSource();
+        private readonly CancellationTokenSource _tokenSource = new CancellationTokenSource();
+
+        private Action<IServiceCall> _continuationAction;
+
+        private readonly object _lock = new object();
+
+        private bool _disposed;
+
+        public bool IsCanceled => CancellationToken.IsCancellationRequested;
+
+        public bool IsCompleted { get; private set; }
+
+        public bool IsFaulted => Exception != null;
+
+        public string Result { get; private set; }
+
+        public Exception Exception { get; private set; }
+
+        public CancellationToken CancellationToken => _tokenSource.Token;
 
-        public IIngestion Ingestion { get; }
-        public IList<Log> Logs { get; }
         public string AppSecret { get; }
+
         public Guid InstallId { get; }
 
-        public CancellationToken CancellationToken => _tokenSource.Token;
+        public IList<Log> Logs { get; }
+        
+        public ServiceCall()
+        {
+        }
 
-        protected ServiceCall(IIngestion ingestion, IList<Log> logs, string appSecret, Guid installId)
+        public ServiceCall(string appSecret, Guid installId, IList<Log> logs)
         {
-            Ingestion = ingestion;
-            Logs = logs;
             AppSecret = appSecret;
             InstallId = installId;
+            Logs = logs;
         }
 
-        public virtual void Cancel()
+        public void ContinueWith(Action<IServiceCall> continuationAction)
         {
-            _tokenSource.Cancel();
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ServiceCall));
+            }
+            lock (_lock)
+            {
+                if (!IsCompleted && !IsCanceled)
+                {
+                    _continuationAction += continuationAction;
+                    return;
+                }
+            }
+
+            // If completed or canceled call it right now.
+            continuationAction(this);
         }
 
-        public virtual async Task ExecuteAsync()
+        public void CopyState(IServiceCall source)
         {
-            _tokenSource.Dispose();
-            _tokenSource = new CancellationTokenSource();
-            await Ingestion.ExecuteCallAsync(this).ConfigureAwait(false);
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ServiceCall));
+            }
+            if (source.IsCanceled)
+            {
+                Cancel();
+                return;
+            }
+            if (source.IsFaulted)
+            {
+                SetException(source.Exception);
+                return;
+            }
+            SetResult(source.Result);
         }
 
-        public void Dispose()
+        public void SetResult(string result)
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ServiceCall));
+            }
+            Action<IServiceCall> continuationAction;
+            lock (_lock)
+            {
+                if (IsCompleted || IsCanceled)
+                {
+                    return;
+                }
+                IsCompleted = true;
+                Result = result;
+                continuationAction = _continuationAction;
+                _continuationAction = null;
+            }
+
+            // Invoke the continuations.
+            continuationAction?.Invoke(this);
         }
 
-        protected virtual void Dispose(bool disposing)
+        public void SetException(Exception exception)
         {
-            if (disposing)
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ServiceCall));
+            }
+            Action<IServiceCall> continuationAction;
+            lock (_lock)
             {
-                _tokenSource?.Dispose();
+                if (IsCompleted || IsCanceled)
+                {
+                    return;
+                }
+                IsCompleted = true;
+                Exception = exception;
+                continuationAction = _continuationAction;
+                _continuationAction = null;
             }
+
+            // Invoke the continuations.
+            continuationAction?.Invoke(this);
+        }
+
+        public void Cancel()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ServiceCall));
+            }
+            Action<IServiceCall> continuationAction;
+            lock (_lock)
+            {
+                if (IsCompleted || IsCanceled)
+                {
+                    return;
+                }
+                _tokenSource.Cancel();
+                continuationAction = _continuationAction;
+                _continuationAction = null;
+            }
+
+            // Invoke the continuations.
+            continuationAction?.Invoke(this);
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+            _disposed = true;
+            _tokenSource.Dispose();
         }
     }
 }
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.projitems b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.projitems
index 05e378ee2..18044ec04 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.projitems
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Microsoft.AppCenter.Windows.Shared.projitems
@@ -21,6 +21,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)CustomProperties.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\HttpIngestionException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IHttpNetworkAdapter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IngestionDecorator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\NetworkIngestionException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\BooleanProperty.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\ClearProperty.cs" />
@@ -36,17 +37,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Utils\Constants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IAppCenterService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\HttpNetworkAdapter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\HttpServiceCall.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\INetworkStateAdapter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\NetworkStateIngestion.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\NetworkStateServiceCall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\ServiceCallDecorator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Models\StartServiceLog.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\ServiceCall.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IngestionDecorator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\IngestionHttp.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\RetryableIngestion.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Ingestion\Http\RetryableServiceCall.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\IIngestion.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\IngestionException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Ingestion\IServiceCall.cs" />
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Storage/Storage.cs b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Storage/Storage.cs
index 6c1e1fd41..03dfaf227 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Storage/Storage.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.Windows.Shared/Storage/Storage.cs
@@ -52,7 +52,7 @@ public Storage() : this(DefaultAdapter())
         internal Storage(IStorageAdapter adapter)
         {
             _storageAdapter = adapter;
-            _queue.Add(new Task(() => InitializeDatabaseAsync().Wait()));
+            _queue.Add(new Task(() => InitializeDatabaseAsync().GetAwaiter().GetResult()));
             _queueFlushTask = Task.Run(FlushQueueAsync);
         }
 
@@ -87,7 +87,7 @@ public Task PutLog(string channelName, Log log)
             {
                 var logJsonString = LogSerializer.Serialize(log);
                 var logEntry = new LogEntry {Channel = channelName, Log = logJsonString};
-                _storageAdapter.InsertAsync(logEntry).Wait();
+                _storageAdapter.InsertAsync(logEntry).GetAwaiter().GetResult();
             });
             try
             {
@@ -128,7 +128,7 @@ public Task DeleteLogs(string channelName, string batchId)
                     {
                         _storageAdapter
                             .DeleteAsync<LogEntry>(entry => entry.Channel == channelName && entry.Id == id)
-                            .Wait();
+                            .GetAwaiter().GetResult();
                     }
                 }
                 catch (KeyNotFoundException e)
@@ -163,7 +163,7 @@ public Task DeleteLogs(string channelName)
                         $"Deleting all logs from storage for channel '{channelName}'");
                     ClearPendingLogStateWithoutEnqueue(channelName);
                     _storageAdapter.DeleteAsync<LogEntry>(entry => entry.Channel == channelName)
-                        .Wait();
+                        .GetAwaiter().GetResult();
                 }
                 catch (KeyNotFoundException e)
                 {
@@ -193,7 +193,7 @@ public async Task<int> CountLogsAsync(string channelName)
             var task = new Task<int>(() =>
             {
                 return _storageAdapter.CountAsync<LogEntry>(entry => entry.Channel == channelName)
-                    .Result;
+                    .GetAwaiter().GetResult();
             });
             try
             {
@@ -272,7 +272,7 @@ public async Task<string> GetLogsAsync(string channelName, int limit, List<Log>
                 var failedToDeserializeALog = false;
                 var retrievedEntries =
                     _storageAdapter.GetAsync<LogEntry>(entry => entry.Channel == channelName, limit)
-                        .Result;
+                        .GetAwaiter().GetResult();
                 foreach (var entry in retrievedEntries)
                 {
                     if (_pendingDbIdentifiers.Contains(entry.Id))
@@ -290,7 +290,7 @@ public async Task<string> GetLogsAsync(string channelName, int limit, List<Log>
                         AppCenterLog.Error(AppCenterLog.LogTag, "Cannot deserialize a log in storage", e);
                         failedToDeserializeALog = true;
                         _storageAdapter.DeleteAsync<LogEntry>(row => row.Id == entry.Id)
-                            .Wait();
+                            .GetAwaiter().GetResult();
                     }
                 }
                 if (failedToDeserializeALog)
diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj
index aacbff886..48a0ffcfd 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj
+++ b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Microsoft.AppCenter.WindowsDesktop.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.AppCenter</RootNamespace>
     <AssemblyName>Microsoft.AppCenter</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,24 +33,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\sqlite-net-pcl.1.3.1\lib\netstandard1.1\SQLite-net.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
@@ -58,9 +41,6 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -79,20 +59,17 @@
     <Compile Include="Utils\WpfHelper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>6.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="sqlite-net-pcl">
+      <Version>1.3.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
   <Import Project="..\Microsoft.AppCenter.Windows.Shared\Microsoft.AppCenter.Windows.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
-  </Target>
   <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
   <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
 </Project>
\ No newline at end of file
diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Properties/AssemblyInfo.cs b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Properties/AssemblyInfo.cs
index eabe1e994..1c60493be 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 [assembly: InternalsVisibleTo("Microsoft.AppCenter.Test.WindowsDesktop")]
diff --git a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/packages.config b/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/packages.config
deleted file mode 100644
index 42d7c42b2..000000000
--- a/SDK/AppCenter/Microsoft.AppCenter.WindowsDesktop/packages.config
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net452" />
-  <package id="NETStandard.Library" version="1.6.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net452" />
-  <package id="sqlite-net-pcl" version="1.3.1" targetFramework="net452" />
-  <package id="SQLitePCLRaw.bundle_green" version="1.1.2" targetFramework="net452" />
-  <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net452" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.2" targetFramework="net452" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.2" targetFramework="net452" />
-  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.2" targetFramework="net452" />
-  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" targetFramework="net452" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net452" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
-  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net452" />
-  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net452" />
-  <package id="System.Globalization" version="4.3.0" targetFramework="net452" />
-  <package id="System.IO" version="4.1.0" targetFramework="net452" />
-  <package id="System.IO.Compression" version="4.1.0" targetFramework="net452" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net452" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="net452" />
-  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net452" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="net452" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net452" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net452" />
-  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net452" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net452" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net452" />
-  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net452" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net452" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net452" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net452" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net452" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
-  <package id="System.Threading.Timer" version="4.0.1" targetFramework="net452" />
-  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net452" />
-  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net452" />
-</packages>
\ No newline at end of file
diff --git a/SDK/AppCenter/Microsoft.AppCenter.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenter/Microsoft.AppCenter.iOS.Bindings/Properties/AssemblyInfo.cs
index 6077750c9..9ee8f395b 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenter/Microsoft.AppCenter.iOS/Properties/AssemblyInfo.cs b/SDK/AppCenter/Microsoft.AppCenter.iOS/Properties/AssemblyInfo.cs
index d27052787..f932f0093 100644
--- a/SDK/AppCenter/Microsoft.AppCenter.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenter/Microsoft.AppCenter.iOS/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj b/SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj
index aa5cae859..097e47c84 100644
--- a/SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj
+++ b/SDK/AppCenter/Microsoft.AppCenter/Microsoft.AppCenter.csproj
@@ -7,9 +7,9 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Product>Microsoft.AppCenter.Core</Product>
     <Company>Microsoft Corporation</Company>
-    <Version>1.5.0-SNAPSHOT</Version>
+    <Version>1.6.0-SNAPSHOT</Version>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyTitle>Microsoft.AppCenter.Core</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android.Bindings/Properties/AssemblyInfo.cs
index 9b2c22725..0a7aa0fa6 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android.Bindings/Properties/AssemblyInfo.cs
@@ -18,8 +18,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Properties/AssemblyInfo.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Properties/AssemblyInfo.cs
index 36501de29..4e3f44bac 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.UWP/Properties/AssemblyInfo.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.UWP/Properties/AssemblyInfo.cs
index 9c0e896d2..31df1f475 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.UWP/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Analytics.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Analytics.cs
index 7573ec9fd..3fdffe731 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Analytics.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Analytics.cs
@@ -13,10 +13,10 @@ public class Analytics : AppCenterService
     {
         #region static
 
-        private const int MaxEventProperties = 5;
+        private const int MaxEventProperties = 20;
         private const int MaxEventNameLength = 256;
-        private const int MaxEventPropertyKeyLength = 64;
-        private const int MaxEventPropertyValueLength = 64;
+        private const int MaxEventPropertyKeyLength = 125;
+        private const int MaxEventPropertyValueLength = 125;
 
         private static readonly object AnalyticsLock = new object();
 
@@ -89,10 +89,11 @@ public static void TrackEvent(string name, IDictionary<string, string> propertie
         #region instance
 
         // Internal for testing purposes
-        internal ISessionTracker SessionTracker;
+        private ISessionTracker _sessionTracker;
+
         private readonly ISessionTrackerFactory _sessionTrackerFactory;
 
-        internal Analytics()
+        private Analytics()
         {
             LogSerializer.AddLogType(PageLog.JsonIdentifier, typeof(PageLog));
             LogSerializer.AddLogType(EventLog.JsonIdentifier, typeof(EventLog));
@@ -106,10 +107,7 @@ internal Analytics(ISessionTrackerFactory sessionTrackerFactory) : this()
 
         public override bool InstanceEnabled
         {
-            get
-            {
-                return base.InstanceEnabled;
-            }
+            get => base.InstanceEnabled;
 
             set
             {
@@ -160,26 +158,26 @@ private void ApplyEnabledState(bool enabled)
         {
             lock (_serviceLock)
             {
-                if (enabled && ChannelGroup != null && SessionTracker == null)
+                if (enabled && ChannelGroup != null && _sessionTracker == null)
                 {
-                    SessionTracker = CreateSessionTracker(ChannelGroup, Channel, ApplicationSettings);
+                    _sessionTracker = CreateSessionTracker(ChannelGroup, Channel, ApplicationSettings);
                     if (!ApplicationLifecycleHelper.Instance.IsSuspended)
                     {
-                        SessionTracker.Resume();
+                        _sessionTracker.Resume();
                     }
                     SubscribeToApplicationLifecycleEvents();
                 }
                 else if (!enabled)
                 {
                     UnsubscribeFromApplicationLifecycleEvents();
-                    SessionTracker = null;
+                    _sessionTracker = null;
                 }
             }
         }
 
         private ISessionTracker CreateSessionTracker(IChannelGroup channelGroup, IChannelUnit channel, IApplicationSettings applicationSettings)
         {
-            return _sessionTrackerFactory?.CreateSessionTracker(channelGroup, channel, applicationSettings) ?? new SessionTracker(channelGroup, channel, applicationSettings);
+            return _sessionTrackerFactory?.CreateSessionTracker(channelGroup, channel, applicationSettings) ?? new SessionTracker(channelGroup, channel);
         }
 
         /// <summary>
@@ -218,12 +216,12 @@ private void UnsubscribeFromApplicationLifecycleEvents()
 
         private void ApplicationResumingEventHandler(object sender, EventArgs e)
         {
-            SessionTracker?.Resume();
+            _sessionTracker?.Resume();
         }
 
         private void ApplicationSuspendedEventHandler(object sender, EventArgs e)
         {
-            SessionTracker?.Pause();
+            _sessionTracker?.Pause();
         }
 
         /// <summary>
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Channel/SessionTracker.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Channel/SessionTracker.cs
index 6ad3a6f3e..96d46341b 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Channel/SessionTracker.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Windows.Shared/Channel/SessionTracker.cs
@@ -6,6 +6,7 @@
 using Microsoft.AppCenter.Ingestion.Models;
 using Microsoft.AppCenter.Utils;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.AppCenter.Analytics.Channel
 {
     internal class SessionTracker : ISessionTracker
@@ -30,20 +31,22 @@ private enum SessionState
         // Some fields are internal for testing
         internal static long SessionTimeout = 20000;
         private readonly IChannelUnit _channel;
-        internal Guid _sid = Guid.Empty;
+
+        // Since we don't have session history anymore, when disabling /enabling analytics a new instance is created.
+        // But the correlation identifier in AppCenter is static and thus updating session will fail test and set if we don't know previous value.
+        // The field is thus static to remember previous sessions across instances... Internal because read and reset in tests.
+        internal static Guid Sid;
         private long _lastQueuedLogTime;
         private long _lastResumedTime;
         private long _lastPausedTime;
-        private readonly IApplicationSettings _applicationSettings;
         private readonly object _lockObject = new object();
 
-        public SessionTracker(IChannelGroup channelGroup, IChannelUnit channel, IApplicationSettings applicationSettings)
+        public SessionTracker(IChannel channelGroup, IChannelUnit channel)
         {
             // Need to lock in constructor because of the event handler being set for channelGroup.
             lock (_lockObject)
             {
                 _channel = channel;
-                _applicationSettings = applicationSettings;
                 channelGroup.EnqueuingLog += HandleEnqueuingLog;
             }
         }
@@ -90,7 +93,7 @@ private void HandleEnqueuingLog(object sender, EnqueuingLogEventArgs e)
                     return;
                 }
                 SendStartSessionIfNeeded();
-                e.Log.Sid = _sid == Guid.Empty ? null : new Guid?(_sid);
+                e.Log.Sid = Sid;
                 _lastQueuedLogTime = TimeHelper.CurrentTimeInMilliseconds();
             }
         }
@@ -98,16 +101,17 @@ private void HandleEnqueuingLog(object sender, EnqueuingLogEventArgs e)
         private void SendStartSessionIfNeeded()
         {
             var now = TimeHelper.CurrentTimeInMilliseconds();
-            if (_sid != Guid.Empty && !HasSessionTimedOut(now))
+            if (_lastQueuedLogTime > 0 && !HasSessionTimedOut(now))
             {
                 return;
             }
-            _sid = Guid.NewGuid();
+            var previousSid = Sid;
+            Sid = Guid.NewGuid();
 #pragma warning disable CS0612 // Type or member is obsolete
-            AppCenter.TestAndSetCorrelationId(Guid.Empty, ref _sid);
+            AppCenter.TestAndSetCorrelationId(previousSid, ref Sid);
 #pragma warning restore CS0612 // Type or member is obsolete
             _lastQueuedLogTime = TimeHelper.CurrentTimeInMilliseconds();
-            var startSessionLog = new StartSessionLog { Sid = _sid };
+            var startSessionLog = new StartSessionLog { Sid = Sid };
             _channel.EnqueueAsync(startSessionLog);
         }
 
@@ -119,7 +123,7 @@ private bool HasSessionTimedOut(long now)
         // Internal and static so that it can be tested more easily
         internal static bool HasSessionTimedOut(long now, long lastQueuedLogTime, long lastResumedTime, long lastPausedTime)
         {
-            var noLogSentForLong = lastQueuedLogTime == 0 || (now - lastQueuedLogTime) >= SessionTimeout;
+            var noLogSentForLong = lastQueuedLogTime == 0 || now - lastQueuedLogTime >= SessionTimeout;
             if (lastPausedTime == 0)
             {
                 return lastResumedTime == 0 && noLogSentForLong;
@@ -128,8 +132,8 @@ internal static bool HasSessionTimedOut(long now, long lastQueuedLogTime, long l
             {
                 return noLogSentForLong;
             }
-            var isBackgroundForLong = (lastPausedTime >= lastResumedTime) && ((now - lastPausedTime) >= SessionTimeout);
-            var wasBackgroundForLong = (lastResumedTime - Math.Max(lastPausedTime, lastQueuedLogTime)) >= SessionTimeout;
+            var isBackgroundForLong = lastPausedTime >= lastResumedTime && now - lastPausedTime >= SessionTimeout;
+            var wasBackgroundForLong = lastResumedTime - Math.Max(lastPausedTime, lastQueuedLogTime) >= SessionTimeout;
             AppCenterLog.Debug(Analytics.Instance.LogTag, $"noLogSentForLong={noLogSentForLong} " +
                                                     $"isBackgroundForLong={isBackgroundForLong} " +
                                                     $"wasBackgroundForLong={wasBackgroundForLong}");
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj
index 4b7561184..d0679b722 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Microsoft.AppCenter.Analytics.WindowsDesktop.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.AppCenter.Analytics</RootNamespace>
     <AssemblyName>Microsoft.AppCenter.Analytics</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -30,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -45,15 +43,17 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter.WindowsDesktop\Microsoft.AppCenter.WindowsDesktop.csproj">
       <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
       <Name>Microsoft.AppCenter.WindowsDesktop</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>6.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="..\Microsoft.AppCenter.Analytics.Windows.Shared\Microsoft.AppCenter.Analytics.Windows.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs
index c9607f898..8ca73805b 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/packages.config b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/packages.config
deleted file mode 100644
index aa8e3da7c..000000000
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.WindowsDesktop/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net452" />
-</packages>
\ No newline at end of file
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs
index ae286e67f..271228724 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS/Properties/AssemblyInfo.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS/Properties/AssemblyInfo.cs
index a1ead50ca..b5ffa146c 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.iOS/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Analytics.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Analytics.cs
index 31e3b4f76..50493e887 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Analytics.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Analytics.cs
@@ -3,12 +3,13 @@
 
 namespace Microsoft.AppCenter.Analytics
 {
+    /// <inheritdoc />
     /// <summary>
     ///     Analytics feature.
     /// </summary>
     public class Analytics : IAppCenterService
     {
-        internal Analytics()
+        private Analytics()
         {
         }
 
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj
index e7a6da969..e90b73661 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/Microsoft.AppCenter.Analytics.csproj
@@ -6,9 +6,9 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Product>Microsoft.AppCenter.Analytics</Product>
     <Company>Microsoft Corporation</Company>
-    <Version>1.5.0-SNAPSHOT</Version>
+    <Version>1.6.0-SNAPSHOT</Version>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyTitle>Microsoft.AppCenter.Analytics</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
diff --git a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/NamespaceDoc.cs b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/NamespaceDoc.cs
index 46667c32d..5c51ab431 100644
--- a/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/NamespaceDoc.cs
+++ b/SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics/NamespaceDoc.cs
@@ -1,9 +1,9 @@
-namespace Microsoft.AppCenterAnalytics
+namespace Microsoft.AppCenter.Analytics
 {
     /// <summary>
     /// Analytics SDK module.
     /// </summary>
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
 }
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android.Bindings/Properties/AssemblyInfo.cs
index 489769886..e1ebbf5ca 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android.Bindings/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Crashes.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Crashes.cs
index 837c088a9..77ab6c547 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Crashes.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Crashes.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.AppCenter.Crashes
 {
-    #pragma warning disable XA0001 // Find issues with Android API usage, the API level check does not work in libs.
+#pragma warning disable XA0001 // Find issues with Android API usage, the API level check does not work in libs.
     using ModelException = Com.Microsoft.Appcenter.Crashes.Ingestion.Models.Exception;
     using ModelStackFrame = Com.Microsoft.Appcenter.Crashes.Ingestion.Models.StackFrame;
     using Exception = System.Exception;
@@ -85,21 +85,48 @@ static void PlatformTrackError(Exception exception, IDictionary<string, string>
         // Empty model stack frame used for comparison to optimize JSON payload.
         static readonly ModelStackFrame EmptyModelFrame = new ModelStackFrame();
 
+        // Exception that was caught, to avoid logging it 2 times if both handlers called.
+        static Exception _exception;
+
         static Crashes()
         {
-            AppCenterLog.Info(LogTag, "Set up Xamarin crash handler.");
+            // Set up 2 different handlers, some exceptions are caught by one or the other or both (all scenarios are possible).
+            // When caught on both, only the first invocation will actually be saved by the native SDK.
+            // Android environment is called before app domain in case of both called, and that's what we want as
+            // Android environment has a better stack trace object (no JavaProxyThrowable wrapper that cannot be serialized).
+            // Client side exception object after restart not possible most of the time with AppDomain when it's JavaProxyThrowable.
+            // AndroidEnvironment is also called before Java SDK exception handler (which itself not always called...).
+            // App domain fallback is thus used only when both android environment and Java SDK handler cannot catch.
+            // From our tests if only app domain is called, then it's not a JavaProxyThrowable, so stack trace looks fine.
+            AppCenterLog.Info(LogTag, "Set up Xamarin crash handlers.");
             AndroidEnvironment.UnhandledExceptionRaiser += OnUnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
+
+            // Set up bridge between Java listener and .NET events/callbacks.
             AndroidCrashes.SetListener(new AndroidCrashListener());
         }
 
         static void OnUnhandledException(object sender, RaiseThrowableEventArgs e)
         {
-            var exception = e.Exception;
-            AppCenterLog.Error(LogTag, "Unhandled Exception:", exception);
-            var javaThrowable = exception as Throwable;
-            var modelException = GenerateModelException(exception, true);
-            byte[] rawException = javaThrowable == null ? CrashesUtils.SerializeException(exception) : null;
-            WrapperSdkExceptionManager.SaveWrapperException(Thread.CurrentThread(), javaThrowable, modelException, rawException);
+            OnUnhandledException(e.Exception, "AndroidEnvironment");
+        }
+
+        static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            OnUnhandledException(e.ExceptionObject as Exception, "AppDomain");
+        }
+
+        static void OnUnhandledException(Exception exception, string source)
+        {
+            if (_exception == null)
+            {
+                AppCenterLog.Error(LogTag, $"Unhandled Exception from source={source}", exception);
+                var javaThrowable = exception as Throwable;
+                var modelException = GenerateModelException(exception, true);
+                byte[] rawException = javaThrowable == null ? CrashesUtils.SerializeException(exception) : null;
+                WrapperSdkExceptionManager.SaveWrapperException(Thread.CurrentThread(), javaThrowable, modelException, rawException);
+                _exception = exception;
+            }
         }
 
 #pragma warning disable XS0001 // Find usages of mono todo items
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Properties/AssemblyInfo.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Properties/AssemblyInfo.cs
index 406719400..dc45f86dd 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Android/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.UWP/Properties/AssemblyInfo.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.UWP/Properties/AssemblyInfo.cs
index 9f95d2dc1..ab257a6f9 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.UWP/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj
index 7dbbeba57..bf03dd166 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Microsoft.AppCenter.Crashes.WindowsDesktop.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.AppCenter.Crashes</RootNamespace>
     <AssemblyName>Microsoft.AppCenter.Crashes</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,9 +44,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WatsonRegistrationManager.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter.WindowsDesktop\Microsoft.AppCenter.WindowsDesktop.csproj">
       <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs
index 4c3bbbe86..527693bea 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/project.json b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/project.json
deleted file mode 100644
index d6fffc81f..000000000
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.WindowsDesktop/project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "dependencies": {
-  },
-  "frameworks": {
-    "net452": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}
\ No newline at end of file
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs
index 50f7a8a02..b57466748 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Crashes.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Crashes.cs
index 4bcb99f5c..547f242e7 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Crashes.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Crashes.cs
@@ -100,6 +100,7 @@ static Crashes()
         static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             Exception systemException = e.ExceptionObject as Exception;
+            AppCenterLog.Error(LogTag, "Unhandled Exception:", systemException);
             MSException exception = GenerateiOSException(systemException, true);
             byte[] exceptionBytes = CrashesUtils.SerializeException(systemException);
             NSData wrapperExceptionData = NSData.FromArray(exceptionBytes);
@@ -110,7 +111,9 @@ static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
                 ExceptionData = wrapperExceptionData,
                 ProcessId = new NSNumber(Process.GetCurrentProcess().Id)
             };
+            AppCenterLog.Info(LogTag, "Saving wrapper exception...");
             MSWrapperExceptionManager.SaveWrapperException(wrapperException);
+            AppCenterLog.Info(LogTag, "Saved wrapper exception.");
         }
 
         static MSException GenerateiOSException(Exception exception, bool structuredFrames)
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Properties/AssemblyInfo.cs b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Properties/AssemblyInfo.cs
index 4f6e5117b..6b038a603 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.iOS/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/Microsoft.AppCenter.Crashes.csproj b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/Microsoft.AppCenter.Crashes.csproj
index d5610a217..89dd6a5d9 100644
--- a/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/Microsoft.AppCenter.Crashes.csproj
+++ b/SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes/Microsoft.AppCenter.Crashes.csproj
@@ -7,9 +7,9 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Product>Microsoft.AppCenter.Crashes</Product>
     <Company>Microsoft Corporation</Company>
-    <Version>1.5.0-SNAPSHOT</Version>
+    <Version>1.6.0-SNAPSHOT</Version>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyTitle>Microsoft.AppCenter.Crashes</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android.Bindings/Properties/AssemblyInfo.cs
index 4d20fe458..63addb513 100644
--- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android.Bindings/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android/Properties/AssemblyInfo.cs b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android/Properties/AssemblyInfo.cs
index d1f224731..0820c4694 100644
--- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Android/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs
index 3735b086e..72d533665 100644
--- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS/Properties/AssemblyInfo.cs b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS/Properties/AssemblyInfo.cs
index bc2729b5d..6ade95cad 100644
--- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.iOS/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/Microsoft.AppCenter.Distribute.csproj b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/Microsoft.AppCenter.Distribute.csproj
index a7e1d60c9..4f4de68f4 100644
--- a/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/Microsoft.AppCenter.Distribute.csproj
+++ b/SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute/Microsoft.AppCenter.Distribute.csproj
@@ -7,9 +7,9 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Product>Microsoft.AppCenter.Distribute</Product>
     <Company>Microsoft Corporation</Company>
-    <Version>1.5.0-SNAPSHOT</Version>
+    <Version>1.6.0-SNAPSHOT</Version>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyTitle>Microsoft.AppCenter.Distribute</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android.Bindings/Properties/AssemblyInfo.cs
index 9c2e702c0..00c391e75 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android.Bindings/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android/Properties/AssemblyInfo.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android/Properties/AssemblyInfo.cs
index 2cb90cf4b..e5f16299a 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.Android/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Properties/AssemblyInfo.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Properties/AssemblyInfo.cs
index 8a29704dc..695ab215c 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Properties/AssemblyInfo.cs
@@ -28,6 +28,6 @@
 [assembly: ReferenceAssembly]
 #endif
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
 [assembly: InternalsVisibleTo("Microsoft.AppCenter.Test.UWP")]
\ No newline at end of file
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Push.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Push.cs
index 37fda637d..df6b8d188 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Push.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.UWP/Push.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AppCenter.Push.Ingestion.Models;
 using Microsoft.AppCenter.Utils;
 using Microsoft.AppCenter.Utils.Synchronization;
@@ -66,12 +64,11 @@ private void ApplyEnabledState(bool enabled)
                 // We expect caller of this method to lock on _mutex, we can't do it here as that lock is not recursive
                 AppCenterLog.Debug(LogTag, "Getting push token...");
                 var state = _mutex.State;
-                Task.Run(async () =>
+                CreatePushNotificationChannel(channel =>
                 {
-                    var channel = await CreatePushNotificationChannelAsync().ConfigureAwait(false);
                     try
                     {
-                        using (await _mutex.GetLockAsync(state).ConfigureAwait(false))
+                        using (_mutex.GetLock(state))
                         {
                             var pushToken = channel?.Uri;
                             if (!string.IsNullOrEmpty(pushToken))
@@ -141,51 +138,49 @@ private void OnPushNotificationReceivedHandler(PushNotificationChannel sender, W
             }
         }
 
-        private async Task<PushNotificationChannel> CreatePushNotificationChannelAsync()
+        private void CreatePushNotificationChannel(Action<PushNotificationChannel> created)
         {
-            PushNotificationChannel channel = null;
-            try
-            {
-                // If this isn't the first time after installation, the notification channel is created successfully even without network.
-                channel = await new WindowsPushNotificationChannelManager().CreatePushNotificationChannelForApplicationAsync()
-                    .AsTask().ConfigureAwait(false);
-            }
-            catch (Exception exception)
+            void OnNetworkStateChange(object sender, EventArgs e)
             {
                 if (NetworkStateAdapter.IsConnected)
                 {
-                    AppCenterLog.Error(LogTag, "Unable to create notification channel.", exception);
-                    return null;
+                    NetworkStateAdapter.NetworkStatusChanged -= OnNetworkStateChange;
+                    AppCenterLog.Debug(LogTag, "Second attempt to create notification channel...");
+
+                    // Second attempt is the last one anyway.
+                    new WindowsPushNotificationChannelManager()
+                        .CreatePushNotificationChannelForApplicationAsync()
+                        .AsTask().ContinueWith(task =>
+                    {
+                        if (task.IsFaulted)
+                        {
+                            AppCenterLog.Error(LogTag, "Unable to create notification channel.", task.Exception);
+                            return;
+                        }
+                        created?.Invoke(task.Result);
+                    });
                 }
             }
-            if (channel != null)
-            {
-                return channel;
-            }
-            AppCenterLog.Debug(LogTag, "The network isn't connected, another attempt will be made after the network is available.");
-            var networkSemaphore = new SemaphoreSlim(0);
-            void NetworkStateChangeHandler(object sender, EventArgs e)
+
+            // If this isn't the first time after installation, the notification channel is created successfully even without network.
+            new WindowsPushNotificationChannelManager()
+                .CreatePushNotificationChannelForApplicationAsync()
+                .AsTask().ContinueWith(task =>
             {
-                if (NetworkStateAdapter.IsConnected)
+                if (task.IsFaulted && NetworkStateAdapter.IsConnected)
                 {
-                    networkSemaphore.Release();
+                    AppCenterLog.Error(LogTag, "Unable to create notification channel.", task.Exception);
+                    return;
                 }
-            }
-            NetworkStateAdapter.NetworkStatusChanged += NetworkStateChangeHandler;
-            await networkSemaphore.WaitAsync().ConfigureAwait(false);
-            NetworkStateAdapter.NetworkStatusChanged -= NetworkStateChangeHandler;
-            AppCenterLog.Debug(LogTag, "Second attempt to create notification channel...");
-            try
-            {
-                // Second attempt is the last one anyway.
-                return await new WindowsPushNotificationChannelManager().CreatePushNotificationChannelForApplicationAsync()
-                    .AsTask().ConfigureAwait(false);
-            }
-            catch (Exception exception)
-            {
-                AppCenterLog.Error(LogTag, "Unable to create notification channel.", exception);
-                return null;
-            }
+                if (!task.IsFaulted && task.Result != null)
+                {
+                    created?.Invoke(task.Result);
+                    return;
+                }
+                AppCenterLog.Debug(LogTag, "The network isn't connected, another attempt to crate push notification channel " +
+                                           "will be made after the network is available.");
+                NetworkStateAdapter.NetworkStatusChanged += OnNetworkStateChange;
+            });
         }
 
         internal static PushNotificationReceivedEventArgs ParseAppCenterPush(XmlDocument content)
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/ApiDefinition.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/ApiDefinition.cs
index 88ef9c010..c5d4b7eed 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/ApiDefinition.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/ApiDefinition.cs
@@ -63,6 +63,6 @@ interface MSPushNotification
 
         //@property(nonatomic, copy, readonly) NSDictionary<NSString*, NSString*> *customData;
         [Export("customData")]
-        NSDictionary<NSString, NSString> CustomData { get; }
+        NSDictionary CustomData { get; }
     }
 }
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/Properties/AssemblyInfo.cs
index eeb7bac97..dacbe0396 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Properties/AssemblyInfo.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Properties/AssemblyInfo.cs
index ebd6c3552..92fedb2ef 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Push.cs b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Push.cs
index 60644bd9c..fa3ade9d7 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Push.cs
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push.iOS/Push.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Foundation;
 using Microsoft.AppCenter.Push.iOS;
@@ -20,7 +20,7 @@ static Push()
                 {
                     Title = notification.Title,
                     Message = notification.Message,
-                    CustomData = NSDictionaryToDotNet(notification.CustomData)
+                    CustomData = notification.CustomData?.ToDictionary(i => i.Key.ToString(), i => i.Value.ToString())
                 };
                 PushNotificationReceived?.Invoke(null, pushEventArgs);
             };
@@ -47,8 +47,6 @@ public static Type BindingType
             }
         }
 
-        private static event EventHandler<PushNotificationReceivedEventArgs> PlatformPushNotificationReceived;
-
         /// <summary>
         /// Call this from the corresponding method override in your AppDelegate.
         /// </summary>
@@ -71,15 +69,5 @@ public static bool DidReceiveRemoteNotification(NSDictionary userInfo)
         {
             return MSPush.DidReceiveRemoteNotification(userInfo);
         }
-
-        private static IDictionary<string, string> NSDictionaryToDotNet(NSDictionary<NSString, NSString> nsdict)
-        {
-            var dict = new Dictionary<string, string>();
-            foreach (var key in nsdict.Keys)
-            {
-                dict[key.ToString()] = nsdict.ObjectForKey(key);
-            }
-            return dict;
-        }
     }
 }
diff --git a/SDK/AppCenterPush/Microsoft.AppCenter.Push/Microsoft.AppCenter.Push.csproj b/SDK/AppCenterPush/Microsoft.AppCenter.Push/Microsoft.AppCenter.Push.csproj
index bc94cca4f..fa57d0273 100644
--- a/SDK/AppCenterPush/Microsoft.AppCenter.Push/Microsoft.AppCenter.Push.csproj
+++ b/SDK/AppCenterPush/Microsoft.AppCenter.Push/Microsoft.AppCenter.Push.csproj
@@ -7,9 +7,9 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Product>Microsoft.AppCenter.Push</Product>
     <Company>Microsoft Corporation</Company>
-    <Version>1.5.0-SNAPSHOT</Version>
+    <Version>1.6.0-SNAPSHOT</Version>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyTitle>Microsoft.AppCenter.Push</AssemblyTitle>
     <Description />
   </PropertyGroup>
diff --git a/SDK/AppCenterRum/Microsoft.AppCenter.Rum.Android/Properties/AssemblyInfo.cs b/SDK/AppCenterRum/Microsoft.AppCenter.Rum.Android/Properties/AssemblyInfo.cs
index 7ec5f6695..d4a060144 100644
--- a/SDK/AppCenterRum/Microsoft.AppCenter.Rum.Android/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterRum/Microsoft.AppCenter.Rum.Android/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/SDK/AppCenterRum/Microsoft.AppCenter.Rum.UWP/Properties/AssemblyInfo.cs b/SDK/AppCenterRum/Microsoft.AppCenter.Rum.UWP/Properties/AssemblyInfo.cs
index 42911609c..be3e857a4 100644
--- a/SDK/AppCenterRum/Microsoft.AppCenter.Rum.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/AppCenterRum/Microsoft.AppCenter.Rum.UWP/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/SDK/AppCenterRum/Microsoft.AppCenter.Rum/Microsoft.AppCenter.Rum.csproj b/SDK/AppCenterRum/Microsoft.AppCenter.Rum/Microsoft.AppCenter.Rum.csproj
index 386c823b6..e105ff88a 100644
--- a/SDK/AppCenterRum/Microsoft.AppCenter.Rum/Microsoft.AppCenter.Rum.csproj
+++ b/SDK/AppCenterRum/Microsoft.AppCenter.Rum/Microsoft.AppCenter.Rum.csproj
@@ -7,9 +7,9 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Product>Microsoft.AppCenter.Rum</Product>
     <Company>Microsoft Corporation</Company>
-    <Version>1.5.0-SNAPSHOT</Version>
+    <Version>1.6.0-SNAPSHOT</Version>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <FileVersion>1.6.0.0</FileVersion>
     <AssemblyTitle>Microsoft.AppCenter.Rum</AssemblyTitle>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs b/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs
index f13ab7ea6..61b19d839 100644
--- a/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs
+++ b/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Tests/Droid/Properties/AndroidManifest.xml b/Tests/Droid/Properties/AndroidManifest.xml
index 669ed702d..8b3f85fb4 100644
--- a/Tests/Droid/Properties/AndroidManifest.xml
+++ b/Tests/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="47" android:versionName="1.5.0-SNAPSHOT" package="com.contoso.contoso_forms_test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="49" android:versionName="1.6.0-SNAPSHOT" package="com.contoso.contoso_forms_test">
     <uses-sdk android:minSdkVersion="15" />
     <application android:label="Contoso.Forms.Test">
     </application>
diff --git a/Tests/Droid/Properties/AssemblyInfo.cs b/Tests/Droid/Properties/AssemblyInfo.cs
index 823d92891..d397fe978 100644
--- a/Tests/Droid/Properties/AssemblyInfo.cs
+++ b/Tests/Droid/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Tests/Microsoft.AppCenter.Analytics.NET/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Analytics.NET/Properties/AssemblyInfo.cs
index ad23f4d05..644d3ea7b 100644
--- a/Tests/Microsoft.AppCenter.Analytics.NET/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Analytics.NET/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 [assembly: InternalsVisibleTo("Microsoft.AppCenter.Analytics.Test.Windows")]
\ No newline at end of file
diff --git a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/AnalyticsTest.cs b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/AnalyticsTest.cs
index 933fa911c..5196e98b6 100644
--- a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/AnalyticsTest.cs
+++ b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/AnalyticsTest.cs
@@ -201,9 +201,9 @@ public void TrackEventInvalid()
 
             // Property key length exceeds maximum
             _mockChannel.ResetCalls();
-            Analytics.TrackEvent("test", new Dictionary<string, string> { { new string('?', 65), "test" } });
+            Analytics.TrackEvent("test", new Dictionary<string, string> { { new string('?', 126), "test" } });
             _mockChannel.Verify(channel => channel.EnqueueAsync(It.Is<EventLog>(log =>
-                log.Properties.First().Key.Length == 64)), Times.Once());
+                log.Properties.First().Key.Length == 125)), Times.Once());
             
             // Property value is null
             _mockChannel.ResetCalls();
@@ -213,20 +213,20 @@ public void TrackEventInvalid()
 
             // Property value length exceeds maximum
             _mockChannel.ResetCalls();
-            Analytics.TrackEvent("test", new Dictionary<string, string> { { "test", new string('?', 65) } });
+            Analytics.TrackEvent("test", new Dictionary<string, string> { { "test", new string('?', 126) } });
             _mockChannel.Verify(channel => channel.EnqueueAsync(It.Is<EventLog>(log =>
-                log.Properties.First().Value.Length == 64)), Times.Once());
+                log.Properties.First().Value.Length == 125)), Times.Once());
 
             // Properties size exceeds maximum
             _mockChannel.ResetCalls();
             var manyProperties = new Dictionary<string, string>();
-            for (int i = 0; i < 6; i++)
+            for (int i = 0; i < 21; i++)
             {
                 manyProperties["test" + i] = "test" + i;
             }
             Analytics.TrackEvent("test", manyProperties);
             _mockChannel.Verify(channel => channel.EnqueueAsync(It.Is<EventLog>(log =>
-                log.Properties.Count == 5)), Times.Once());
+                log.Properties.Count == 20)), Times.Once());
         }
 
         /// <summary>
diff --git a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs
index 3b7639fe9..99ea13d53 100644
--- a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/SessionTrackerTest.cs b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/SessionTrackerTest.cs
index 209c91c1c..df8a200c4 100644
--- a/Tests/Microsoft.AppCenter.Analytics.Test.Windows/SessionTrackerTest.cs
+++ b/Tests/Microsoft.AppCenter.Analytics.Test.Windows/SessionTrackerTest.cs
@@ -4,7 +4,6 @@
 using Microsoft.AppCenter.Analytics.Channel;
 using Microsoft.AppCenter.Analytics.Ingestion.Models;
 using Microsoft.AppCenter.Channel;
-using Microsoft.AppCenter.Utils;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
@@ -13,9 +12,8 @@ namespace Microsoft.AppCenter.Analytics.Test.Windows
     [TestClass]
     public class SessionTrackerTest
     {
-        private Mock<IChannelGroup> _mockChannelGroup;
         private Mock<IChannelUnit> _mockChannel;
-        private Mock<IApplicationSettings> _mockSettings;
+        private Mock<IChannelGroup> _mockChannelGroup;
         private SessionTracker _sessionTracker;
 
         [TestInitialize]
@@ -24,15 +22,16 @@ public void InitializeSessionTrackerTest()
             _mockChannelGroup = new Mock<IChannelGroup>();
             _mockChannel = new Mock<IChannelUnit>();
             _mockChannelGroup.Setup(
-                    group => group.AddChannel(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<TimeSpan>(), It.IsAny<int>()))
+                    group => group.AddChannel(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<TimeSpan>(),
+                        It.IsAny<int>()))
                 .Returns(_mockChannel.Object);
-            _mockSettings = new Mock<IApplicationSettings>();
-            _sessionTracker = new SessionTracker(_mockChannelGroup.Object, _mockChannel.Object, _mockSettings.Object);
-            SessionTracker.SessionTimeout = 500;
+            _sessionTracker = new SessionTracker(_mockChannelGroup.Object, _mockChannel.Object);
+            SessionTracker.SessionTimeout = 10;
+            SessionTracker.Sid = Guid.Empty;
         }
 
         /// <summary>
-        /// Verify that the first call to resume sends a start session log
+        ///     Verify that the first call to resume sends a start session log
         /// </summary>
         [TestMethod]
         public void ResumeFirstTime()
@@ -43,38 +42,40 @@ public void ResumeFirstTime()
         }
 
         /// <summary>
-        /// Verify that after a timeout, the session tracker sends another start session log
+        ///     Verify that after a timeout, the session tracker sends another start session log
         /// </summary>
         [TestMethod]
         public void ResumeAfterTimeout()
         {
             _sessionTracker.Resume();
             _sessionTracker.Pause();
-            Task.Delay((int)SessionTracker.SessionTimeout).Wait();
+            Task.Delay((int)SessionTracker.SessionTimeout * 2).Wait();
             _sessionTracker.Resume();
 
             _mockChannel.Verify(channel => channel.EnqueueAsync(It.IsAny<StartSessionLog>()), Times.Exactly(2));
         }
 
         /// <summary>
-        /// Verify that after a timeout, if we resume and send a log at the same time, only 1 new session is started
+        ///     Verify that after a timeout, if we resume and send a log at the same time, only 1 new session is started
         /// </summary>
         [TestMethod]
         public void ResumeAfterTimeoutAndSendEvent()
         {
             _sessionTracker.Resume();
             _sessionTracker.Pause();
-            Task.Delay((int)SessionTracker.SessionTimeout).Wait();
+            Task.Delay((int)SessionTracker.SessionTimeout * 2).Wait();
             _mockChannel.Verify(channel => channel.EnqueueAsync(It.IsAny<StartSessionLog>()), Times.Once());
 
             _sessionTracker.Resume();
-            _mockChannelGroup.Raise(group => group.EnqueuingLog += null, null, new EnqueuingLogEventArgs(new EventLog()));
+            _mockChannelGroup.Raise(group => group.EnqueuingLog += null, null,
+                new EnqueuingLogEventArgs(new EventLog()));
 
             _mockChannel.Verify(channel => channel.EnqueueAsync(It.IsAny<StartSessionLog>()), Times.Exactly(2));
         }
 
         /// <summary>
-        /// Verify that after a pause that is not long enough to be a timeout, the session tracker does not send a start session log
+        ///     Verify that after a pause that is not long enough to be a timeout, the session tracker does not send a start
+        ///     session log
         /// </summary>
         [TestMethod]
         public void ResumeAfterShortPause()
@@ -87,7 +88,7 @@ public void ResumeAfterShortPause()
         }
 
         /// <summary>
-        /// Verify that an enqueuing log is handled properly while the tracker is in a session
+        ///     Verify that an enqueuing log is handled properly while the tracker is in a session
         /// </summary>
         [TestMethod]
         public void HandleEnqueuingLogDuringSession()
@@ -99,7 +100,7 @@ public void HandleEnqueuingLogDuringSession()
         }
 
         /// <summary>
-        /// If two logs are enqueued during the same session, they should have the same session id
+        ///     If two logs are enqueued during the same session, they should have the same session id
         /// </summary>
         [TestMethod]
         public void HandleEnueuingSecondLogDuringSession()
@@ -116,7 +117,7 @@ public void HandleEnueuingSecondLogDuringSession()
         }
 
         /// <summary>
-        /// Verify that an enqueuing log is adjusted and a session is started when a log is enqueued
+        ///     Verify that an enqueuing log is adjusted and a session is started when a log is enqueued
         /// </summary>
         [TestMethod]
         public void HandleEnqueuingLogOutsideSession()
@@ -131,7 +132,7 @@ public void HandleEnqueuingLogOutsideSession()
         }
 
         /// <summary>
-        /// Verify that when a StartSessionLog is enqueued, a new session is not started
+        ///     Verify that when a StartSessionLog is enqueued, a new session is not started
         /// </summary>
         [TestMethod]
         public void HandleEnqueuingStartSessionLog()
@@ -145,8 +146,9 @@ public void HandleEnqueuingStartSessionLog()
         }
 
         /// <summary>
-        /// Verify that the session id of the session with the greatest toffset less than or equal to the log toffset is selected
-        /// (when closest match is less than)
+        ///     Verify that the session id of the session with the greatest toffset less than or equal to the log toffset is
+        ///     selected
+        ///     (when closest match is less than)
         /// </summary>
         [TestMethod]
         public void TestSetSessionIdLessThan()
@@ -158,12 +160,13 @@ public void TestSetSessionIdLessThan()
             var success = SessionTracker.SetExistingSessionId(log, sessions);
 
             Assert.IsTrue(success);
-            Assert.AreEqual(intendedSid, log.Sid.Value);
+            Assert.AreEqual(intendedSid, log.Sid);
         }
 
         /// <summary>
-        /// Verify that the session id of the session with the greatest toffset less than or equal to the log toffset is selected
-        /// (when closest match is equal to)
+        ///     Verify that the session id of the session with the greatest toffset less than or equal to the log toffset is
+        ///     selected
+        ///     (when closest match is equal to)
         /// </summary>
         [TestMethod]
         public void TestSetSessionIdEqualTo()
@@ -175,11 +178,11 @@ public void TestSetSessionIdEqualTo()
             var success = SessionTracker.SetExistingSessionId(log, sessions);
 
             Assert.IsTrue(success);
-            Assert.AreEqual(intendedSid, log.Sid.Value);
+            Assert.AreEqual(intendedSid, log.Sid);
         }
 
         /// <summary>
-        /// Verify that when all session id toffsets are greater than that of the log, none is selected
+        ///     Verify that when all session id toffsets are greater than that of the log, none is selected
         /// </summary>
         [TestMethod]
         public void TestSetSessionIdNone()
@@ -194,35 +197,35 @@ public void TestSetSessionIdNone()
         }
 
         /// <summary>
-        /// Verify session timeout is true if log was never sent and only pause has occurred 
+        ///     Verify session timeout is true if log was never sent and only pause has occurred
         /// </summary>
         [TestMethod]
         public void HasSessionTimedOutPausedNeverResumed()
         {
-            long now = 10;
-            long lastQueuedLogTime = 0;
-            long lastResumedTime = 0;
-            long lastPausedTime = 5;
+            const long now = 10;
+            const long lastQueuedLogTime = 0;
+            const long lastResumedTime = 0;
+            const long lastPausedTime = 5;
 
             Assert.IsTrue(SessionTracker.HasSessionTimedOut(now, lastQueuedLogTime, lastResumedTime, lastPausedTime));
         }
 
         /// <summary>
-        /// Verify session timeout is false if session tracker was in background for long but a log was just sent
+        ///     Verify session timeout is false if session tracker was in background for long but a log was just sent
         /// </summary>
         [TestMethod]
         public void HasSessionTimedOutWasBackgroundForLongAndLogJustSent()
         {
-            long now = 1000;
-            long lastQueuedLogTime = 999;
-            long lastResumedTime = 998;
-            long lastPausedTime = 1;
+            const long now = 1000;
+            const long lastQueuedLogTime = 999;
+            const long lastResumedTime = 998;
+            const long lastPausedTime = 1;
 
             Assert.IsFalse(SessionTracker.HasSessionTimedOut(now, lastQueuedLogTime, lastResumedTime, lastPausedTime));
         }
 
         /// <summary>
-        /// Verify App Center Correlation ID is set when a session starts and current Correlation ID is null
+        ///     Verify App Center Correlation ID is set when a session starts and current Correlation ID is null
         /// </summary>
         [TestMethod]
         public void EmptyCorrelationIdIsSetWhenSessionStarts()
@@ -239,7 +242,7 @@ public void EmptyCorrelationIdIsSetWhenSessionStarts()
         }
 
         /// <summary>
-        /// Verify Sid is set to initial correlation id when a session starts and Correlation ID has a value
+        ///     Verify Sid is set to initial correlation id when a session starts and Correlation ID has a value
         /// </summary>
         [TestMethod]
         public void SidIsInitialCorrelationId()
@@ -249,25 +252,80 @@ public void SidIsInitialCorrelationId()
             var initialCorrelationId = Guid.NewGuid();
             AppCenter.Instance.InstanceCorrelationId = initialCorrelationId;
             _sessionTracker.Resume();
-            Assert.AreEqual(_sessionTracker._sid, initialCorrelationId);
+            Assert.AreEqual(SessionTracker.Sid, initialCorrelationId);
 #pragma warning restore CS0612 // Type or member is obsolete
         }
 
         /// <summary>
-        /// Verify App Center Correlation ID is set when the session id changes
+        ///     Verify App Center Correlation ID is set when the session id changes
         /// </summary>
         [TestMethod]
         public void VerifyCorrelationIdIsUpdatedWhenSessionChanges()
         {
 #pragma warning disable CS0612 // Type or member is obsolete
             _sessionTracker.Resume();
+            var sid1 = SessionTracker.Sid;
+            Assert.AreNotEqual(Guid.Empty, sid1);
 
             // Cause session expiration and start new session.
             _sessionTracker.Pause();
-            Task.Delay((int)SessionTracker.SessionTimeout).Wait();
+            Task.Delay((int)SessionTracker.SessionTimeout * 2).Wait();
             _sessionTracker.Resume();
-            Assert.IsTrue(AppCenter.TestAndSetCorrelationId(_sessionTracker._sid, ref AppCenter.Instance.InstanceCorrelationId));
+            Assert.IsTrue(AppCenter.TestAndSetCorrelationId(SessionTracker.Sid,
+                ref AppCenter.Instance.InstanceCorrelationId));
 #pragma warning restore CS0612 // Type or member is obsolete
+
+            // Verify second session has a different identifier.
+            var sid2 = SessionTracker.Sid;
+            Assert.AreNotEqual(Guid.Empty, sid2);
+            Assert.AreNotEqual(sid1, sid2);
+        }
+
+        /// <summary>
+        ///     Verify App Center session identifier changes on new session if someone else change correlation identifier.
+        /// </summary>
+        [TestMethod]
+        public void VerifySessionChangesOnCorrelationIdUpdatedByOthers()
+        {
+#pragma warning disable CS0612 // Type or member is obsolete
+            _sessionTracker.Resume();
+            var sid1 = SessionTracker.Sid;
+            Assert.AreNotEqual(Guid.Empty, sid1);
+
+            // Cause session expiration and start new session.
+            _sessionTracker.Pause();
+            Task.Delay((int)SessionTracker.SessionTimeout * 2).Wait();
+
+            // Change correlation identifier.
+            var externalCorrelationid = Guid.NewGuid();
+            Assert.IsTrue(AppCenter.TestAndSetCorrelationId(SessionTracker.Sid,
+                ref externalCorrelationid));
+
+            _sessionTracker.Resume();
+#pragma warning restore CS0612 // Type or member is obsolete
+
+            // Verify second session has a different identifier, not the new one analytics wanted but the updated correlation identifier instead.
+            var sid2 = SessionTracker.Sid;
+            Assert.AreNotEqual(Guid.Empty, sid2);
+            Assert.AreNotEqual(sid1, sid2);
+            Assert.AreEqual(externalCorrelationid, sid2);
+        }
+
+        [TestMethod]
+        public void VerifySessionChangesOnReenabling()
+        {
+            _sessionTracker.Resume();
+            var sid1 = SessionTracker.Sid;
+            Assert.AreNotEqual(Guid.Empty, sid1);
+
+            // Disable and enable again.
+            _sessionTracker = new SessionTracker(_mockChannelGroup.Object, _mockChannel.Object);
+            _sessionTracker.Resume();
+
+            // Verify second session has a different identifier, not the new one analytics wanted but the updated correlation identifier instead.
+            var sid2 = SessionTracker.Sid;
+            Assert.AreNotEqual(Guid.Empty, sid2);
+            Assert.AreNotEqual(sid1, sid2);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Tests/Microsoft.AppCenter.NET/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.NET/Properties/AssemblyInfo.cs
index 24ca5ca74..bc612e494 100644
--- a/Tests/Microsoft.AppCenter.NET/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.NET/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
 
 [assembly: InternalsVisibleTo("Microsoft.AppCenter.Test.Windows")]
 [assembly: InternalsVisibleTo("Microsoft.AppCenter.Analytics.Test.Windows")]
diff --git a/Tests/Microsoft.AppCenter.Push.NET/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Push.NET/Properties/AssemblyInfo.cs
index a92bf0935..157db6b1d 100644
--- a/Tests/Microsoft.AppCenter.Push.NET/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Push.NET/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Tests/Microsoft.AppCenter.Push.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Push.Test.Windows/Properties/AssemblyInfo.cs
index 4d20090b3..308c13ffd 100644
--- a/Tests/Microsoft.AppCenter.Push.Test.Windows/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Push.Test.Windows/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest b/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest
index a286c52fb..06ed51603 100644
--- a/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest
+++ b/Tests/Microsoft.AppCenter.Test.UWP/Package.appxmanifest
@@ -7,7 +7,7 @@
 
   <Identity Name="da6d3d34-876e-488c-9342-7a7e4daa110b"
             Publisher="CN=Alexander Chocron"
-            Version="1.5.0.0" />
+            Version="1.6.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="da6d3d34-876e-488c-9342-7a7e4daa110b" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs
index 2fc4d1f50..284b4135b 100644
--- a/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Test.UWP/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelGroupTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelGroupTest.cs
index 5801d5b52..68cff7f36 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelGroupTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelGroupTest.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AppCenter.Channel;
 using Microsoft.AppCenter.Ingestion;
 using Microsoft.AppCenter.Storage;
@@ -9,6 +10,8 @@
 
 namespace Microsoft.AppCenter.Test.Channel
 {
+    using Channel = Microsoft.AppCenter.Channel.Channel;
+
     [TestClass]
     public class ChannelGroupTest
     {
@@ -45,7 +48,7 @@ public void TestAddChannel()
         {
             const string channelName = "some_channel";
             var addedChannel =
-                _channelGroup.AddChannel(channelName, 2, TimeSpan.FromSeconds(3), 3) as Microsoft.AppCenter.Channel.Channel;
+                _channelGroup.AddChannel(channelName, 2, TimeSpan.FromSeconds(3), 3) as Channel;
 
             Assert.IsNotNull(addedChannel);
             Assert.AreEqual(channelName, addedChannel.Name);
@@ -168,8 +171,8 @@ public void TestEnableChannelGroup()
 
             foreach (var channelMock in channelMocks.Select(mock => mock as Mock<IChannelUnit>))
             {
-                channelMock.Verify(channel => channel.SetEnabled(It.Is<bool>(p => p)), Times.Once());
-                channelMock.Verify(channel => channel.SetEnabled(It.Is<bool>(p => !p)), Times.Once());
+                channelMock.Verify(channel => channel.SetEnabled(true), Times.Once);
+                channelMock.Verify(channel => channel.SetEnabled(false), Times.Once);
             }
         }
 
@@ -184,15 +187,16 @@ public void TestDisposeChannelGroup()
         /// Veriy that all channels are disabled after channel group disabling
         /// </summary>
         [TestMethod]
-        public void TestShutdownChannelGroup()
+        public async Task TestShutdownChannelGroup()
         {
             const string channelName = "some_channel";
             var addedChannel =
-                _channelGroup.AddChannel(channelName, 2, TimeSpan.FromSeconds(3), 3) as Microsoft.AppCenter.Channel.Channel;
+                _channelGroup.AddChannel(channelName, 2, TimeSpan.FromSeconds(3), 3) as Channel;
 
-            _channelGroup.ShutdownAsync().RunNotAsync();
+            await _channelGroup.ShutdownAsync();
 
             Assert.IsFalse(addedChannel.IsEnabled);
+            _mockIngestion.Verify(ingestion => ingestion.Close(), Times.Once);
         }
     }
 }
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelTest.cs
index 9c91bb7fc..19a485a29 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Channel/ChannelTest.cs
@@ -3,41 +3,47 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AppCenter.Channel;
-using Microsoft.AppCenter.Storage;
+using Microsoft.AppCenter.Ingestion;
 using Microsoft.AppCenter.Ingestion.Models;
 using Microsoft.AppCenter.Ingestion.Models.Serialization;
+using Microsoft.AppCenter.Storage;
 using Microsoft.AppCenter.Test.Storage;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
 namespace Microsoft.AppCenter.Test.Channel
 {
+    using Channel = Microsoft.AppCenter.Channel.Channel;
+
     [TestClass]
     public class ChannelTest
     {
         private AggregateException _unobservedTaskException;
-        private readonly MockIngestion _mockIngestion = new MockIngestion();
-        private Microsoft.AppCenter.Channel.Channel _channel;
+
+        private Mock<IIngestion> _mockIngestion;
+
+        private Channel _channel;
+
         private IStorage _storage;
 
-        private const string ChannelName = "channelName";
+        private const string ChannelName = "test";
+
         private const int MaxLogsPerBatch = 3;
-        private readonly TimeSpan _batchTimeSpan = TimeSpan.FromSeconds(1);
-        private const int MaxParallelBatches = 3;
-        private readonly string _appSecret = Guid.NewGuid().ToString();
 
-        // We wait tasks now and don't need wait more
-        private const int DefaultWaitTime = 500;
+        private const int MaxParallelBatches = 3;
 
         // Event semaphores for invokation verification
         private const int SendingLogSemaphoreIdx = 0;
+
         private const int SentLogSemaphoreIdx = 1;
+
         private const int FailedToSendLogSemaphoreIdx = 2;
+
         private const int EnqueuingLogSemaphoreIdx = 3;
+
         private const int FilteringLogSemaphoreIdx = 4;
-        private readonly List<SemaphoreSlim> _eventSemaphores = new List<SemaphoreSlim> { new SemaphoreSlim(0), new SemaphoreSlim(0), new SemaphoreSlim(0), new SemaphoreSlim(0), new SemaphoreSlim(0) };
 
-        public TestContext TestContext { get;set;}
+        private List<SemaphoreSlim> _eventSemaphores;
 
         public ChannelTest()
         {
@@ -48,9 +54,9 @@ public ChannelTest()
         public void InitializeChannelTest()
         {
             _unobservedTaskException = null;
-            _mockIngestion.CallShouldSucceed = true;
-            _mockIngestion.Open();
-            SetChannelWithTimeSpan(_batchTimeSpan);
+            _mockIngestion = new Mock<IIngestion>();
+            SetupIngestionCallSucceed();
+            SetChannelWithTimeSpan(TimeSpan.FromSeconds(1));
             TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
 
             AppCenterLog.Level = LogLevel.Verbose;
@@ -113,7 +119,7 @@ public void EnableChannel()
         /// Verify that enqueuing a log passes the same log reference to enqueue event argument
         /// </summary>
         [TestMethod]
-        public void EnqueuedLogsAreSame()
+        public async Task EnqueuedLogsAreSame()
         {
             var log = new TestLog();
             var sem = new SemaphoreSlim(0);
@@ -123,113 +129,109 @@ public void EnqueuedLogsAreSame()
                 sem.Release();
             };
 
-            _channel.EnqueueAsync(log).RunNotAsync();
-            Assert.IsTrue(sem.Wait(DefaultWaitTime));
+            await _channel.EnqueueAsync(log);
+            Assert.IsTrue(sem.Wait(0));
         }
 
         /// <summary>
         /// Verify that when a batch reaches its capacity, it is sent immediately
         /// </summary>
         [TestMethod]
-        public void EnqueueMaxLogs()
+        public async Task EnqueueMaxLogs()
         {
             SetChannelWithTimeSpan(TimeSpan.FromHours(1));
             for (var i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-            Assert.IsTrue(SendingLogOccurred(1));
+            VerifySendingLog(MaxLogsPerBatch);
         }
 
         /// <summary>
         /// Verify that when channel is disabled, sent event is not triggered
         /// </summary>
         [TestMethod]
-        public void EnqueueWhileDisabled()
+        public async Task EnqueueWhileDisabled()
         {
             _channel.SetEnabled(false);
             var log = new TestLog();
-            _channel.EnqueueAsync(log).RunNotAsync();
-            Assert.IsTrue(FailedToSendLogOccurred(1));
-            Assert.IsFalse(EnqueuingLogOccurred(1));
+            await _channel.EnqueueAsync(log);
+            VerifyFailedToSendLog(1);
+            VerifyEnqueuingLog(0);
         }
 
         [TestMethod]
-        public void ChannelInvokesFilteringLogEvent()
+        public async Task ChannelInvokesFilteringLogEvent()
         {
             for (var i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-
-            Assert.IsTrue(FilteringLogOccurred(MaxLogsPerBatch));
+            VerifyFilteringLog(MaxLogsPerBatch);
         }
 
         /// <summary>
         /// Validate filtering out a log
         /// </summary>
         [TestMethod]
-        public void FilterLogShouldNotSend()
+        public async Task FilterLogShouldNotSend()
         {
             _channel.FilteringLog += (sender, args) => args.FilterRequested = true;
             for (int i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-            Assert.IsTrue(FilteringLogOccurred(MaxLogsPerBatch));
-            Assert.IsFalse(SendingLogOccurred(MaxLogsPerBatch));
-            Assert.IsFalse(SentLogOccurred(MaxLogsPerBatch));
+            VerifyFilteringLog(MaxLogsPerBatch);
+            VerifySendingLog(0);
+            VerifySentLog(0);
         }
 
         /// <summary>
         /// Validate filters can cancel each other
         /// </summary>
         [TestMethod]
-        public void FilterLogThenCancelFilterLogInAnotherHandlerShouldSend()
+        public async Task FilterLogThenCancelFilterLogInAnotherHandlerShouldSend()
         {
             _channel.FilteringLog += (sender, args) => args.FilterRequested = true;
             _channel.FilteringLog += (sender, args) => args.FilterRequested = false;
             for (int i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-            Assert.IsTrue(FilteringLogOccurred(MaxLogsPerBatch));
-            Assert.IsTrue(SendingLogOccurred(MaxLogsPerBatch));
-            Assert.IsTrue(SentLogOccurred(MaxLogsPerBatch));
+            VerifyFilteringLog(MaxLogsPerBatch);
+            VerifySendingLog(MaxLogsPerBatch);
+            VerifySentLog(MaxLogsPerBatch);
         }
 
         [TestMethod]
-        public void ChannelInvokesSendingLogEvent()
+        public async Task ChannelInvokesSendingLogEvent()
         {
             for (var i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-
-            Assert.IsTrue(SendingLogOccurred(MaxLogsPerBatch));
+            VerifySendingLog(MaxLogsPerBatch);
         }
 
         [TestMethod]
-        public void ChannelInvokesSentLogEvent()
+        public async Task ChannelInvokesSentLogEvent()
         {
             for (var i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-
-            Assert.IsTrue(SentLogOccurred(MaxLogsPerBatch));
+            VerifySentLog(MaxLogsPerBatch);
         }
 
         [TestMethod]
-        public void ChannelInvokesFailedToSendLogEvent()
+        public async Task ChannelInvokesFailedToSendLogEvent()
         {
-            MakeIngestionCallsFail();
+            SetupIngestionCallFail(new Exception());
             for (var i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-
-            Assert.IsTrue(FailedToSendLogOccurred(MaxLogsPerBatch));
+            VerifyFailedToSendLog(MaxLogsPerBatch);
         }
 
         /// <summary>
@@ -249,48 +251,46 @@ public void FailedToSendLogEventArgsAreSame()
         /// Validate that channel will send log after enabling
         /// </summary>
         [TestMethod]
-        public void ChannelInvokesSendingLogEventAfterEnabling()
+        public async Task ChannelInvokesSendingLogEventAfterEnabling()
         {
-            _channel.ShutdownAsync().RunNotAsync();
+            await _channel.ShutdownAsync();
             for (int i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
-
             _channel.SetEnabled(true);
-
-            Assert.IsTrue(SendingLogOccurred(MaxLogsPerBatch));
+            VerifySendingLog(MaxLogsPerBatch);
         }
 
         /// <summary>
         /// Validate that FailedToSendLog calls when channel is disabled
         /// </summary>
         [TestMethod]
-        public void ChannelInvokesFailedToSendLogEventAfterDisabling()
+        public async Task ChannelInvokesFailedToSendLogEventAfterDisabling()
         {
             _channel.SetEnabled(false);
             for (int i = 0; i < MaxLogsPerBatch; ++i)
             {
-                _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+                await _channel.EnqueueAsync(new TestLog());
             }
 
-            Assert.IsTrue(SendingLogOccurred(MaxLogsPerBatch));
-            Assert.IsTrue(FailedToSendLogOccurred(MaxLogsPerBatch));
+            VerifySendingLog(MaxLogsPerBatch);
+            VerifyFailedToSendLog(MaxLogsPerBatch);
         }
 
         /// <summary>
         /// Validate that all logs removed
         /// </summary>
         [TestMethod]
-        public void ClearLogs()
+        public async Task TaskClearLogs()
         {
-            _channel.ShutdownAsync().RunNotAsync();
-            _channel.EnqueueAsync(new TestLog()).RunNotAsync();
+            await _channel.ShutdownAsync();
+            await _channel.EnqueueAsync(new TestLog());
 
-            _channel.ClearAsync().RunNotAsync();
+            await _channel.ClearAsync();
             _channel.SetEnabled(true);
 
-            Assert.IsFalse(SendingLogOccurred(1));
+            VerifySendingLog(0);
         }
 
         /// <summary>
@@ -308,7 +308,7 @@ public void DisposeChannelTest()
         /// Validate that StorageException is processing without exception
         /// </summary>
         [TestMethod]
-        public void ThrowStorageExceptionInDeleteLogsTime()
+        public async Task ThrowStorageExceptionInDeleteLogsTime()
         {
             var log = new TestLog();
             var storageException = new StorageException();
@@ -329,66 +329,125 @@ public void ThrowStorageExceptionInDeleteLogsTime()
                 .Callback((string channelName, int limit, List<Log> logs) => logs.Add(log))
                 .Returns(() => Task.FromResult("test-batch-id"));
 
-            _channel = new Microsoft.AppCenter.Channel.Channel(ChannelName, 1, _batchTimeSpan, 1, _appSecret, _mockIngestion, storage.Object);
+            var appSecret = Guid.NewGuid().ToString();
+            _channel = new Channel(ChannelName, 1, TimeSpan.FromSeconds(1), 1, appSecret, _mockIngestion.Object, storage.Object);
             SetupEventCallbacks();
 
             // Shutdown channel and store some log
-            _channel.ShutdownAsync().RunNotAsync();
-            _channel.EnqueueAsync(log).RunNotAsync();
+            await _channel.ShutdownAsync();
+            await _channel.EnqueueAsync(log);
 
             _channel.SetEnabled(true);
 
-            Assert.IsTrue(SentLogOccurred(1));
+           VerifySentLog(1);
 
             // Not throw any exception
         }
 
+        [TestMethod]
+        public async Task MultiBatchTest()
+        {
+            SetChannelWithTimeSpan(TimeSpan.Zero);
+            
+            var calls = new[] { new ServiceCall(), new ServiceCall(), new ServiceCall() };
+            var setup = _mockIngestion
+                .SetupSequence(ingestion => ingestion.Call(
+                    It.IsAny<string>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<IList<Log>>()));
+            foreach (var call in calls)
+            {
+                setup.Returns(call);
+            }
+            
+            // Send in separate batches
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+
+            // Complete all
+            foreach (var call in calls)
+            {
+                call.SetResult("test");
+            }
+            VerifySentLog(3);
+        }
+
         /// <summary>
-        /// Verify that when a recoverable http error occurs, ingestion stays open
+        /// Verify recoverable http error
         /// </summary>
         [TestMethod]
-        public void IngestionNotClosedOnRecoverableHttpError()
-        {
-            _mockIngestion.CallShouldSucceed = false;
-            _mockIngestion.TaskError = new RecoverableIngestionException();
-            _channel.EnqueueAsync(new TestLog()).RunNotAsync();
-
-            // wait for SendingLog event
-            _eventSemaphores[SendingLogSemaphoreIdx].Wait();
-            // wait up to 20 seconds for suspend to finish
-            bool disabled = WaitForChannelDisable(TimeSpan.FromSeconds(20));
-            Assert.IsTrue(disabled);
-            Assert.IsFalse(_mockIngestion.IsClosed);
+        public async Task RecoverableHttpError()
+        {
+            SetChannelWithTimeSpan(TimeSpan.Zero);
+
+            // Enqueue some log and and do not complete it
+            var call = new ServiceCall();
+            _mockIngestion
+                .Setup(ingestion => ingestion.Call(
+                    It.IsAny<string>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<IList<Log>>()))
+                .Returns((string appSecret, Guid installId, IList<Log> logs) => call);
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+            
+            // Next one will fail
+            SetupIngestionCallFail(new RecoverableIngestionException());
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+
+            // Wait up to 20 seconds for suspend to finish
+            VerifyChannelDisable(TimeSpan.FromSeconds(10));
+            _mockIngestion.Verify(ingestion => ingestion.Close(), Times.Never);
+            VerifyFailedToSendLog(0);
+            Assert.IsFalse(call.IsCompleted);
+            Assert.IsFalse(call.IsCanceled);
         }
 
         /// <summary>
-        /// Verify that if a non-recoverable http error occurs, ingestion is closed
+        /// Verify non-recoverable http error
         /// </summary>
         [TestMethod]
-        public void IngestionClosedOnNonRecoverableHttpError()
-        {
-            _mockIngestion.CallShouldSucceed = false;
-            _mockIngestion.TaskError = new NonRecoverableIngestionException();
-            _channel.EnqueueAsync(new TestLog()).RunNotAsync();
-
-            // wait up to 20 seconds for suspend to finish
-            bool disabled = WaitForChannelDisable(TimeSpan.FromSeconds(20));
-            Assert.IsTrue(disabled);
-
-            Assert.IsTrue(_mockIngestion.IsClosed);
-            Assert.IsFalse(_channel.IsEnabled);
+        public async Task NonRecoverableHttpError()
+        {
+            SetChannelWithTimeSpan(TimeSpan.Zero);
+
+            // Enqueue some log and and do not complete it
+            var call = new ServiceCall();
+            _mockIngestion
+                .Setup(ingestion => ingestion.Call(
+                    It.IsAny<string>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<IList<Log>>()))
+                .Returns((string appSecret, Guid installId, IList<Log> logs) => call);
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+            
+            // Next one will fail
+            SetupIngestionCallFail(new NonRecoverableIngestionException());
+            await _channel.EnqueueAsync(new TestLog());
+            VerifySendingLog(1);
+
+            // Wait up to 20 seconds for suspend to finish
+            VerifyChannelDisable(TimeSpan.FromSeconds(10));
+            _mockIngestion.Verify(ingestion => ingestion.Close(), Times.Never);
+            VerifyFailedToSendLog(2);
+
+            // The first call is canceled
+            await Assert.ThrowsExceptionAsync<TaskCanceledException>(() => call.ToTask());
         }
 
         private void SetChannelWithTimeSpan(TimeSpan timeSpan)
         {
-            if (TestContext.TestName != "ThrowStorageExceptionInDeleteLogsTime")
-            {
-                _storage = new MockStorage();
-                _channel = new Microsoft.AppCenter.Channel.Channel(ChannelName, MaxLogsPerBatch, timeSpan, MaxParallelBatches,
-                    _appSecret, _mockIngestion, _storage);
-                SetupEventCallbacks();
-            }
-            MakeIngestionCallsSucceed();
+            _storage = new MockStorage();
+            var appSecret = Guid.NewGuid().ToString();
+            _channel = new Channel(ChannelName, MaxLogsPerBatch, timeSpan, MaxParallelBatches,
+                appSecret, _mockIngestion.Object, _storage);
+            SetupEventCallbacks();
         }
 
         private void EnsureAllTasksAreFinishedInChannel()
@@ -402,25 +461,42 @@ private void EnsureAllTasksAreFinishedInChannel()
             catch (ObjectDisposedException) { }
         }
 
-        private void MakeIngestionCallsFail()
+        private void SetupIngestionCallFail(Exception exception)
         {
-            _mockIngestion.CallShouldSucceed = false;
+            _mockIngestion
+                .Setup(ingestion => ingestion.Call(
+                    It.IsAny<string>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<IList<Log>>()))
+                .Returns((string appSecret, Guid installId, IList<Log> logs) =>
+                {
+                    var call = new ServiceCall(appSecret, installId, logs);
+                    call.SetException(exception);
+                    return call;
+                });
         }
 
-        private void MakeIngestionCallsSucceed()
+        private void SetupIngestionCallSucceed(string result = "")
         {
-            _mockIngestion.CallShouldSucceed = true;
+            _mockIngestion
+                .Setup(ingestion => ingestion.Call(
+                    It.IsAny<string>(),
+                    It.IsAny<Guid>(),
+                    It.IsAny<IList<Log>>()))
+                .Returns((string appSecret, Guid installId, IList<Log> logs) =>
+                {
+                    var call = new ServiceCall(appSecret, installId, logs);
+                    call.SetResult(result);
+                    return call;
+                });
         }
 
         private void SetupEventCallbacks()
         {
-            foreach (var sem in _eventSemaphores)
+            _eventSemaphores = new List<SemaphoreSlim>
             {
-                if (sem.CurrentCount != 0)
-                {
-                    sem.Release(sem.CurrentCount);
-                }
-            }
+                new SemaphoreSlim(0), new SemaphoreSlim(0), new SemaphoreSlim(0), new SemaphoreSlim(0), new SemaphoreSlim(0)
+            };
             _channel.SendingLog += (sender, args) => { _eventSemaphores[SendingLogSemaphoreIdx].Release(); };
             _channel.SentLog += (sender, args) => { _eventSemaphores[SentLogSemaphoreIdx].Release(); };
             _channel.FailedToSendLog += (sender, args) => { _eventSemaphores[FailedToSendLogSemaphoreIdx].Release(); };
@@ -428,54 +504,47 @@ private void SetupEventCallbacks()
             _channel.FilteringLog += (sender, args) => { _eventSemaphores[FilteringLogSemaphoreIdx].Release(); };
         }
 
-        private bool FailedToSendLogOccurred(int numTimes, int waitTime = DefaultWaitTime)
-        {
-            return EventWithSemaphoreOccurred(_eventSemaphores[FailedToSendLogSemaphoreIdx], numTimes, waitTime);
-        }
+        private void VerifySendingLog(int expectedTimes) =>
+            Assert.AreEqual(expectedTimes, EventWithSemaphoreOccurred(_eventSemaphores[SendingLogSemaphoreIdx]),
+                $"Failed on verify {nameof(Channel.SendingLog)} event call times");
 
-        private bool EnqueuingLogOccurred(int numTimes, int waitTime = DefaultWaitTime)
-        {
-            return EventWithSemaphoreOccurred(_eventSemaphores[EnqueuingLogSemaphoreIdx], numTimes, waitTime);
-        }
+        private void VerifySentLog(int expectedTimes) =>
+            Assert.AreEqual(expectedTimes, EventWithSemaphoreOccurred(_eventSemaphores[SentLogSemaphoreIdx]),
+                $"Failed on verify {nameof(Channel.SentLog)} event call times");
 
-        private bool FilteringLogOccurred(int numTimes, int waitTime = DefaultWaitTime)
-        {
-            return EventWithSemaphoreOccurred(_eventSemaphores[FilteringLogSemaphoreIdx], numTimes, waitTime);
-        }
+        private void VerifyFailedToSendLog(int expectedTimes) =>
+            Assert.AreEqual(expectedTimes, EventWithSemaphoreOccurred(_eventSemaphores[FailedToSendLogSemaphoreIdx]),
+                $"Failed on verify {nameof(Channel.FailedToSendLog)} event call times");
 
-        private bool SentLogOccurred(int numTimes, int waitTime = DefaultWaitTime)
-        {
-            return EventWithSemaphoreOccurred(_eventSemaphores[SentLogSemaphoreIdx], numTimes, waitTime);
-        }
+        private void VerifyEnqueuingLog(int expectedTimes) =>
+            Assert.AreEqual(expectedTimes, EventWithSemaphoreOccurred(_eventSemaphores[EnqueuingLogSemaphoreIdx]),
+                $"Failed on verify {nameof(Channel.EnqueuingLog)} event call times");
 
-        private bool SendingLogOccurred(int numTimes, int waitTime = DefaultWaitTime)
-        {
-            return EventWithSemaphoreOccurred(_eventSemaphores[SendingLogSemaphoreIdx], numTimes, waitTime);
-        }
+        private void VerifyFilteringLog(int expectedTimes) =>
+            Assert.AreEqual(expectedTimes, EventWithSemaphoreOccurred(_eventSemaphores[FilteringLogSemaphoreIdx]),
+                $"Failed on verify {nameof(Channel.FilteringLog)} event call times");
 
-        private bool WaitForChannelDisable(TimeSpan timeout)
+        private void VerifyChannelDisable(TimeSpan timeout)
         {
             var task = Task.Run(async () =>
             {
                 while (_channel.IsEnabled)
                 {
-                    await Task.Delay(100);
+                    await Task.Delay(10);
                 }
             });
-
-            return task.Wait(timeout);
+            Assert.IsTrue(task.Wait(timeout));
         }
 
-        private static bool EventWithSemaphoreOccurred(SemaphoreSlim semaphore, int numTimes, int waitTime)
+        private static int EventWithSemaphoreOccurred(SemaphoreSlim semaphore)
         {
-            for (var i = 0; i < numTimes; ++i)
+            for (var i = 0;; ++i)
             {
-                if (!semaphore.Wait(waitTime))
+                if (!semaphore.Wait(i == 0 ? 1000 : 100))
                 {
-                    return false;
+                    return i;
                 }
             }
-            return true;
         }
     }
 }
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpExceptionTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionExceptionTest.cs
similarity index 95%
rename from Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpExceptionTest.cs
rename to Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionExceptionTest.cs
index e4366c226..d3350c8fe 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpExceptionTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionExceptionTest.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.AppCenter.Test.Windows.Ingestion.Http
 {
     [TestClass]
-    public class IngestionHttpExceptionTest
+    public class HttpIngestionExceptionTest
     {
         [TestMethod]
         public void IsRecoverablePropertyTest()
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionTest.cs
index ebed49280..979d5630b 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/HttpIngestionTest.cs
@@ -1,35 +1,47 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Http;
+using Microsoft.AppCenter.Ingestion.Models;
 using Moq;
+using Moq.Language.Flow;
 
-namespace Microsoft.AppCenter.Test.Ingestion.Http
+namespace Microsoft.AppCenter.Test.Windows.Ingestion.Http
 {
     public class HttpIngestionTest
     {
         protected Mock<IHttpNetworkAdapter> _adapter;
 
+        protected string AppSecret => Guid.NewGuid().ToString();
+        protected Guid InstallId => Guid.NewGuid();
+        protected IList<Log> Logs => new List<Log>();
+
         /// <summary>
         /// Helper for setup responce.
         /// </summary>
-        protected void SetupAdapterSendResponse(HttpStatusCode statusCode)
+        protected ISetup<IHttpNetworkAdapter, Task<string>> SetupAdapterSendResponse(params HttpStatusCode[] statusCodes)
         {
+            var index = 0;
             var setup = _adapter
-                .Setup(a => a.SendAsync(It.IsAny<string>(), "POST", It.IsAny<IDictionary<string, string>>(), It.IsAny<string>(),
+                .Setup(a => a.SendAsync(
+                    It.IsAny<string>(),
+                    "POST",
+                    It.IsAny<IDictionary<string, string>>(),
+                    It.IsAny<string>(),
                     It.IsAny<CancellationToken>()));
-            if (statusCode == HttpStatusCode.OK)
-            {
-                setup.Returns(Task.Run(() => ""));
-            }
-            else
+            setup.Returns(() =>
             {
-                setup.Throws(new HttpIngestionException("")
-                {
-                    StatusCode = (int)statusCode
-                });
-            }
+                var statusCode = statusCodes[index < statusCodes.Length ? index++ : statusCodes.Length - 1];
+                return statusCode == HttpStatusCode.OK
+                    ? TaskExtension.GetCompletedTask("")
+                    : TaskExtension.GetFaultedTask<string>(new HttpIngestionException("")
+                    {
+                        StatusCode = (int) statusCode
+                    });
+            });
+            return setup;
         }
 
         /// <summary>
@@ -38,7 +50,11 @@ protected void SetupAdapterSendResponse(HttpStatusCode statusCode)
         protected void VerifyAdapterSend(Times times)
         {
             _adapter
-                .Verify(a => a.SendAsync(It.IsAny<string>(), "POST", It.IsAny<IDictionary<string, string>>(), It.IsAny<string>(),
+                .Verify(a => a.SendAsync(
+                    It.IsAny<string>(),
+                    "POST",
+                    It.IsAny<IDictionary<string, string>>(),
+                    It.IsAny<string>(),
                     It.IsAny<CancellationToken>()), times);
         }
     }
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpTest.cs
index 44d7ed7a9..b0f047898 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/IngestionHttpTest.cs
@@ -1,35 +1,34 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Net;
-using Microsoft.AppCenter.Ingestion;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion.Http;
-using Microsoft.AppCenter.Ingestion.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
-namespace Microsoft.AppCenter.Test.Ingestion.Http
+namespace Microsoft.AppCenter.Test.Windows.Ingestion.Http
 {
     [TestClass]
     public class IngestionHttpTest : HttpIngestionTest
     {
-        private IngestionHttp _ingestionHttp;
+        private IngestionHttp _httpIngestion;
 
         [TestInitialize]
-        public void InitializeIngestionHttpTest()
+        public void InitializeHttpIngestionTest()
         {
             _adapter = new Mock<IHttpNetworkAdapter>();
-            _ingestionHttp = new IngestionHttp(_adapter.Object);
+            _httpIngestion = new IngestionHttp(_adapter.Object);
         }
 
         /// <summary>
         /// Verify that ingestion call http adapter and not fails on success.
         /// </summary>
         [TestMethod]
-        public void IngestionHttpStatusCodeOk()
+        public async Task HttpIngestionStatusCodeOk()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.OK);
-            _ingestionHttp.ExecuteCallAsync(call).RunNotAsync();
+            var call = _httpIngestion.Call(AppSecret, InstallId, Logs);
+            await call.ToTask();
             VerifyAdapterSend(Times.Once());
 
             // No throw any exception
@@ -39,11 +38,11 @@ public void IngestionHttpStatusCodeOk()
         /// Verify that ingestion throw exception on error response.
         /// </summary>
         [TestMethod]
-        public void IngestionHttpStatusCodeError()
+        public async Task HttpIngestionStatusCodeError()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.NotFound);
-            Assert.ThrowsException<HttpIngestionException>(() => _ingestionHttp.ExecuteCallAsync(call).RunNotAsync());
+            var call = _httpIngestion.Call(AppSecret, InstallId, Logs);
+            await Assert.ThrowsExceptionAsync<HttpIngestionException>(() => call.ToTask());
             VerifyAdapterSend(Times.Once());
         }
 
@@ -51,55 +50,35 @@ public void IngestionHttpStatusCodeError()
         /// Verify that ingestion don't call http adapter when call is closed.
         /// </summary>
         [TestMethod]
-        public void IngestionHttpCancel()
+        public async Task HttpIngestionCancel()
         {
-            var call = PrepareServiceCall();
+            _adapter
+                .Setup(a => a.SendAsync(
+                    It.IsAny<string>(),
+                    "POST",
+                    It.IsAny<IDictionary<string, string>>(),
+                    It.IsAny<string>(),
+                    It.IsAny<CancellationToken>()))
+                .Returns(async () =>
+                {
+                    await Task.Delay(500);
+                    return "";
+                });
+            var call = _httpIngestion.Call(AppSecret, InstallId, Logs);
             call.Cancel();
-            SetupAdapterSendResponse(HttpStatusCode.OK);
-            _ingestionHttp.ExecuteCallAsync(call).RunNotAsync();
-            VerifyAdapterSend(Times.Never());
-        }
-
-        /// <summary>
-        /// Verify that ingestion prepare ServiceCall correctly.
-        /// </summary>
-        [TestMethod]
-        public void IngestionHttpPrepareServiceCall()
-        {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var logs = new List<Log>();
-            var call = _ingestionHttp.PrepareServiceCall(appSecret, installId, logs);
-            Assert.IsInstanceOfType(call, typeof(HttpServiceCall));
-            Assert.AreEqual(call.Ingestion, _ingestionHttp);
-            Assert.AreEqual(call.AppSecret, appSecret);
-            Assert.AreEqual(call.InstallId, installId);
-            Assert.AreEqual(call.Logs, logs);
+            await Assert.ThrowsExceptionAsync<TaskCanceledException>(() => call.ToTask());
         }
 
         /// <summary>
         /// Verify that ingestion create headers correctly.
         /// </summary>
         [TestMethod]
-        public void IngestionHttpCreateHeaders()
+        public void HttpIngestionCreateHeaders()
         {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var headers = _ingestionHttp.CreateHeaders(appSecret, installId);
+            var headers = _httpIngestion.CreateHeaders(AppSecret, InstallId);
             
             Assert.IsTrue(headers.ContainsKey(IngestionHttp.AppSecret));
             Assert.IsTrue(headers.ContainsKey(IngestionHttp.InstallId));
         }
-
-        /// <summary>
-        /// Helper for prepare ServiceCall.
-        /// </summary>
-        private IServiceCall PrepareServiceCall()
-        {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var logs = new List<Log>();
-            return _ingestionHttp.PrepareServiceCall(appSecret, installId, logs);
-        }
     }
 }
\ No newline at end of file
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/NetworkStateTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/NetworkStateTest.cs
index 62bc7dff5..5aae82cce 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/NetworkStateTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/NetworkStateTest.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion;
 using Microsoft.AppCenter.Ingestion.Http;
-using Microsoft.AppCenter.Ingestion.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
-namespace Microsoft.AppCenter.Test.Ingestion.Http
+namespace Microsoft.AppCenter.Test.Windows.Ingestion.Http
 {
     [TestClass]
     public class NetworkStateTest : HttpIngestionTest
@@ -26,32 +26,16 @@ public void InitializeNetworkStateTest()
             _networkStateIngestion = new NetworkStateIngestion(httpIngestion, _networkState);
         }
 
-        /// <summary>
-        /// Verify that ingestion create ServiceCall correctly.
-        /// </summary>
-        [TestMethod]
-        public void NetworkStateIngestionPrepareServiceCall()
-        {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var logs = new List<Log>();
-            var call = _networkStateIngestion.PrepareServiceCall(appSecret, installId, logs);
-            Assert.IsInstanceOfType(call, typeof(NetworkStateServiceCall));
-            Assert.AreEqual(call.AppSecret, appSecret);
-            Assert.AreEqual(call.InstallId, installId);
-            Assert.AreEqual(call.Logs, logs);
-        }
-
         /// <summary>
         /// Verify that call executed when network is available.
         /// </summary>
         [TestMethod]
-        public void NetworkStateIngestionOnline()
+        public async Task NetworkStateIngestionOnlineAsync()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.OK);
             _networkState.IsConnected = true;
-            _networkStateIngestion.ExecuteCallAsync(call).RunNotAsync();
+            var call = _networkStateIngestion.Call(AppSecret, InstallId, Logs);
+            await call.ToTask();
             VerifyAdapterSend(Times.Once());
 
             // No throw any exception
@@ -61,15 +45,13 @@ public void NetworkStateIngestionOnline()
         /// Verify that call not executed when network is not available.
         /// </summary>
         [TestMethod]
-        public void NetworkStateIngestionOffline()
+        public async Task NetworkStateIngestionOffline()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.OK);
             _networkState.IsConnected = false;
-            var completedInTime = false;
-            _networkStateIngestion.ExecuteCallAsync(call).ContinueWith(task => completedInTime = true);
-            Task.Delay(TimeSpan.FromSeconds(5)).Wait();
-            Assert.IsFalse(completedInTime);
+            var call = _networkStateIngestion.Call(AppSecret, InstallId, Logs);
+            await Task.Delay(TimeSpan.FromSeconds(3));
+            Assert.IsFalse(call.IsCompleted);
             VerifyAdapterSend(Times.Never());
         }
 
@@ -77,15 +59,16 @@ public void NetworkStateIngestionOffline()
         /// Verify that call resent when network is available again.
         /// </summary>
         [TestMethod]
-        public void NetworkStateIngestionComeBackOnline()
+        public async Task NetworkStateIngestionComeBackOnline()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.OK);
             _networkState.IsConnected = false;
-            var task = _networkStateIngestion.ExecuteCallAsync(call);
+            var call = _networkStateIngestion.Call(AppSecret, InstallId, Logs);
+            await Task.Delay(TimeSpan.FromSeconds(3));
+            Assert.IsFalse(call.IsCompleted);
             VerifyAdapterSend(Times.Never());
             _networkState.IsConnected = true;
-            task.Wait();
+            await call.ToTask();
             VerifyAdapterSend(Times.Once());
         }
 
@@ -93,36 +76,22 @@ public void NetworkStateIngestionComeBackOnline()
         /// Verify that multiple calls are resent when network is available again.
         /// </summary>
         [TestMethod]
-        public void NetworkStateIngestionComeBackOnlineMultipleCalls()
+        public async Task NetworkStateIngestionComeBackOnlineMultipleCalls()
         {
-            int numCalls = 5;
-            var calls = new List<IServiceCall>();
-            for (int i = 0; i < numCalls; ++i)
-            {
-                calls.Add(PrepareServiceCall());
-            }
+            const int CallsCount = 5;
             SetupAdapterSendResponse(HttpStatusCode.OK);
             _networkState.IsConnected = false;
-
-            var tasks = new List<Task>();
-            foreach (var call in calls)
+            var calls = new List<IServiceCall>();
+            for (var i = 0; i < CallsCount; ++i)
             {
-                tasks.Add(_networkStateIngestion.ExecuteCallAsync(call));
+                calls.Add(_networkStateIngestion.Call(AppSecret, InstallId, Logs));
             }
+            await Task.Delay(TimeSpan.FromSeconds(3));
+            Assert.IsFalse(calls.Any(call => call.IsCompleted));
             _networkState.IsConnected = true;
-            Task.WaitAll(tasks.ToArray());
-            VerifyAdapterSend(Times.Exactly(numCalls));
-        }
-
-        /// <summary>
-        /// Helper for prepare ServiceCall.
-        /// </summary>
-        private IServiceCall PrepareServiceCall()
-        {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var logs = new List<Log>();
-            return _networkStateIngestion.PrepareServiceCall(appSecret, installId, logs);
+            await Task.WhenAll(calls.Select(call => call.ToTask()));
+            VerifyAdapterSend(Times.Exactly(CallsCount));
+            calls.ForEach(call => call.Dispose());
         }
     }
 }
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/RetryableTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/RetryableTest.cs
index d32725f1c..72f348a19 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/RetryableTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/RetryableTest.cs
@@ -1,64 +1,40 @@
 using System;
-using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AppCenter.Ingestion;
 using Microsoft.AppCenter.Ingestion.Http;
-using Microsoft.AppCenter.Ingestion.Models;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
-namespace Microsoft.AppCenter.Test.Ingestion.Http
+namespace Microsoft.AppCenter.Test.Windows.Ingestion.Http
 {
     [TestClass]
     public class RetryableTest : HttpIngestionTest
     {
-        private TestInterval[] _intervals;
+        private static readonly TimeSpan[] Intervals =
+        {
+            TimeSpan.FromSeconds(1),
+            TimeSpan.FromSeconds(1),
+            TimeSpan.FromSeconds(1) 
+        };
         private IIngestion _retryableIngestion;
 
         [TestInitialize]
         public void InitializeRetryableTest()
         {
             _adapter = new Mock<IHttpNetworkAdapter>();
-            _intervals = new[]
-            {
-                new TestInterval(),
-                new TestInterval(),
-                new TestInterval()
-            };
-            var retryIntervals = new Func<Task>[_intervals.Length];
-            for (int i = 0; i < _intervals.Length; i++)
-            {
-                retryIntervals[i] = _intervals[i].Wait;
-            }
-            _retryableIngestion = new RetryableIngestion(new IngestionHttp(_adapter.Object), retryIntervals);
-        }
-
-        /// <summary>
-        /// Verify that ingestion create ServiceCall correctly.
-        /// </summary>
-        [TestMethod]
-        public void RetryableIngestionPrepareServiceCall()
-        {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var logs = new List<Log>();
-            var call = _retryableIngestion.PrepareServiceCall(appSecret, installId, logs);
-            Assert.IsInstanceOfType(call, typeof(RetryableServiceCall));
-            Assert.AreEqual(call.AppSecret, appSecret);
-            Assert.AreEqual(call.InstallId, installId);
-            Assert.AreEqual(call.Logs, logs);
+            _retryableIngestion = new RetryableIngestion(new IngestionHttp(_adapter.Object), Intervals);
         }
 
         /// <summary>
         /// Verify behaviour without exceptions.
         /// </summary>
         [TestMethod]
-        public void RetryableIngestionSuccess()
+        public async Task RetryableIngestionSuccess()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.OK);
-            _retryableIngestion.ExecuteCallAsync(call).RunNotAsync();
+            var call = _retryableIngestion.Call(AppSecret, InstallId, Logs);
+            await call.ToTask();
             VerifyAdapterSend(Times.Once());
 
             // No throw any exception
@@ -68,23 +44,18 @@ public void RetryableIngestionSuccess()
         /// Verify that retrying on recoverable exceptions.
         /// </summary>
         [TestMethod]
-        public void RetryableIngestionRepeat1()
+        public async Task RetryableIngestionRepeat1()
         {
-            var call = PrepareServiceCall();
             // RequestTimeout - retryable
-            SetupAdapterSendResponse(HttpStatusCode.RequestTimeout);
-            // Run code after this interval immideatly
-            _intervals[0].Set();
-            // On first delay: replace response (next will be succeed)
-            _intervals[0].OnRequest += () => SetupAdapterSendResponse(HttpStatusCode.OK);
-            // Checks send times on N delay moment
-            _intervals[0].OnRequest += () => VerifyAdapterSend(Times.Once());
-            _intervals[1].OnRequest += () => Assert.Fail();
-
-            // Run all chain not async
-            _retryableIngestion.ExecuteCallAsync(call).RunNotAsync();
-
-            // Must be sent 2 times: 1 - main, 1 - repeat
+            SetupAdapterSendResponse(HttpStatusCode.RequestTimeout, HttpStatusCode.OK);
+            var start = DateTime.Now;
+            var call = _retryableIngestion.Call(AppSecret, InstallId, Logs);
+            await Task.Delay(start.AddSeconds(0.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
+            VerifyAdapterSend(Times.Exactly(1));
+
+            await Task.Delay(start.AddSeconds(1.5) - DateTime.Now);
+            Assert.IsTrue(call.IsCompleted);
             VerifyAdapterSend(Times.Exactly(2));
         }
 
@@ -92,26 +63,26 @@ public void RetryableIngestionRepeat1()
         /// Verify that retrying on recoverable exceptions.
         /// </summary>
         [TestMethod]
-        public void RetryableIngestionRepeat3()
+        public async Task RetryableIngestionRepeat3()
         {
-            var call = PrepareServiceCall();
             // RequestTimeout - retryable
-            SetupAdapterSendResponse(HttpStatusCode.RequestTimeout);
-            // Run code after this intervals immideatly
-            _intervals[0].Set();
-            _intervals[1].Set();
-            _intervals[2].Set();
-            // On third delay: replace response (next will be succeed)
-            _intervals[2].OnRequest += () => SetupAdapterSendResponse(HttpStatusCode.OK);
-            // Checks send times on N delay moment
-            _intervals[0].OnRequest += () => VerifyAdapterSend(Times.Once());
-            _intervals[1].OnRequest += () => VerifyAdapterSend(Times.Exactly(2));
-            _intervals[2].OnRequest += () => VerifyAdapterSend(Times.Exactly(3));
-
-            // Run all chain not async
-            _retryableIngestion.ExecuteCallAsync(call).RunNotAsync();
-
-            // Must be sent 4 times: 1 - main, 3 - repeat
+            SetupAdapterSendResponse(HttpStatusCode.RequestTimeout, HttpStatusCode.RequestTimeout, HttpStatusCode.RequestTimeout, HttpStatusCode.OK);
+            var start = DateTime.Now;
+            var call = _retryableIngestion.Call(AppSecret, InstallId, Logs);
+            await Task.Delay(start.AddSeconds(0.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
+            VerifyAdapterSend(Times.Exactly(1));
+
+            await Task.Delay(start.AddSeconds(1.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
+            VerifyAdapterSend(Times.Exactly(2));
+
+            await Task.Delay(start.AddSeconds(2.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
+            VerifyAdapterSend(Times.Exactly(3));
+
+            await Task.Delay(start.AddSeconds(3.5) - DateTime.Now);
+            Assert.IsTrue(call.IsCompleted);
             VerifyAdapterSend(Times.Exactly(4));
         }
 
@@ -119,108 +90,47 @@ public void RetryableIngestionRepeat3()
         /// Verify service call canceling.
         /// </summary>
         [TestMethod]
-        public void RetryableIngestionCancel()
+        public async Task RetryableIngestionCancel()
         {
-            var call = PrepareServiceCall();
             // RequestTimeout - retryable
             SetupAdapterSendResponse(HttpStatusCode.RequestTimeout);
-            // Run code after this intervals immideatly
-            _intervals[0].Set();
-            _intervals[1].Set();
-            // On second delay: cancel call
-            _intervals[1].OnRequest += () => call.Cancel();
-            // Checks send times on N delay moment
-            _intervals[0].OnRequest += () => VerifyAdapterSend(Times.Once());
-            _intervals[2].OnRequest += () => Assert.Fail();
-
-            // Run all chain not async
-            Assert.ThrowsException<IngestionException>(() => _retryableIngestion.ExecuteCallAsync(call).RunNotAsync());
-
-            // Must be sent 2 times: 1 - main, 1 - repeat
+            var start = DateTime.Now;
+            var call = _retryableIngestion.Call(AppSecret, InstallId, Logs);
+            await Task.Delay(start.AddSeconds(0.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
+            VerifyAdapterSend(Times.Exactly(1));
+
+            await Task.Delay(start.AddSeconds(1.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
+            VerifyAdapterSend(Times.Exactly(2));
+
+            call.Cancel();
+
+            await Task.Delay(start.AddSeconds(2.5) - DateTime.Now);
+            Assert.IsFalse(call.IsCompleted);
             VerifyAdapterSend(Times.Exactly(2));
+            await Assert.ThrowsExceptionAsync<TaskCanceledException>(() => call.ToTask());
         }
 
         /// <summary>
         /// Verify that not retrying not recoverable exceptions.
         /// </summary>
         [TestMethod]
-        public void RetryableIngestionException()
+        public async Task RetryableIngestionException()
         {
-            var call = PrepareServiceCall();
             SetupAdapterSendResponse(HttpStatusCode.BadRequest);
-            Assert.ThrowsException<HttpIngestionException>(() => _retryableIngestion.ExecuteCallAsync(call).RunNotAsync());
+            var call = _retryableIngestion.Call(AppSecret, InstallId, Logs);
+            await Assert.ThrowsExceptionAsync<HttpIngestionException>(() => call.ToTask());
             VerifyAdapterSend(Times.Once());
         }
 
-        [TestMethod]
-        public void ServiceCallSuccessCallbackTest()
-        {
-            SetupAdapterSendResponse(HttpStatusCode.OK);
-            var call = PrepareServiceCall();
-            call.ExecuteAsync().RunNotAsync();
-
-            // No throw any exception
-        }
-
-        [TestMethod]
-        public void ServiceCallFailedCallbackTest()
-        {
-            SetupAdapterSendResponse(HttpStatusCode.NotFound);
-            var call = PrepareServiceCall();
-            Assert.ThrowsException<HttpIngestionException>(() => { call.ExecuteAsync().RunNotAsync(); });
-        }
-
         /// <summary>
         /// Validate that constructor throws correct exception type with nullable timespan array
         /// </summary>
         [TestMethod]
         public void RetryableIngestionWithNullIntervals()
         {
-            TimeSpan[] timeSpans = null;
-            Assert.ThrowsException<ArgumentNullException>(() => { new RetryableIngestion(new IngestionHttp(_adapter.Object), timeSpans); });
-        }
-
-        /// <summary>
-        /// Validate that constructor throws correct exception type with nullable timespan array
-        /// </summary>
-        [TestMethod]
-        public void RetryableIngestionWithNullFunc()
-        {
-            Func<Task>[] funcs = null;
-            Assert.ThrowsException<ArgumentNullException>(() => { new RetryableIngestion(new IngestionHttp(_adapter.Object), funcs); });
-        }
-
-        /// <summary>
-        /// Validate that function doesn't throw any exception
-        /// </summary>
-        [TestMethod]
-        public void CallExecuteAsyncWhenCallIsNotOfTypeRetryableServiceCall()
-        {
-            var mockServiceCall = new Mock<IServiceCall>();
-            _retryableIngestion.ExecuteCallAsync(new TestServiceCall(mockServiceCall.Object));
-
-            // No throw any exception
-        }
-
-        /// <summary>
-        /// Helper for prepare ServiceCall.
-        /// </summary>
-        private IServiceCall PrepareServiceCall()
-        {
-            var appSecret = Guid.NewGuid().ToString();
-            var installId = Guid.NewGuid();
-            var logs = new List<Log>();
-            return _retryableIngestion.PrepareServiceCall(appSecret, installId, logs);
-        }
-
-        public class TestInterval
-        {
-            private volatile TaskCompletionSource<bool> _task = new TaskCompletionSource<bool>();
-
-            public event Action OnRequest;
-
-            public Task Wait() { OnRequest?.Invoke(); return _task.Task; }
-            public void Set() => _task.TrySetResult(true);
+            Assert.ThrowsException<ArgumentNullException>(() => new RetryableIngestion(new IngestionHttp(_adapter.Object), null));
         }
     }
 }
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/ServiceCallTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/ServiceCallTest.cs
deleted file mode 100644
index a201111e6..000000000
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/ServiceCallTest.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using Microsoft.AppCenter.Ingestion.Http;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Microsoft.AppCenter.Ingestion;
-
-namespace Microsoft.AppCenter.Test.Windows.Ingestion.Http
-{
-    [TestClass]
-    public class ServiceCallTest
-    {
-        private MockIngestion _ingestion;
-        private ServiceCall _serviceCall;
-
-        [TestInitialize]
-        public void InitializeServiceCallTest()
-        {
-            _ingestion = new MockIngestion();
-            _serviceCall = new MockServiceCall(_ingestion, null, string.Empty, Guid.NewGuid());
-        }
-
-        [TestMethod]
-        public void CheckSuccessCallback()
-        {
-            _ingestion.CallShouldSucceed = true;
-
-            _serviceCall.ExecuteAsync().RunNotAsync();
-        }
-
-        [TestMethod]
-        public void CheckUnsuccessCallback()
-        {
-            _ingestion.CallShouldSucceed = false;
-            Assert.ThrowsException<IngestionException>(() => _serviceCall.ExecuteAsync().RunNotAsync());
-        }
-    }
-}
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/TestServiceCall.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/TestServiceCall.cs
deleted file mode 100644
index ab34e4c3c..000000000
--- a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/Http/TestServiceCall.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Microsoft.AppCenter.Ingestion.Http
-{
-    public class TestServiceCall : ServiceCallDecorator
-    {
-        public TestServiceCall(IServiceCall decoratedApi) : base(decoratedApi)
-        {
-        }
-    }
-}
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/ServiceCallTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/ServiceCallTest.cs
new file mode 100644
index 000000000..7b0c84a97
--- /dev/null
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Ingestion/ServiceCallTest.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.AppCenter.Ingestion;
+using Microsoft.AppCenter.Ingestion.Models;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.AppCenter.Test.Windows.Ingestion
+{
+    [TestClass]
+    public class ServiceCallTest
+    {
+        private ServiceCall _serviceCall;
+
+        [TestInitialize]
+        public void InitializeServiceCallTest()
+        {
+            var appSecret = Guid.NewGuid().ToString();
+            var installId = Guid.NewGuid();
+            var logs = new List<Log>();
+            _serviceCall = new ServiceCall(appSecret, installId, logs);
+            Assert.AreEqual(appSecret, _serviceCall.AppSecret);
+            Assert.AreEqual(installId, _serviceCall.InstallId);
+            Assert.AreEqual(logs, _serviceCall.Logs);
+            Assert.IsFalse(_serviceCall.IsCompleted);
+            Assert.IsFalse(_serviceCall.IsCanceled);
+            Assert.IsFalse(_serviceCall.IsFaulted);
+        }
+
+        [TestMethod]
+        public void ServiceCallSucceeded()
+        {
+            var continueWith = 0;
+            _serviceCall.ContinueWith(serviceCall =>
+            {
+                Assert.AreEqual(_serviceCall, serviceCall);
+                Assert.IsTrue(serviceCall.IsCompleted);
+                continueWith++;
+            });
+            Assert.AreEqual(0, continueWith);
+            _serviceCall.SetResult("Test");
+            Assert.AreEqual(1, continueWith);
+            Assert.IsTrue(_serviceCall.IsCompleted);
+            Assert.IsFalse(_serviceCall.IsCanceled);
+            Assert.IsFalse(_serviceCall.IsFaulted);
+            Assert.AreEqual("Test", _serviceCall.Result);
+            Assert.IsNull(_serviceCall.Exception);
+
+            // Check copy state.
+            var copy = new ServiceCall();
+            copy.CopyState(_serviceCall);
+            Assert.IsTrue(copy.IsCompleted);
+            Assert.IsFalse(copy.IsCanceled);
+            Assert.IsFalse(copy.IsFaulted);
+            Assert.AreEqual("Test", copy.Result);
+            Assert.IsNull(copy.Exception);
+        }
+
+        [TestMethod]
+        public void ServiceCallFaulted()
+        {
+            var continueWith = 0;
+            var exeption = new CancellationException();
+            _serviceCall.ContinueWith(serviceCall =>
+            {
+                Assert.AreEqual(_serviceCall, serviceCall);
+                Assert.IsTrue(serviceCall.IsCompleted);
+                continueWith++;
+            });
+            Assert.AreEqual(0, continueWith);
+            _serviceCall.SetException(exeption);
+            Assert.AreEqual(1, continueWith);
+            Assert.IsTrue(_serviceCall.IsCompleted);
+            Assert.IsFalse(_serviceCall.IsCanceled);
+            Assert.IsTrue(_serviceCall.IsFaulted);
+            Assert.IsNull(_serviceCall.Result);
+            Assert.AreEqual(exeption, _serviceCall.Exception);
+
+            // Check copy state.
+            var copy = new ServiceCall();
+            copy.CopyState(_serviceCall);
+            Assert.IsTrue(copy.IsCompleted);
+            Assert.IsFalse(copy.IsCanceled);
+            Assert.IsTrue(copy.IsFaulted);
+            Assert.IsNull(copy.Result);
+            Assert.AreEqual(exeption, copy.Exception);
+        }
+
+        [TestMethod]
+        public void ServiceCallCanceled()
+        {
+            var continueWith = 0;
+            _serviceCall.ContinueWith(serviceCall =>
+            {
+                Assert.AreEqual(_serviceCall, serviceCall);
+                Assert.IsTrue(serviceCall.IsCanceled);
+                continueWith++;
+            });
+            Assert.AreEqual(0, continueWith);
+            _serviceCall.Cancel();
+            Assert.AreEqual(1, continueWith);
+            Assert.IsFalse(_serviceCall.IsCompleted);
+            Assert.IsTrue(_serviceCall.IsCanceled);
+            Assert.IsFalse(_serviceCall.IsFaulted);
+            Assert.IsNull(_serviceCall.Result);
+            Assert.IsNull(_serviceCall.Exception);
+
+            // Check copy state.
+            var copy = new ServiceCall();
+            copy.CopyState(_serviceCall);
+            Assert.IsFalse(copy.IsCompleted);
+            Assert.IsTrue(copy.IsCanceled);
+            Assert.IsFalse(copy.IsFaulted);
+            Assert.IsNull(copy.Result);
+            Assert.IsNull(copy.Exception);
+        }
+
+        [TestMethod]
+        public void ServiceCallContinueWith()
+        {
+            var continueWith1 = 0;
+            var continueWith2 = 0;
+            _serviceCall.ContinueWith(serviceCall =>
+            {
+                Assert.AreEqual(_serviceCall, serviceCall);
+                Assert.IsTrue(_serviceCall.IsCompleted);
+                continueWith1++;
+            });
+            Assert.AreEqual(0, continueWith1);
+            Assert.AreEqual(0, continueWith2);
+            _serviceCall.SetResult("Test");
+            Assert.AreEqual(1, continueWith1);
+            Assert.AreEqual(0, continueWith2);
+            _serviceCall.ContinueWith(serviceCall =>
+            {
+                Assert.AreEqual(_serviceCall, serviceCall);
+                Assert.IsTrue(_serviceCall.IsCompleted);
+                continueWith2++;
+            });
+            Assert.AreEqual(1, continueWith1);
+            Assert.AreEqual(1, continueWith2);
+        }
+
+        [TestMethod]
+        public void ServiceCallDisposed()
+        {
+            _serviceCall.Dispose();
+            Assert.ThrowsException<ObjectDisposedException>(() => _serviceCall.SetResult(""));
+            Assert.ThrowsException<ObjectDisposedException>(() => _serviceCall.SetException(new AppCenterException("")));
+            Assert.ThrowsException<ObjectDisposedException>(() => _serviceCall.ContinueWith(_ => {}));
+            Assert.ThrowsException<ObjectDisposedException>(() => _serviceCall.CopyState(new ServiceCall()));
+            Assert.ThrowsException<ObjectDisposedException>(() => _serviceCall.Cancel());
+        }
+    }
+}
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj b/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj
index dc519e5b2..7129103e5 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Microsoft.AppCenter.Test.Windows.csproj
@@ -104,12 +104,11 @@
     <Compile Include="IngestionExceptions.cs" />
     <Compile Include="Ingestion\Http\HttpIngestionTest.cs" />
     <Compile Include="Ingestion\Http\HttpNetworkAdapterTest.cs" />
-    <Compile Include="Ingestion\Http\IngestionHttpExceptionTest.cs" />
+    <Compile Include="Ingestion\Http\HttpIngestionExceptionTest.cs" />
     <Compile Include="Ingestion\Http\IngestionHttpTest.cs" />
     <Compile Include="Ingestion\Http\NetworkStateTest.cs" />
     <Compile Include="Ingestion\Http\RetryableTest.cs" />
-    <Compile Include="Ingestion\Http\ServiceCallTest.cs" />
-    <Compile Include="Ingestion\Http\TestServiceCall.cs" />
+    <Compile Include="Ingestion\ServiceCallTest.cs" />
     <Compile Include="Ingestion\IngestionExceptionTest.cs" />
     <Compile Include="Ingestion\Models\CustomPropertiesLogTest.cs" />
     <Compile Include="Ingestion\Models\JsonLogConverterTest.cs" />
@@ -120,7 +119,6 @@
     <Compile Include="Ingestion\Models\DeviceTest.cs" />
     <Compile Include="AppCenterServiceTest.cs" />
     <Compile Include="AppCenterTest.cs" />
-    <Compile Include="MockIngestion.cs" />
     <Compile Include="MockAppCenterService.cs" />
     <Compile Include="Storage\FakeStorageTest.cs" />
     <Compile Include="Storage\MockStorage.cs" />
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/MockIngestion.cs b/Tests/Microsoft.AppCenter.Test.Windows/MockIngestion.cs
deleted file mode 100644
index 459a071ca..000000000
--- a/Tests/Microsoft.AppCenter.Test.Windows/MockIngestion.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AppCenter.Ingestion;
-using Microsoft.AppCenter.Ingestion.Http;
-using Microsoft.AppCenter.Ingestion.Models;
-
-namespace Microsoft.AppCenter.Test
-{
-    public sealed class MockIngestion : IIngestion
-    {
-
-        public bool CallShouldSucceed { get; set; }
-        public bool CloseShouldSucceed { get; set; }
-        public bool IsClosed { get; set; }
-        public Exception TaskError = new IngestionException();
-
-        public MockIngestion()
-        {
-            CallShouldSucceed = CloseShouldSucceed = true;
-            IsClosed = false;
-        }
-
-        public IServiceCall PrepareServiceCall(string appSecret, Guid installId, IList<Log> logs)
-        {
-            return new MockServiceCall(this, logs, appSecret, installId);
-        }
-
-        public Task ExecuteCallAsync(IServiceCall call)
-        {
-            return CallShouldSucceed ? TaskExtension.GetCompletedTask() : TaskExtension.GetFaultedTask(TaskError);
-        }
-
-        public void Close()
-        {
-            if (!CloseShouldSucceed)
-            {
-                throw new IngestionException();
-            }
-            IsClosed = true;
-        }
-
-        public void Open()
-        {
-            IsClosed = false;
-        }
-
-        public void SetLogUrl(string logUrl)
-        {
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-
-    public class MockServiceCall : ServiceCall
-    {
-        public MockServiceCall(IIngestion ingestion, IList<Log> logs, string appSecret, Guid installId) : base(ingestion, logs, appSecret, installId)
-        {
-        }
-    }
-}
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs
index aa77ecb54..02a069515 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
-[assembly: AssemblyInformationalVersion("1.5.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyInformationalVersion("1.6.0-SNAPSHOT")]
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Storage/FakeStorageTest.cs b/Tests/Microsoft.AppCenter.Test.Windows/Storage/FakeStorageTest.cs
index 5e27b080e..9fae60f9d 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Storage/FakeStorageTest.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Storage/FakeStorageTest.cs
@@ -85,7 +85,7 @@ public void GetLogsQueryError()
             var mockAdapter = new Mock<IStorageAdapter>();
             mockAdapter.Setup(
                     a => a.GetAsync(It.IsAny<PredType>(), It.IsAny<int>()))
-                .Throws(new StorageException());
+                .Returns(TaskExtension.GetFaultedTask<List<Microsoft.AppCenter.Storage.Storage.LogEntry>>(new StorageException()));
             var fakeStorage = new Microsoft.AppCenter.Storage.Storage(mockAdapter.Object);
             var logs = new List<Log>();
             Assert.ThrowsException<StorageException>(() =>
@@ -101,13 +101,13 @@ public void StorageThrowsStorageException()
             var mockAdapter = new Mock<IStorageAdapter>();
             mockAdapter.Setup(
                     a => a.GetAsync(It.IsAny<PredType>(), It.IsAny<int>()))
-                .Throws(new StorageException());
+                .Returns(TaskExtension.GetFaultedTask<List<Microsoft.AppCenter.Storage.Storage.LogEntry>>(new StorageException()));
             mockAdapter.Setup(c => c.InsertAsync(It.IsAny<Microsoft.AppCenter.Storage.Storage.LogEntry>()))
-                .Throws(new StorageException());
+                .Returns(TaskExtension.GetFaultedTask<int>(new StorageException()));
             mockAdapter.Setup(c => c.DeleteAsync(It.IsAny<Expression<Func<Microsoft.AppCenter.Storage.Storage.LogEntry, bool>>>()))
-                .Throws(new StorageException());
+                .Returns(TaskExtension.GetFaultedTask<int>(new StorageException()));
             mockAdapter.Setup(c => c.CountAsync(It.IsAny<Expression<Func<Microsoft.AppCenter.Storage.Storage.LogEntry, bool>>>()))
-                .Throws(new StorageException());
+                .Returns(TaskExtension.GetFaultedTask<int>(new StorageException()));
             var fakeStorage = new Microsoft.AppCenter.Storage.Storage(mockAdapter.Object);
 
             Assert.ThrowsException<StorageException>(() => fakeStorage.PutLog("channel_name", new TestLog()).RunNotAsync());
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/Storage/MockStorage.cs b/Tests/Microsoft.AppCenter.Test.Windows/Storage/MockStorage.cs
index f22bcfcca..c20594673 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/Storage/MockStorage.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/Storage/MockStorage.cs
@@ -63,8 +63,11 @@ public Task<string> GetLogsAsync(string channelName, int limit, List<Log> logs)
         {
             lock (this)
             {
+                var pending = _pending.SelectMany(i => i.Value).ToList();
                 var batchId = Guid.NewGuid().ToString();
-                var batch = this[channelName].Take(limit).ToList();
+                var batch = this[channelName]
+                    .Where(log => !pending.Contains(log))
+                    .Take(limit).ToList();
                 _pending.Add(batchId, batch);
                 logs?.Clear();
                 logs?.AddRange(batch);
diff --git a/Tests/Microsoft.AppCenter.Test.Windows/TaskExtension.cs b/Tests/Microsoft.AppCenter.Test.Windows/TaskExtension.cs
index 836e013eb..df3af1fd6 100644
--- a/Tests/Microsoft.AppCenter.Test.Windows/TaskExtension.cs
+++ b/Tests/Microsoft.AppCenter.Test.Windows/TaskExtension.cs
@@ -8,69 +8,72 @@ public static class TaskExtension
     {
         public static T RunNotAsync<T>(this Task<T> @this)
         {
-            try
-            {
-                @this.Wait();
-            }
-            catch (AggregateException e)
-            {
-                throw e.InnerException;
-            }
-            return @this.Result;
+            return @this.GetAwaiter().GetResult();
         }
+
         public static void RunNotAsync(this Task @this)
         {
-            try
-            {
-                @this.Wait();
-            }
-            catch (AggregateException e)
-            {
-                throw e.InnerException;
-            }
+            @this.GetAwaiter().GetResult();
         }
 
         public static Task GetCompletedTask()
         {
-            var completedTask = Task.Delay(0);
-            completedTask.Wait();
-            return completedTask;
+            return Task.FromResult(false);
         }
 
         public static Task GetFaultedTask(Exception e)
         {
-            Task task = null;
+            var task = Task.Factory.StartNew(() => throw e);
             try
             {
-                task = Task.Factory.StartNew(() => { throw e; });
                 task.Wait();
             }
-            catch (Exception)
+            catch
             {
-
+                // ignored
             }
+
             return task;
         }
 
         public static Task<T> GetCompletedTask<T>(T retVal)
         {
-            var completedTask = Task<T>.Factory.StartNew(() => retVal);
-            completedTask.Wait();
-            return completedTask;
+            return Task.FromResult(retVal);
         }
 
-        public static Task<T> GetFaultedTask<T>(T retVal)
+        public static Task<T> GetFaultedTask<T>(Exception exception)
         {
-            var task = Task.Factory.StartNew<T>(() => { throw new IngestionException(); });
+            var task = Task.Factory.StartNew<T>(() => throw exception);
             try
             {
                 task.Wait();
             }
-            catch (Exception)
+            catch
             {
-
+                // ignored
             }
             return task;
         }
+        
+        public static Task<string> ToTask(this IServiceCall @this)
+        {
+            var source = new TaskCompletionSource<string>();
+            @this.ContinueWith(serviceCall =>
+            {
+                if (serviceCall.IsCanceled)
+                {
+                    source.SetCanceled();
+                }
+                else if (serviceCall.IsFaulted)
+                {
+                    source.SetException(serviceCall.Exception);
+                }
+                else
+                {
+                    source.SetResult(serviceCall.Result);
+                }
+            });
+            return source.Task;
+        }
     }
 }
diff --git a/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs b/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs
index 42a46c1ff..990f6e5b8 100644
--- a/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.AppCenter.Test.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -17,4 +17,4 @@
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Tests/iOS/Info.plist b/Tests/iOS/Info.plist
index da90dc536..0453fe3e3 100644
--- a/Tests/iOS/Info.plist
+++ b/Tests/iOS/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.contoso.contoso-forms-test</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/nuget/AppCenter.nuspec b/nuget/AppCenter.nuspec
index 342001dbe..16b37f7e6 100644
--- a/nuget/AppCenter.nuspec
+++ b/nuget/AppCenter.nuspec
@@ -13,14 +13,14 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <group targetFramework="uap10.0">
         <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.2.2"/>
         <dependency id="Newtonsoft.Json" version="6.0.1"/>
         <dependency id="sqlite-net-pcl" version="1.3.1"/>
       </group>
-      <group targetFramework="net452">
+      <group targetFramework="net45">
         <dependency id="Newtonsoft.Json" version="6.0.1"/>
         <dependency id="sqlite-net-pcl" version="1.3.1"/>
       </group>
@@ -54,6 +54,6 @@
 
     <!-- Windows Classic Desktop (WPF and WinForms) -->
     <!-- TODO: Uncomment when it's time to release these. -->
-    <!--file src="$windows_desktop_dir$/Microsoft.AppCenter.dll" target="lib/net452" /-->
+    <!--file src="$windows_desktop_dir$/Microsoft.AppCenter.dll" target="lib/net45" /-->
   </files>
 </package>
diff --git a/nuget/AppCenterAnalytics.nuspec b/nuget/AppCenterAnalytics.nuspec
index 01ac9d6c4..33638d89b 100644
--- a/nuget/AppCenterAnalytics.nuspec
+++ b/nuget/AppCenterAnalytics.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
@@ -40,7 +40,7 @@
 
     <!-- Windows Classic (WPF and WinForms) -->
     <!-- TODO: Uncomment when it's time to release these. -->
-    <!-- file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net452" / -->
+    <!-- file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net45" / -->
 
   </files>
 </package>
diff --git a/nuget/AppCenterCrashes.nuspec b/nuget/AppCenterCrashes.nuspec
index fccd0ce15..1f72a3dc3 100644
--- a/nuget/AppCenterCrashes.nuspec
+++ b/nuget/AppCenterCrashes.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
@@ -37,13 +37,13 @@
 
     <!-- WindowsDesktop (WPF and WinForms) -->
     <!-- TODO: Uncomment when it's time to release these. -->
-    <!-- file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net452" /-->
+    <!-- file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net45" /-->
 
     <!-- UWP -->
     <!-- targets files add correct references to proper platforms -->
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.targets" target="build/uap10.0"/>
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.dll" target="ref/uap10.0" />
-    
+
     <!--x86 -->
     <file src="$uwp_dir$/x86/Microsoft.AppCenter.Crashes.dll" target="runtimes/win10-x86/lib/uap10.0" />
     <file src="$uwp_dir$/x86/WatsonRegistrationUtility.dll"  target="runtimes/win10-x86/native"/>
diff --git a/nuget/AppCenterDistribute.nuspec b/nuget/AppCenterDistribute.nuspec
index bebafe580..3338ba71e 100644
--- a/nuget/AppCenterDistribute.nuspec
+++ b/nuget/AppCenterDistribute.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/AppCenterPush.nuspec b/nuget/AppCenterPush.nuspec
index 3015e1e48..17b148a3e 100644
--- a/nuget/AppCenterPush.nuspec
+++ b/nuget/AppCenterPush.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/AppCenterRum.nuspec b/nuget/AppCenterRum.nuspec
index ec95809b9..ca3467de9 100644
--- a/nuget/AppCenterRum.nuspec
+++ b/nuget/AppCenterRum.nuspec
@@ -11,7 +11,7 @@
     <tags>mobilecenter</tags>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/MacAppCenter.nuspec b/nuget/MacAppCenter.nuspec
index db232c62a..179f53f12 100644
--- a/nuget/MacAppCenter.nuspec
+++ b/nuget/MacAppCenter.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
         <!-- Use dependency groups for iOS and Android so that additional dependencies aren't added to them -->
         <group targetFramework="MonoAndroid403">
diff --git a/nuget/MacAppCenterAnalytics.nuspec b/nuget/MacAppCenterAnalytics.nuspec
index 1df08b375..e5d8c86ad 100644
--- a/nuget/MacAppCenterAnalytics.nuspec
+++ b/nuget/MacAppCenterAnalytics.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/MacAppCenterCrashes.nuspec b/nuget/MacAppCenterCrashes.nuspec
index 1c8951858..7f8a48b3c 100644
--- a/nuget/MacAppCenterCrashes.nuspec
+++ b/nuget/MacAppCenterCrashes.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/MacAppCenterDistribute.nuspec b/nuget/MacAppCenterDistribute.nuspec
index 4b14c413f..0ed6b7fcf 100644
--- a/nuget/MacAppCenterDistribute.nuspec
+++ b/nuget/MacAppCenterDistribute.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/MacAppCenterPush.nuspec b/nuget/MacAppCenterPush.nuspec
index 80a4dec3e..8bd64fb36 100644
--- a/nuget/MacAppCenterPush.nuspec
+++ b/nuget/MacAppCenterPush.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/MacAppCenterRum.nuspec b/nuget/MacAppCenterRum.nuspec
index 9d455200f..b26c672e7 100644
--- a/nuget/MacAppCenterRum.nuspec
+++ b/nuget/MacAppCenterRum.nuspec
@@ -11,7 +11,7 @@
     <tags>mobilecenter</tags>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/WindowsAppCenter.nuspec b/nuget/WindowsAppCenter.nuspec
index 2b9dfc9e7..e25e8de36 100644
--- a/nuget/WindowsAppCenter.nuspec
+++ b/nuget/WindowsAppCenter.nuspec
@@ -13,14 +13,14 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <group targetFramework="uap10.0">
         <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.2.2"/>
         <dependency id="Newtonsoft.Json" version="6.0.1"/>
         <dependency id="sqlite-net-pcl" version="1.3.1"/>
       </group>
-      <group targetFramework="net452">
+      <group targetFramework="net45">
         <dependency id="Newtonsoft.Json" version="6.0.1"/>
         <dependency id="sqlite-net-pcl" version="1.3.1"/>
       </group>
@@ -28,8 +28,8 @@
   </metadata>
   <files>
     <file src="$uwp_dir$/Microsoft.AppCenter.dll" target="lib/uap10.0" />
-      
+
     <!-- TODO: Uncomment when it's time to release these. -->
-    <!-- file src="$windows_desktop_dir$/Microsoft.AppCenter.dll" target="lib/net452" /-->
+    <!-- file src="$windows_desktop_dir$/Microsoft.AppCenter.dll" target="lib/net45" /-->
   </files>
 </package>
diff --git a/nuget/WindowsAppCenterAnalytics.nuspec b/nuget/WindowsAppCenterAnalytics.nuspec
index 8387f53de..984584b38 100644
--- a/nuget/WindowsAppCenterAnalytics.nuspec
+++ b/nuget/WindowsAppCenterAnalytics.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
@@ -22,6 +22,6 @@
     <file src="$uwp_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/uap10.0" />
 
     <!-- TODO: Uncomment when it's time to release these. -->
-    <!--file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net452" /-->
+    <!--file src="$windows_desktop_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net45" /-->
   </files>
 </package>
diff --git a/nuget/WindowsAppCenterCrashes.nuspec b/nuget/WindowsAppCenterCrashes.nuspec
index 4a8f22b37..5138069dc 100644
--- a/nuget/WindowsAppCenterCrashes.nuspec
+++ b/nuget/WindowsAppCenterCrashes.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
@@ -22,13 +22,13 @@
 
     <!-- WinForms -->
     <!-- TODO: Uncomment when it's time to release these. -->
-    <!--file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net452" /-->
+    <!--file src="$windows_desktop_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net45" /-->
 
     <!-- UWP -->
     <!-- targets files add correct references to proper platforms -->
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.targets" target="build/uap10.0" />
     <file src="$uwp_dir$/Microsoft.AppCenter.Crashes.dll" target="ref/uap10.0" />
-    
+
     <!--x86 -->
     <file src="$uwp_dir$/x86/Microsoft.AppCenter.Crashes.dll" target="runtimes/win10-x86/lib/uap10.0" />
     <file src="$uwp_dir$/x86/WatsonRegistrationUtility.dll" target="runtimes/win10-x86/native"/>
diff --git a/nuget/WindowsAppCenterPush.nuspec b/nuget/WindowsAppCenterPush.nuspec
index a8dff35f9..746a0098b 100644
--- a/nuget/WindowsAppCenterPush.nuspec
+++ b/nuget/WindowsAppCenterPush.nuspec
@@ -13,7 +13,7 @@
     <language>en-US</language>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/nuget/WindowsAppCenterRum.nuspec b/nuget/WindowsAppCenterRum.nuspec
index 483b77a8a..e5d523fec 100644
--- a/nuget/WindowsAppCenterRum.nuspec
+++ b/nuget/WindowsAppCenterRum.nuspec
@@ -11,7 +11,7 @@
     <tags>mobilecenter</tags>
     <projectUrl>https://aka.ms/telgml</projectUrl>
     <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
-    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <iconUrl>https://aka.ms/k76877</iconUrl>
     <dependencies>
       <dependency id="Microsoft.AppCenter" version="$version$" />
     </dependencies>
diff --git a/scripts/configuration/ac-build-config.xml b/scripts/configuration/ac-build-config.xml
index 97dc810d7..7be4ac363 100644
--- a/scripts/configuration/ac-build-config.xml
+++ b/scripts/configuration/ac-build-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <config>
     <sdkInfo>
-        <sdkVersion>1.5.0-SNAPSHOT</sdkVersion>
-        <iosVersion>1.5.0</iosVersion>
-        <androidVersion>1.4.0</androidVersion>
+        <sdkVersion>1.6.0-SNAPSHOT</sdkVersion>
+        <iosVersion>1.6.0</iosVersion>
+        <androidVersion>1.5.0</androidVersion>
     </sdkInfo>
     <group id="ios" folder="iOSAssemblies" buildGroup="mac">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.iOS/bin/Release/Microsoft.AppCenter.dll"/>