Skip to content

Commit

Permalink
Merge pull request #130 from Microsoft/develop
Browse files Browse the repository at this point in the history 
v0.6.0
  • Loading branch information
@guperrot
guperrot authored Jan 24, 2017
2 parents 4f7640b + 194f1c6 commit eb3e837
Show file tree
Hide file tree
Showing 87 changed files with 1,748 additions and 675 deletions.
1 change: 1 addition & 0 deletions Apps/Contoso.Android.Puppet/Contoso.Android.Puppet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>Full</AndroidLinkMode>
<EnableProguard>true</EnableProguard>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand Down
9 changes: 7 additions & 2 deletions Apps/Contoso.Android.Puppet/MainActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Microsoft.Azure.Mobile;
using Microsoft.Azure.Mobile.Crashes;
using System.Collections.Generic;
using System.Threading;

namespace Contoso.Android.Puppet
{
Expand Down Expand Up @@ -33,11 +34,15 @@ protected override void OnCreate(Bundle savedInstanceState)
MobileCenterLog.Assert(LogTag, "MobileCenter.LogLevel=" + MobileCenter.LogLevel);
MobileCenter.LogLevel = LogLevel.Verbose;
MobileCenterLog.Info(LogTag, "MobileCenter.LogLevel=" + MobileCenter.LogLevel);
MobileCenter.Start("44cd8722-bfe0-4748-ac14-7692e031a8a5", typeof(Analytics), typeof(Crashes));
MobileCenter.SetServerUrl("https://in-integration.dev.avalanch.es");
MobileCenter.Start("7f222d3c-0f5e-421b-93e7-f862c462e07e", typeof(Analytics), typeof(Crashes));
Analytics.TrackEvent("myEvent", new Dictionary<string, string> { { "someKey", "someValue" } });
MobileCenterLog.Info(LogTag, "MobileCenter.InstallId=" + MobileCenter.InstallId);
MobileCenterLog.Info(LogTag, "MobileCenter.HasCrashedInLastSession=" + Crashes.HasCrashedInLastSession);
MobileCenterLog.Info(LogTag, "MobileCenter.LastSessionCrashReport=" + Crashes.LastSessionCrashReport?.AndroidDetails?.Throwable);
Crashes.GetLastSessionCrashReportAsync().ContinueWith(report =>
{
MobileCenterLog.Info(LogTag, "MobileCenter.LastSessionCrashReport=" + report.Result?.AndroidDetails?.Throwable);
});
}

