diff --git a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml index f0bd8addb..ab688fee9 100644 --- a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml +++ b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs index d1f52c2d0..81d33cae2 100644 --- a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Android.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("0.1.0.0")] -[assembly: AssemblyInformationalVersion("0.1.0-SNAPSHOT")] +[assembly: AssemblyFileVersion("0.5.0.0")] +[assembly: AssemblyInformationalVersion("0.5.0-SNAPSHOT")] diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj index c1ce1863d..141f7a585 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj @@ -37,7 +37,8 @@ 4 true false - SdkOnly + Full + armeabi-v7a;armeabi;x86;arm64-v8a;x86_64 diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs index b6fb22821..8bca1de87 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs @@ -18,7 +18,7 @@ protected override void OnCreate(Bundle savedInstanceState) Xamarin.Forms.Forms.Init(this, savedInstanceState); - MobileCenter.Configure("095bc922-dc67-4f44-9c83-75d92b90534d"); + MobileCenter.Configure("987b5941-4fac-4968-933e-98a7ff29237c"); LoadApplication(new App()); } diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml index 8f6e469e1..5270046e0 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + - \ No newline at end of file + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs index 3e719c3b1..4f66a1387 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AssemblyInfo.cs @@ -18,7 +18,9 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("1.0.0")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.4.1.0")] +[assembly: AssemblyInformationalVersion("0.4.1")] // 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.Demo/Contoso.Forms.Demo.Droid/packages.config b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/packages.config index e6103e7f3..92731779c 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/packages.config +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/packages.config @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs index 1f5913af1..32fc52d22 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.4.1.0")] +[assembly: ComVisible(false)] diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs index 5807bea2d..a4227f587 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs @@ -1,27 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using Foundation; -using UIKit; - +using Foundation; using Microsoft.Azure.Mobile; +using UIKit; namespace Contoso.Forms.Demo.iOS { [Register("AppDelegate")] - public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate + public class AppDelegate : Xamarin.Forms.Platform.iOS.FormsApplicationDelegate { - public override bool FinishedLaunching(UIApplication app, NSDictionary options) + public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions) { - global::Xamarin.Forms.Forms.Init(); + Xamarin.Forms.Forms.Init(); - MobileCenter.Configure("2b3f11b1-6a90-4f28-9ae3-fc33b3c5d729"); + MobileCenter.Configure("fe2bf05d-f4f9-48a6-83d9-ea8033fbb644"); LoadApplication(new App()); - return base.FinishedLaunching(app, options); - + return base.FinishedLaunching(uiApplication, launchOptions); } } } diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist index 3da4f5619..dc2be68b1 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Info.plist @@ -4,10 +4,8 @@ CFBundleIdentifier com.microsoft.azure.mobile.xamarin.forms.demo - CFBundleShortVersionString - 1.0 CFBundleVersion - 1.0 + 0.4.1 LSRequiresIPhoneOS MinimumOSVersion @@ -40,5 +38,7 @@ Assets.xcassets/AppIcon.appiconset CFBundleName MCFDemo + CFBundleShortVersionString + 0.4.1 diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/packages.config b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/packages.config index c7b786a36..3c6ff74f1 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/packages.config +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/packages.config @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj index 3a870766c..2565fd0da 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/Contoso.Forms.Demo.csproj @@ -70,6 +70,7 @@ PropertiesContentPage.xaml + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml index b8ec0c21f..1aa222582 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml @@ -2,7 +2,7 @@ - + diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml.cs index 70c7a736a..9c91964b8 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml.cs +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/AnalyticsContentPage.xaml.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Microsoft.Azure.Mobile; using Microsoft.Azure.Mobile.Analytics; using Xamarin.Forms; @@ -16,16 +17,17 @@ public Property(string propertyName, string propertyValue) public string Value; } + [Android.Runtime.Preserve(AllMembers = true)] public partial class AnalyticsContentPage : ContentPage { - private List EventProperties; + List EventProperties; public AnalyticsContentPage() { InitializeComponent(); EventProperties = new List(); NumPropertiesLabel.Text = EventProperties.Count.ToString(); - if (Device.OS == TargetPlatform.iOS) + if (Xamarin.Forms.Device.OS == TargetPlatform.iOS) { Icon = "lightning.png"; } @@ -35,11 +37,12 @@ protected override void OnAppearing() { base.OnAppearing(); EnabledSwitchCell.On = Analytics.Enabled; + EnabledSwitchCell.IsEnabled = MobileCenter.Enabled; } - void AddProperty(object sender, System.EventArgs e) + void AddProperty(object sender, EventArgs e) { - AddPropertyContentPage addPage = new AddPropertyContentPage(); + var addPage = new AddPropertyContentPage(); addPage.PropertyAdded += (Property property) => { EventProperties.Add(property); RefreshPropCount(); @@ -47,14 +50,14 @@ void AddProperty(object sender, System.EventArgs e) Navigation.PushModalAsync(addPage); } - void PropertiesCellTapped(object sender, System.EventArgs e) + void PropertiesCellTapped(object sender, EventArgs e) { Navigation.PushAsync(new PropertiesContentPage(EventProperties)); } - void TrackEvent(object sender, System.EventArgs e) + void TrackEvent(object sender, EventArgs e) { - Dictionary properties = new Dictionary(); + var properties = new Dictionary(); foreach (Property property in EventProperties) { properties.Add(property.Name, property.Value); @@ -72,12 +75,9 @@ void TrackEvent(object sender, System.EventArgs e) } - void UpdateEnabled(object sender, System.EventArgs e) + void UpdateEnabled(object sender, ToggledEventArgs e) { - if (EnabledSwitchCell != null) - { - Analytics.Enabled = EnabledSwitchCell.On; - } + Analytics.Enabled = e.Value; } void RefreshPropCount() diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml index 726bc9563..22d330933 100644 --- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml +++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml @@ -5,7 +5,7 @@ x:Class="Contoso.Forms.Demo.CrashesContentPage"> - + @@ -19,9 +19,6 @@