Merge pull request #356 from Microsoft/develop

v0.13.0
microsoft · Jun 20, 2017 · d4c4cf4 · d4c4cf4
2 parents fbd35da + fd1cac8
commit d4c4cf4
Show file tree

Hide file tree

Showing 224 changed files with 2,627 additions and 1,933 deletions.
diff --git 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.azure.mobile.xamarin.puppet" android:versionCode="22" android:versionName="0.12.0-SNAPSHOT" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.puppet" android:versionCode="24" android:versionName="0.13.0-SNAPSHOT" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="16" />
 	<application android:label="SXPuppet" android:icon="@drawable/Icon" android:theme="@style/PuppetTheme" />
 </manifest>
diff --git 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("0.12.0.0")]
-[assembly: AssemblyInformationalVersion("0.12.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.13.0.0")]
+[assembly: AssemblyInformationalVersion("0.13.0-SNAPSHOT")]
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/App.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/App.xaml.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
+using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+using Microsoft.Azure.Mobile.Push;
 
 namespace Contoso.Forms.Demo.UWP
 {
@@ -43,6 +46,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 DebugSettings.EnableFrameRateCounter = true;
             }
 #endif
+
             var rootFrame = Window.Current.Content as Frame;
 
             // Do not repeat app initialization when the Window already has content,
@@ -77,6 +81,8 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 // Ensure the current window is active
                 Window.Current.Activate();
             }
+
+            Push.CheckLaunchedFromNotification(e);
         }
 
         /// <summary>

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
@@ -9,8 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Contoso.Forms.Demo</RootNamespace>
     <AssemblyName>Contoso.Forms.Demo</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/project.json b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/project.json
@@ -4,9 +4,12 @@
     "Microsoft.Azure.Mobile.Crashes": "0.12.0",
     "Microsoft.Azure.Mobile.Distribute": "0.12.0",
     "Microsoft.Azure.Mobile.Push": "0.12.0",
-    "Xamarin.Forms": "2.3.4.231"
+    "Xamarin.Forms": "2.3.4.231",
+    "NETStandard.Library": "1.6.1"
   },
   "frameworks": {
-    ".NETPortable,Version=v4.5,Profile=Profile259": {}
+    "netstandard1.0": {
+        "imports": "portable-net45+win8+wpa81"
+    }
   }
 }
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/MainActivity.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/MainActivity.cs
@@ -9,7 +9,7 @@
 
 namespace Contoso.Forms.Puppet.Droid
 {
-    [Activity(Label = "MCFPuppet", Icon = "@drawable/icon", Theme = "@style/PuppetTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    [Activity(Label = "MCFPuppet", Icon = "@drawable/icon", Theme = "@style/PuppetTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, LaunchMode = LaunchMode.SingleTop)]
     public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
@@ -25,6 +25,12 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             LoadApplication(new App());
         }
+
+        protected override void OnNewIntent(Android.Content.Intent intent)
+        {
+            base.OnNewIntent(intent);
+            Push.CheckLaunchedFromNotification(this, intent);
+        }
     }
 
     public class AndroidAnalyticsListener : Java.Lang.Object, IAnalyticsListener

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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="22" android:versionName="0.12.0-SNAPSHOT" package="com.microsoft.azure.mobile.xamarin.forms.puppet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="24" android:versionName="0.13.0-SNAPSHOT" package="com.microsoft.azure.mobile.xamarin.forms.puppet">
 	<uses-sdk android:minSdkVersion="15" />
 	<application android:label="MCFPuppet">
 		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />

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
@@ -19,8 +19,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.12.0.0")]
-[assembly: AssemblyInformationalVersion("0.12.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.13.0.0")]
+[assembly: AssemblyInformationalVersion("0.13.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.UWP/App.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/App.xaml.cs
@@ -78,6 +78,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 // Ensure the current window is active
                 Window.Current.Activate();
             }
+
             Push.CheckLaunchedFromNotification(e);
         }
 

diff --git 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.MobileCenter-Forms-UWP-Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="0.12.0.0" />
+  <Identity Name="10805zumoTestUser.MobileCenter-Forms-UWP-Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="0.13.0.0" />
   <mp:PhoneIdentity PhoneProductId="4a2ad72a-bf19-4c5f-b9a5-54d8911ebbba" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>MobileCenter-Forms-UWP-Puppet</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