protected override void OnDestroy()
Expand Down
2 changes: 1 addition & 1 deletion Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
View file
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.azure.mobile.xamarin.puppet" android:versionCode="3" android:versionName="0.5.0-SNAPSHOT" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.puppet" android:versionCode="5" android:versionName="0.6.0-SNAPSHOT" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" />
<application android:label="SXPuppet" android:icon="@drawable/Icon"></application>
</manifest>
4 changes: 2 additions & 2 deletions Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
View file
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("0.5.0.0")]
[assembly: AssemblyInformationalVersion("0.5.0-SNAPSHOT")]
[assembly: AssemblyFileVersion("0.6.0.0")]
[assembly: AssemblyInformationalVersion("0.6.0-SNAPSHOT")]
46 changes: 28 additions & 18 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,33 @@
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidLinkMode>Full</AndroidLinkMode>
<AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
<EnableProguard>true</EnableProguard>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Azure.Mobile, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.0.5.0/lib/MonoAndroid403/Microsoft.Azure.Mobile.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Analytics.0.5.0/lib/MonoAndroid403//Microsoft.Azure.Mobile.Analytics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics.Android.Bindings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Analytics.0.5.0/lib/MonoAndroid403//Microsoft.Azure.Mobile.Analytics.Android.Bindings.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Android.Bindings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.0.5.0/lib/MonoAndroid403/Microsoft.Azure.Mobile.Android.Bindings.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Crashes.0.5.0/lib/MonoAndroid403/Microsoft.Azure.Mobile.Crashes.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes.Android.Bindings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Crashes.0.5.0/lib/MonoAndroid403/Microsoft.Azure.Mobile.Crashes.Android.Bindings.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -84,24 +109,6 @@
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Android.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.5.0\lib\MonoAndroid403\Microsoft.Azure.Mobile.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.5.0\lib\MonoAndroid403\Microsoft.Azure.Mobile.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes.Android.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.5.0\lib\MonoAndroid403\Microsoft.Azure.Mobile.Crashes.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.5.0\lib\MonoAndroid403\Microsoft.Azure.Mobile.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics.Android.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.5.0\lib\MonoAndroid403\Microsoft.Azure.Mobile.Analytics.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.5.0\lib\MonoAndroid403\Microsoft.Azure.Mobile.Analytics.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down Expand Up @@ -129,6 +136,9 @@
<Name>Contoso.Forms.Demo</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProguardConfiguration Include="proguard.cfg" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
Expand Down
2 changes: 1 addition & 1 deletion Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml
View file
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" android:versionCode="4" package="com.microsoft.azure.mobile.xamarin.forms.demo" android:versionName="0.5.0">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="5" package="com.microsoft.azure.mobile.xamarin.forms.demo" android:versionName="0.5.0">
<uses-sdk android:minSdkVersion="15" />
<application android:label="MCFDemo"></application>
</manifest>
1 change: 1 addition & 0 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/proguard.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-keep class android.support.v7.widget.FitWindowsFrameLayout
42 changes: 24 additions & 18 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,30 @@
<MtouchTlsProvider>Default</MtouchTlsProvider>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Azure.Mobile, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.0.5.0/lib/Xamarin.iOS10/Microsoft.Azure.Mobile.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Analytics.0.5.0/lib/Xamarin.iOS10//Microsoft.Azure.Mobile.Analytics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics.iOS.Bindings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Analytics.0.5.0/lib/Xamarin.iOS10//Microsoft.Azure.Mobile.Analytics.iOS.Bindings.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Crashes.0.5.0/lib/Xamarin.iOS10/Microsoft.Azure.Mobile.Crashes.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes.iOS.Bindings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Crashes.0.5.0/lib/Xamarin.iOS10/Microsoft.Azure.Mobile.Crashes.iOS.Bindings.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.iOS.Bindings, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.0.5.0/lib/Xamarin.iOS10/Microsoft.Azure.Mobile.iOS.Bindings.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
Expand All @@ -101,24 +125,6 @@
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.5.0\lib\Xamarin.iOS10\Microsoft.Azure.Mobile.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.iOS.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.5.0\lib\Xamarin.iOS10\Microsoft.Azure.Mobile.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.5.0\lib\Xamarin.iOS10\Microsoft.Azure.Mobile.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics.iOS.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.5.0\lib\Xamarin.iOS10\Microsoft.Azure.Mobile.Analytics.iOS.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.5.0\lib\Xamarin.iOS10\Microsoft.Azure.Mobile.Crashes.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes.iOS.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.5.0\lib\Xamarin.iOS10\Microsoft.Azure.Mobile.Crashes.iOS.Bindings.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
Expand Down
2 changes: 0 additions & 2 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Main.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ static void Main(string[] args)
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, "AppDelegate");


}
}
}
21 changes: 12 additions & 9 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,18 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Reference Include="Microsoft.Azure.Mobile, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.0.5.0/lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Microsoft.Azure.Mobile.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Analytics.0.5.0/lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Microsoft.Azure.Mobile.Analytics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>../../../packages/Microsoft.Azure.Mobile.Crashes.0.5.0/lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Microsoft.Azure.Mobile.Crashes.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
</Reference>
Expand All @@ -83,15 +95,6 @@
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.5.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Microsoft.Azure.Mobile.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.5.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Microsoft.Azure.Mobile.Analytics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.5.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Microsoft.Azure.Mobile.Crashes.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
Expand Down
28 changes: 16 additions & 12 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
<AndroidLinkMode>Full</AndroidLinkMode>
<EnableProguard>true</EnableProguard>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -110,18 +111,6 @@
<Project>{92313C69-3BC4-4276-A1C8-100C86183F12}</Project>
<Name>Contoso.Forms.Puppet</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Android\Microsoft.Azure.Mobile.Analytics.Android.csproj">
<Project>{93E4ADA5-8D7A-44BF-9549-0AD76AB86E8F}</Project>
<Name>Microsoft.Azure.Mobile.Analytics.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Android.Bindings\Microsoft.Azure.Mobile.Analytics.Android.Bindings.csproj">
<Project>{34771DC0-9684-45BE-9C9C-5A686468722C}</Project>
<Name>Microsoft.Azure.Mobile.Analytics.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.Android.Bindings\Microsoft.Azure.Mobile.Android.Bindings.csproj">
<Project>{C3B5BA33-DA39-400D-B5B3-85C68354FD74}</Project>
<Name>Microsoft.Azure.Mobile.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.Android\Microsoft.Azure.Mobile.Android.csproj">
<Project>{119C1730-E109-4BC9-AA89-9DCA2C50BFD5}</Project>
<Name>Microsoft.Azure.Mobile.Android</Name>
Expand All @@ -134,6 +123,21 @@
<Project>{42D541D7-B7C9-45A7-8D4D-8FB5A00668B3}</Project>
<Name>Microsoft.Azure.Mobile.Crashes.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.Android.Bindings\Microsoft.Azure.Mobile.Android.Bindings.csproj">
<Project>{C3B5BA33-DA39-400D-B5B3-85C68354FD74}</Project>
<Name>Microsoft.Azure.Mobile.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Android\Microsoft.Azure.Mobile.Analytics.Android.csproj">
<Project>{93E4ADA5-8D7A-44BF-9549-0AD76AB86E8F}</Project>
<Name>Microsoft.Azure.Mobile.Analytics.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Android.Bindings\Microsoft.Azure.Mobile.Analytics.Android.Bindings.csproj">
<Project>{34771DC0-9684-45BE-9C9C-5A686468722C}</Project>
<Name>Microsoft.Azure.Mobile.Analytics.Android.Bindings</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProguardConfiguration Include="proguard.cfg" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
Expand Down
23 changes: 23 additions & 0 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/MainActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
using Android.Content.PM;
using Android.OS;
using Microsoft.Azure.Mobile;
using Com.Microsoft.Azure.Mobile.Analytics;
using Com.Microsoft.Azure.Mobile.Analytics.Ingestion.Models;
using Com.Microsoft.Azure.Mobile.Analytics.Channel;
using Com.Microsoft.Azure.Mobile.Ingestion.Models;

