diff --git a/auth-base/source/Transforms/Metadata.xml b/auth-base/source/Transforms/Metadata.xml index b93e5462c..037b195f8 100644 --- a/auth-base/source/Transforms/Metadata.xml +++ b/auth-base/source/Transforms/Metadata.xml @@ -21,7 +21,8 @@ dest flags - falsed + + Java.Lang.Object diff --git a/build.cake b/build.cake index b7ea79a82..b208458fb 100644 --- a/build.cake +++ b/build.cake @@ -24,7 +24,7 @@ var BASE_API_INFO_URL = "https://github.com/xamarin/GooglePlayServicesComponents var COMMON_NUGET_VERSION = ""; var PLAY_COMPONENT_VERSION = "42.1021.0.0"; -var PLAY_NUGET_VERSION = "42.1021.0" + COMMON_NUGET_VERSION; +var PLAY_NUGET_VERSION = "42.1021.1" + COMMON_NUGET_VERSION; var PLAY_AAR_VERSION = "10.2.1"; var VERSION_DESC = "10.2.1"; diff --git a/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec b/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec index 349778589..af02fb1b1 100644 --- a/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec +++ b/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec @@ -20,6 +20,8 @@ + + diff --git a/cast-framework/source/Cast.Framework.csproj b/cast-framework/source/Cast.Framework.csproj index 8cdda44d4..b239ed19f 100644 --- a/cast-framework/source/Cast.Framework.csproj +++ b/cast-framework/source/Cast.Framework.csproj @@ -47,12 +47,6 @@ - - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll - ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll @@ -72,6 +66,23 @@ ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False + + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + False + + + ..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll + + + ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + False + @@ -115,4 +126,9 @@ + + + + + diff --git a/cast-framework/source/packages.config b/cast-framework/source/packages.config index 247b0876a..a69fe88c9 100644 --- a/cast-framework/source/packages.config +++ b/cast-framework/source/packages.config @@ -1,10 +1,15 @@  + + + + + \ No newline at end of file diff --git a/places/source/Transforms/Metadata.xml b/places/source/Transforms/Metadata.xml index a3077e6cc..acfc45d76 100644 --- a/places/source/Transforms/Metadata.xml +++ b/places/source/Transforms/Metadata.xml @@ -28,8 +28,11 @@ false - false - + false + false + Java.Lang.Object Java.Lang.Object Java.Lang.Object @@ -42,6 +45,7 @@ + public public ZzaInner public diff --git a/safetynet/source/Transforms/Metadata.xml b/safetynet/source/Transforms/Metadata.xml index 471a42a34..318a62f66 100644 --- a/safetynet/source/Transforms/Metadata.xml +++ b/safetynet/source/Transforms/Metadata.xml @@ -7,6 +7,8 @@ SafetyNetClass + Java.Lang.Object + diff --git a/tests/GooglePlayServices.Tests/Tests.cs b/tests/GooglePlayServices.Tests/Tests.cs index 5eb88f7da..ec5b30171 100644 --- a/tests/GooglePlayServices.Tests/Tests.cs +++ b/tests/GooglePlayServices.Tests/Tests.cs @@ -11,23 +11,61 @@ namespace GooglePlayServices.Tests public class Tests { [Fact] - public void GooglePlayServicesUtil_Exists () + public void Common_GooglePlayServicesUtil_Exists() { var versionCode = Android.Gms.Common.GooglePlayServicesUtil.GooglePlayServicesVersionCode; - Console.WriteLine("Google Play Services Version: {0}", versionCode); + Console.WriteLine("Common.GooglePlayServicesUtil.GooglePlayServicesVersionCode: {0}", versionCode); Assert.True(versionCode > 0); } [Fact] - public void GoogleApiAvailability_Exists() + public void Common_GoogleApiAvailability_Exists() { var versionCode = Android.Gms.Common.GoogleApiAvailability.GooglePlayServicesVersionCode; - Console.WriteLine("Google Play Services Version: {0}", versionCode); + Console.WriteLine("Common.GoogleApiAvailability.GooglePlayServicesVersionCode:: {0}", versionCode); Assert.True(versionCode > 0); } + + [Fact] + public void Auth_GoogleAuthUtil_Exists() + { + var googleAccountType = Android.Gms.Auth.GoogleAuthUtil.GoogleAccountType; + + Console.WriteLine("Auth.GoogleAuthUtil.GoogleAccountType: {0}", googleAccountType); + + Assert.True(googleAccountType != null); + } + + [Fact] + public void Location_Places_UI_PlacePicker_Exists() + { + var resErr = Android.Gms.Location.Places.UI.PlacePicker.ResultError; + + Console.WriteLine("Location.Places.UI.PlacePicker.ResultError: {0}", resErr); + + Assert.True(resErr == 2); + } + + [Fact] + public void Location_Places_UI_PlaceAutocomplete_Exists() + { + var resErr = Android.Gms.Location.Places.UI.PlaceAutocomplete.ResultError; + + Console.WriteLine("Location.Places.UI.PlaceAutocomplete.ResultError: {0}", resErr); + + Assert.True(resErr == 2); + } + + [Fact] + public void Cast_Framework_Media_Widget_ExpandedControllerActivity_Exists() + { + var a = Android.Gms.Cast.Framework.Media.Widget.ExpandedControllerActivity.ActivityService; + + Assert.True(a != null); + } } }