Merge pull request #102 from Microsoft/feature/forms_link_all

Test "Link All" in release for our forms apps
microsoft · Dec 16, 2016 · ac13a4a · ac13a4a
2 parents 34952f1 + ebd33c0
commit ac13a4a
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 9 deletions.
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
@@ -37,7 +37,7 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <AndroidLinkMode>Full</AndroidLinkMode>
     <AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
   </PropertyGroup>
   <ItemGroup>

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
@@ -70,6 +70,7 @@
       <DependentUpon>PropertiesContentPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="FakeService.cs" />
+    <Compile Include="PreserveAttribute.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

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
@@ -17,6 +17,7 @@ public Property(string propertyName, string propertyValue)
         public string Value;
     }
 
+    [Android.Runtime.Preserve(AllMembers = true)]
     public partial class AnalyticsContentPage : ContentPage
     {
         List<Property> EventProperties;

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/CrashesContentPage.xaml.cs
@@ -8,6 +8,7 @@
 
 namespace Contoso.Forms.Demo
 {
+    [Android.Runtime.Preserve(AllMembers = true)]
     public partial class CrashesContentPage
     {
         public CrashesContentPage()

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/MobileCenterContentPage.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/MobileCenterContentPage.xaml.cs
@@ -3,6 +3,7 @@
 
 namespace Contoso.Forms.Demo
 {
+    [Android.Runtime.Preserve(AllMembers = true)]
     public partial class MobileCenterContentPage : ContentPage
     {
         public MobileCenterContentPage()

diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/PreserveAttribute.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/PreserveAttribute.cs
@@ -0,0 +1,8 @@
+namespace Android.Runtime
+{
+    public sealed class PreserveAttribute : System.Attribute
+    {
+        public bool AllMembers;
+        public bool Conditional;
+    }
+}
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
@@ -16,7 +16,6 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,9 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
     <AndroidSupportedAbis>arm64-v8a;armeabi;armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
-    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,8 +36,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
+    <AndroidLinkMode>Full</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Contoso.Forms.Puppet.iOS.csproj b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Contoso.Forms.Puppet.iOS.csproj
@@ -58,7 +58,7 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchUseSGen>true</MtouchUseSGen>
     <MtouchUseRefCounting>true</MtouchUseRefCounting>
-    <MtouchLink>None</MtouchLink>
+    <MtouchLink>Full</MtouchLink>
     <MtouchArch>i386</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchTlsProvider>Default</MtouchTlsProvider>

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Constants.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Constants.cs
@@ -1,7 +1,6 @@
-using System;
-
-namespace Contoso.Forms.Puppet
+namespace Contoso.Forms.Puppet
 {
+    [Android.Runtime.Preserve(AllMembers = true)]
     public static class Constants
     {
         public const string Verbose = "Verbose";

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
@@ -77,6 +77,7 @@
       <DependentUpon>PropertiesContentPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="FakeService.cs" />
+    <Compile Include="PreserveAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="ModulePages\" />

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AnalyticsContentPage.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/AnalyticsContentPage.xaml.cs
@@ -17,6 +17,7 @@ public Property(string propertyName, string propertyValue)
         public string Value;
     }
 
+    [Android.Runtime.Preserve(AllMembers = true)]
     public partial class AnalyticsContentPage : ContentPage
     {
         List<Property> EventProperties;

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml.cs
@@ -6,6 +6,7 @@
 
 namespace Contoso.Forms.Puppet
 {
+    [Android.Runtime.Preserve(AllMembers = true)]
     public partial class CrashesContentPage
     {
         public CrashesContentPage()

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/MobileCenterContentPage.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/MobileCenterContentPage.xaml.cs
@@ -6,6 +6,7 @@
 
 namespace Contoso.Forms.Puppet
 {
+    [Android.Runtime.Preserve(AllMembers = true)]
     public partial class MobileCenterContentPage : ContentPage
     {
         // E.g., calling LogFunctions["Verbose"](tag, msg) will be

diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/PreserveAttribute.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/PreserveAttribute.cs
@@ -0,0 +1,8 @@
+namespace Android.Runtime
+{
+    public sealed class PreserveAttribute : System.Attribute
+    {
+        public bool AllMembers;
+        public bool Conditional;
+    }
+}