namespace Contoso.Forms.Puppet.Droid
{
Expand All @@ -17,6 +21,7 @@ protected override void OnCreate(Bundle savedInstanceState)

Xamarin.Forms.Forms.Init(this, savedInstanceState);

AndroidAnalytics.SetListener(new AndroidAnalyticsListener());
MobileCenterLog.Assert(App.LogTag, "MobileCenter.Configured=" + MobileCenter.Configured);
MobileCenterLog.Assert(App.LogTag, "MobileCenter.InstallId (before configure)=" + MobileCenter.InstallId);
MobileCenter.SetServerUrl("https://in-integration.dev.avalanch.es");
Expand All @@ -25,4 +30,22 @@ protected override void OnCreate(Bundle savedInstanceState)
LoadApplication(new App());
}
}

public class AndroidAnalyticsListener : Java.Lang.Object, IAnalyticsListener
{
public void OnSendingFailed(ILog log, Java.Lang.Exception e)
{
MobileCenterLog.Debug(App.LogTag, "Analytics listener OnSendingFailed with exception: " + e);
}

public void OnSendingSucceeded(ILog log)
{
MobileCenterLog.Debug(App.LogTag, "Analytics listener OnSendingSucceeded");
}

public void OnBeforeSending(ILog log)
{
MobileCenterLog.Debug(App.LogTag, "Analytics listener OnBeforeSendingEventLog");
}
}
}
2 changes: 1 addition & 1 deletion Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
View file
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" android:versionCode="3" android:versionName="0.5.0-SNAPSHOT" package="com.microsoft.azure.mobile.xamarin.forms.puppet">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="5" android:versionName="0.6.0-SNAPSHOT" package="com.microsoft.azure.mobile.xamarin.forms.puppet">
<uses-sdk android:minSdkVersion="15" />
<application android:label="MCFPuppet"></application>
</manifest>
1 change: 1 addition & 0 deletions Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/proguard.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-keep class android.support.v7.widget.FitWindowsFrameLayout
2 changes: 1 addition & 1 deletion Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("0.5.0.0")]
[assembly: AssemblyFileVersion("0.6.0.0")]
[assembly: ComVisible(false)]
Loading

0 comments on commit eb3e837

Please sign in to comment.