@@ -24,5 +24,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.12.0.0")]
+[assembly: AssemblyFileVersion("0.13.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
@@ -5,9 +5,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.microsoft.azure.mobile.xamarin.forms.puppet</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.12.0</string>
+	<string>0.13.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.12.0</string>
+	<string>0.13.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Contoso.Forms.Puppet.csproj b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Contoso.Forms.Puppet.csproj
@@ -9,8 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Contoso.Forms.Puppet</RootNamespace>
     <AssemblyName>Contoso.Forms.Puppet</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -68,6 +67,12 @@
     <Compile Include="MainPuppetPage.cs">
       <DependentUpon>MainPuppetPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ModulePages\CustomPropertiesContentPage.xaml.cs">
+      <DependentUpon>CustomPropertiesContentPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CustomPropertyView.xaml.cs">
+      <DependentUpon>CustomPropertyView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="LogLevelPage.cs">
       <DependentUpon>LogLevelPage.xaml</DependentUpon>
@@ -83,7 +88,7 @@
     </Compile>
     <Compile Include="ModulePages\OthersContentPage.xaml.cs">
       <DependentUpon>OthersContentPage.xaml</DependentUpon>
-    </Compile>    
+    </Compile>
     <Compile Include="Constants.cs" />
     <Compile Include="AddPropertyContentPage.xaml.cs">
       <DependentUpon>AddPropertyContentPage.xaml</DependentUpon>
@@ -95,18 +100,7 @@
     <Compile Include="PreserveAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics\Microsoft.Azure.Mobile.Analytics.csproj">
@@ -130,6 +124,18 @@
       <Name>Microsoft.Azure.Mobile.Push</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ModulePages\CustomPropertiesContentPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CustomPropertyView.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\packages\Xamarin.Forms.2.3.1.114\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.1.114\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.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')" />

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/MainPuppetPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/MainPuppetPage.xaml
@@ -3,5 +3,6 @@
     <local:MobileCenterContentPage/>
 	<local:AnalyticsContentPage/>
 	<local:CrashesContentPage/>
+    <local:CustomPropertiesContentPage/>
 	<local:OthersContentPage/>
 </TabbedPage>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CustomPropertiesContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CustomPropertiesContentPage.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage Title="Custom Properties"
+        xmlns="http://xamarin.com/schemas/2014/forms" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+        x:Class="Contoso.Forms.Puppet.CustomPropertiesContentPage">
+    <StackLayout Orientation="Vertical">
+        <ScrollView Orientation="Vertical">
+            <StackLayout Orientation="Vertical" x:Name="PropertiesContainer">
+            </StackLayout>
+        </ScrollView>
+        <Button Text="Add property" Clicked="AddProperty_Clicked" x:Name="AddProperty"/>
+        <Button Text="Send" Clicked="Send_Clicked" x:Name="Send"/>
+    </StackLayout>
+</ContentPage>
diff --git a/...Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CustomPropertiesContentPage.xaml.cs b/...Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CustomPropertiesContentPage.xaml.cs
@@ -0,0 +1,36 @@
+using System;
+using Microsoft.Azure.Mobile;
+using Xamarin.Forms;
+
+namespace Contoso.Forms.Puppet
+{
+    [Android.Runtime.Preserve(AllMembers = true)]
+    public partial class CustomPropertiesContentPage : ContentPage
+    {
+        public CustomPropertiesContentPage()
+        {
+            InitializeComponent();
+            AddNewProperty();
+        }
+
+        public void AddNewProperty()
+        {
+            PropertiesContainer.Children.Add(new CustomPropertyView());
+        }
+
+        private void AddProperty_Clicked(object sender, EventArgs e)
+        {
+            AddNewProperty();
+        }
+
+        private void Send_Clicked(object sender, EventArgs e)
+        {
+            CustomProperties customProperties = new CustomProperties();
+            foreach(var customProperty in PropertiesContainer.Children)
+            {
+                (customProperty as CustomPropertyView).AddCustomProperty(customProperties);
+            }
+            MobileCenter.SetCustomProperties(customProperties);
+        }
+    }
+}
diff --git 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("0.12.0.0")]
-[assembly: AssemblyInformationalVersion("0.12.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.13.0.0")]
+[assembly: AssemblyInformationalVersion("0.13.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/Views/CustomPropertyView.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Views/CustomPropertyView.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Contoso.Forms.Puppet.CustomPropertyView">
+  <ContentView.Content>
+        <Frame OutlineColor="DarkGray">
+            <StackLayout Orientation="Vertical">
+                <Entry x:Name="PropertyKey"></Entry>
+                <Picker x:Name="PropertyType" SelectedIndexChanged="PropertyType_SelectedIndexChanged"></Picker>
+                <StackLayout x:Name="PropertyValueHolder"/>
+            </StackLayout>
+        </Frame>
+    </ContentView.Content>
+</ContentView>
-Original file line number
+Diff line change
@@ Expand Up @@
                     // Ensure the current window is active
                     Window.Current.Activate();
                 }
                 Push.CheckLaunchedFromNotification(e);
             }
@@ Expand Down @@