Skip to content

Commit

Permalink
Merge pull request #1127 from microsoft/develop
Browse files Browse the repository at this point in the history
Version 2.4.0-preview
  • Loading branch information
Cloudwu1 authored Sep 25, 2019
2 parents e1b98bb + 93d7056 commit 2fa4594
Show file tree
Hide file tree
Showing 123 changed files with 896 additions and 606 deletions.
4 changes: 2 additions & 2 deletions Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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="59" android:versionName="2.2.2-SNAPSHOT" android:installLocation="auto">
<?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="61" android:versionName="2.3.1-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" />
Expand Down
4 changes: 2 additions & 2 deletions Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.2.2.0")]
[assembly: AssemblyInformationalVersion("2.2.2-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.3.1.0")]
[assembly: AssemblyInformationalVersion("2.3.1-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Microsoft.AppCenter.Crashes;
using Xamarin.Forms;
using System.Linq;
using System.Threading.Tasks;

namespace Contoso.Forms.Demo
{
Expand Down Expand Up @@ -261,8 +262,15 @@ void ClearCrashUserConfirmation(object sender, EventArgs e)

void MemoryWarningTrigger(object sender, EventArgs e)
{
var blockSize = 128 * 1024 * 1024;
byte[] a = Enumerable.Repeat((byte)blockSize, int.MaxValue).ToArray();
Task.Run(() =>
{
var blockSize = 128 * 1024 * 1024;
var byteArrays = new List<IEnumerable<byte>>();
while (true)
{
byteArrays.Add(Enumerable.Repeat((byte)blockSize, 10000000));
}
});
}
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="60" android:versionName="2.2.2-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="62" android:versionName="2.3.1-SNAPSHOT" package="com.microsoft.appcenter.xamarin.forms.puppet">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<application android:label="ACFPuppet">
<activity android:name="com.microsoft.identity.client.BrowserTabActivity">
<intent-filter>
Expand All @@ -9,6 +9,12 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="auth" android:scheme="msalbff0949b-7970-439d-9745-92cdc59b10fe" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:host="auth" android:scheme="msal9c77fb6e-7fff-4ae9-ac18-46c0041a6355" />
</intent-filter>
</activity>
<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />
<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver" android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.2.2.0")]
[assembly: AssemblyInformationalVersion("2.2.2-SNAPSHOT")]
[assembly: AssemblyFileVersion("2.3.1.0")]
[assembly: AssemblyInformationalVersion("2.3.1-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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,55 @@
<packages>
<package id="GoogleGson" version="2.8.5" targetFramework="monoandroid81" />
<package id="HockeySDK.Xamarin" version="5.2.0" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.CustomTabs" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Design" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Transition" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v4" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Collections" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CustomTabs" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CustomView" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Design" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DocumentFile" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Interpolator" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Loader" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Print" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Transition" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v4" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Build.Download" version="0.4.11" targetFramework="monoandroid81" />
<package id="Xamarin.Firebase.Common" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.Firebase.Iid" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.Firebase.Messaging" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.Forms" version="4.1.0.581479" targetFramework="monoandroid81" />
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.1" targetFramework="monoandroid81" />
<package id="Xamarin.Firebase.Common" version="71.1610.0" targetFramework="monoandroid90" />
<package id="Xamarin.Firebase.Iid" version="71.1710.0" targetFramework="monoandroid90" />
<package id="Xamarin.Firebase.Iid.Interop" version="71.1601.0" targetFramework="monoandroid90" />
<package id="Xamarin.Firebase.Measurement.Connector" version="71.1701.0" targetFramework="monoandroid90" />
<package id="Xamarin.Firebase.Messaging" version="71.1740.0" targetFramework="monoandroid90" />
<package id="Xamarin.Forms" version="4.1.0.581479" targetFramework="monoandroid90" />
<package id="Xamarin.Google.AutoValue.Annotations" version="1.6.5" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Base" version="71.1610.0" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Basement" version="71.1620.0" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Stats" version="71.1601.0" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Tasks" version="71.1601.0" targetFramework="monoandroid90" />
</packages>
Original file line number Diff line number Diff line change
@@ -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="2.2.2.0" />
<Identity Name="10805zumoTestUser.AppCenter-Contoso.Forms.Puppet.U" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="2.3.1.0" />
<mp:PhoneIdentity PhoneProductId="55497ed8-b2ac-4485-ba79-e2b65bb720ed" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>AppCenter-Contoso.Forms.Puppet.UWP</DisplayName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("2.2.2.0")]
[assembly: AssemblyFileVersion("2.3.1.0")]
[assembly: ComVisible(false)]
4 changes: 2 additions & 2 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<key>CFBundleIdentifier</key>
<string>com.microsoft.appcenter.xamarin.forms.puppet</string>
<key>CFBundleShortVersionString</key>
<string>2.2.2</string>
<string>2.3.1</string>
<key>CFBundleVersion</key>
<string>2.2.2</string>
<string>2.3.1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
Expand Down
86 changes: 34 additions & 52 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using System.Linq;
using System.Threading.Tasks;
using Xamarin.Forms;
using XamarinDevice = Xamarin.Forms.Device;

namespace Contoso.Forms.Puppet
{
Expand All @@ -25,10 +26,21 @@ public partial class App
{
public const string LogTag = "AppCenterXamarinPuppet";

// App Center keys
const string UwpKey = "a678b499-1912-4a94-9d97-25b569284d3a";
const string AndroidKey = "bff0949b-7970-439d-9745-92cdc59b10fe";
const string IosKey = "b889c4f2-9ac2-4e2e-ae16-dae54f2c5899";
// App Center B2C secrets
static readonly IReadOnlyDictionary<string, string> B2CAuthAppSecrets = new Dictionary<string, string>
{
{ XamarinDevice.UWP, "a678b499-1912-4a94-9d97-25b569284d3a" }, // same for all devices
{ XamarinDevice.Android, "bff0949b-7970-439d-9745-92cdc59b10fe" },
{ XamarinDevice.iOS, "b889c4f2-9ac2-4e2e-ae16-dae54f2c5899" }
};

// App Center AAD secrets
static readonly IReadOnlyDictionary<string, string> AADAuthAppSecrets = new Dictionary<string, string>
{
{ XamarinDevice.UWP, "a678b499-1912-4a94-9d97-25b569284d3a" }, // same for all devices
{ XamarinDevice.Android, "9c77fb6e-7fff-4ae9-ac18-46c0041a6355" },
{ XamarinDevice.iOS, "4ca276ee-9a50-4ad6-9746-50c420f9df88" }
};

public App()
{
Expand Down Expand Up @@ -64,7 +76,9 @@ protected override void OnStart()
Distribute.SetApiUrl("https://api-gateway-core-integration.dev.avalanch.es/v0.1");
Auth.SetConfigUrl("https://config-integration.dev.avalanch.es");
Data.SetTokenExchangeUrl("https://token-exchange-mbaas-integration.dev.avalanch.es/v0.1");
AppCenter.Start($"uwp={UwpKey};android={AndroidKey};ios={IosKey}", typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Auth), typeof(Data));

var appSecrets = GetAppSecretDictionary();
AppCenter.Start($"uwp={appSecrets[XamarinDevice.UWP]};android={appSecrets[XamarinDevice.Android]};ios={appSecrets[XamarinDevice.iOS]}", typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Auth), typeof(Data));
if (Current.Properties.ContainsKey(Constants.UserId) && Current.Properties[Constants.UserId] is string id)
{
AppCenter.SetUserId(id);
Expand All @@ -87,11 +101,25 @@ protected override void OnStart()
});
Crashes.GetLastSessionCrashReportAsync().ContinueWith(task =>
{
AppCenterLog.Info(LogTag, "Crashes.LastSessionCrashReport.Exception=" + task.Result?.Exception);
AppCenterLog.Info(LogTag, "Crashes.LastSessionCrashReport.StackTrace=" + task.Result?.StackTrace);
});
}
}

