additional proguard rules for shell (#6032)

* additional proguard rules for shell

* add property to disable file

fixes #5799

diff --git a/.nuspec/Xamarin.Forms.targets b/.nuspec/Xamarin.Forms.targets
index c545ca9..3a0a648 100644 (file)
--- a/.nuspec/Xamarin.Forms.targets
+++ b/.nuspec/Xamarin.Forms.targets
@@ -161,7 +161,7 @@
     </PrepareForBuildDependsOn>
   </PropertyGroup>
   
-  <Target Name="IncludeProguardForAndroid">
+  <Target Name="IncludeProguardForAndroid" Condition="'$(XFDisableDefaultProguardConfiguration)' != 'True'">
     <ItemGroup>
       <ProguardConfiguration Include="$(MSBuildThisFileDirectory)MonoAndroid10\proguard.cfg" />
     </ItemGroup>

diff --git a/.nuspec/proguard.cfg b/.nuspec/proguard.cfg
index ed04c2e..7ec9690 100644 (file)
--- a/.nuspec/proguard.cfg
+++ b/.nuspec/proguard.cfg
@@ -1,2 +1,4 @@
 -keep class android.support.v7.widget.FitWindowsFrameLayout { *; }
--dontwarn android.support.v7.widget.FitWindowsFrameLayout
\ No newline at end of file
+-dontwarn android.support.v7.widget.FitWindowsFrameLayout
+-keep class android.support.design.** { *; }
+-keep class android.support.multidex.MultiDexApplication { *; }
\ No newline at end of file

diff --git a/Xamarin.Forms.Sandbox.Android/proguard.cfg b/Xamarin.Forms.Sandbox.Android/proguard.cfg
index ed04c2e..a00f7f4 100644 (file)
--- a/Xamarin.Forms.Sandbox.Android/proguard.cfg
+++ b/Xamarin.Forms.Sandbox.Android/proguard.cfg
@@ -1,2 +1,4 @@
 -keep class android.support.v7.widget.FitWindowsFrameLayout { *; }
--dontwarn android.support.v7.widget.FitWindowsFrameLayout
\ No newline at end of file
+-dontwarn android.support.v7.widget.FitWindowsFrameLayout
+-keep class android.support.design.** { *; }
+-keep class android.support.multidex.MultiDexApplication { *; }