static IReadOnlyDictionary<string, string> GetAppSecretDictionary()
{
// If user has selected another Auth Type, override the secret dictionary accordingly.
var persistedAuthType = AuthTypeUtils.GetPersistedAuthType();
switch (persistedAuthType)
{
case AuthType.AAD:
return AADAuthAppSecrets;
case AuthType.B2C:
default:
return B2CAuthAppSecrets;
}
}

static void PrintNotification(object sender, PushNotificationReceivedEventArgs e)
{
Xamarin.Forms.Device.BeginInvokeOnMainThread(() =>
Expand All @@ -108,62 +136,16 @@ static void PrintNotification(object sender, PushNotificationReceivedEventArgs e
static void SendingErrorReportHandler(object sender, SendingErrorReportEventArgs e)
{
AppCenterLog.Info(LogTag, "Sending error report");

var report = e.Report;

// Test some values
if (report.Exception != null)
{
AppCenterLog.Info(LogTag, report.Exception.ToString());
}
else if (report.AndroidDetails != null)
{
AppCenterLog.Info(LogTag, report.AndroidDetails.ThreadName);
}
}

static void SentErrorReportHandler(object sender, SentErrorReportEventArgs e)
{
AppCenterLog.Info(LogTag, "Sent error report");

var report = e.Report;

// Test some values
if (report.Exception != null)
{
AppCenterLog.Info(LogTag, report.Exception.ToString());
}
else
{
AppCenterLog.Info(LogTag, "No system exception was found");
}

if (report.AndroidDetails != null)
{
AppCenterLog.Info(LogTag, report.AndroidDetails.ThreadName);
}
}

static void FailedToSendErrorReportHandler(object sender, FailedToSendErrorReportEventArgs e)
{
AppCenterLog.Info(LogTag, "Failed to send error report");

var report = e.Report;

// Test some values
if (report.Exception != null)
{
AppCenterLog.Info(LogTag, report.Exception.ToString());
}
else if (report.AndroidDetails != null)
{
AppCenterLog.Info(LogTag, report.AndroidDetails.ThreadName);
}

if (e.Exception != null)
{
AppCenterLog.Info(LogTag, "There is an exception associated with the failure");
}
}

bool ShouldProcess(ErrorReport report)
Expand Down
Loading

0 comments on commit 2fa4594

Please sign in to comment.