This repository has been archived by the owner on Nov 6, 2024. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # ads-lite/source/Ads.Lite.csproj # ads/samples/AdMobSample/AdMobSample.csproj # ads/source/Ads.csproj # analytics-impl/source/Analytics.Impl.csproj # analytics/samples/AnalyticsSample/AnalyticsSample.csproj # analytics/source/Analytics.csproj # appinvite/samples/AppInviteSample/AppInviteSample.csproj # appinvite/source/AppInvite.csproj # auth-api-phone/source/Auth-Api-Phone.csproj # auth-base/source/Auth.Base.csproj # auth/source/Auth.csproj # awareness/source/Awareness.csproj # base/source/Base.csproj # basement/buildtasks/Xamarin.GooglePlayServices.Basement.targets # basement/nuget/Xamarin.GooglePlayServices.Basement.template.nuspec # basement/source/Basement.csproj # build.cake # cast-framework/source/Cast.Framework.csproj # cast/samples/CastingCall/CastingCall.csproj # cast/source/Cast.csproj # drive/samples/DriveSample/DriveSample.csproj # drive/source/Drive.csproj # fido/nuget/Xamarin.GooglePlayServices.Fido.template.nuspec # fido/source/Fido.csproj # firebase-ads/samples/FirebaseAdmobQuickstart/FirebaseAdmobQuickstart.csproj # firebase-analytics-impl/source/Firebase-Analytics-Impl.csproj # firebase-analytics/samples/FirebaseAnalyticsQuickstart/FirebaseAnalyticsQuickstart.csproj # firebase-analytics/source/Firebase-Analytics.csproj # firebase-appindexing/samples/AppIndexingSample/AppIndexingSample.csproj # firebase-appindexing/source/Firebase-AppIndexing.csproj # firebase-auth/samples/FirebaseAuthQuickstart/FirebaseAuthQuickstart.csproj # firebase-auth/source/Firebase-Auth.csproj # firebase-common/source/Firebase-Common.csproj # firebase-config/samples/FirebaseConfigQuickstart/FirebaseConfigQuickstart.csproj # firebase-config/source/Firebase-Config.csproj # firebase-crash/samples/FirebaseCrashReportingQuickstart/FirebaseCrashReportingQuickstart.csproj # firebase-crash/source/Firebase-Crash.csproj # firebase-database-connection/source/Firebase-Database-Connection.csproj # firebase-database/source/Firebase-Database.csproj # firebase-dynamic-links/source/Firebase-Dynamic-Links.csproj # firebase-firestore/nuget/Xamarin.Firebase.Firestore.template.nuspec # firebase-firestore/source/Firebase-Firestore.csproj # firebase-iid/source/Firebase-Iid.csproj # firebase-invites/samples/FirebaseInvitesQuickstart/FirebaseInvitesQuickstart.csproj # firebase-messaging/samples/FirebaseMessagingQuickstart/FirebaseMessagingQuickstart.csproj # firebase-messaging/source/Firebase-Messaging.csproj # firebase-perf/source/Firebase-Perf.csproj # firebase-storage-common/source/Firebase-Storage-Common.csproj # firebase-storage/samples/FirebaseStorageQuickstart/FirebaseStorageQuickstart.csproj # firebase-storage/source/Firebase-Storage.csproj # fitness/samples/BasicSensorsApi/BasicSensorsApi.csproj # fitness/source/Fitness.csproj # games/samples/BeGenerous/BeGenerous.csproj # games/source/Games.csproj # gass/source/Gass.csproj # gcm/samples/GCMSample/GCMSample.csproj # gcm/source/Gcm.csproj # identity/source/Identity.csproj # iid/source/Iid.csproj # instantapps/source/InstantApps.csproj # location/samples/LocationSample/LocationSample.csproj # location/source/Location.csproj # maps/samples/MapsSample/MapsSample.csproj # maps/source/Maps.csproj # nearby/samples/NearbySample/NearbySample.csproj # nearby/source/Nearby.csproj # oss-licenses/source/Oss-Licenses.csproj # panorama/samples/PanoramaSample/PanoramaSample.csproj # panorama/source/Panorama.csproj # places/samples/PlacesAsync/PlacesAsync.csproj # places/source/Places.csproj # plus/samples/PlusSample/PlusSample.csproj # plus/source/Plus.csproj # safetynet/samples/SafetyNetSample/SafetyNetSample.csproj # safetynet/source/SafetyNet.csproj # tagmanager-api/source/TagManager.Api.csproj # tagmanager-v4-impl/source/TagManager.V4.Impl.csproj # tagmanager/source/TagManager.csproj # tasks/source/Tasks.csproj # template.targets # tests/GooglePlayServices.Tests/GooglePlayServices.Tests.csproj # vision-common/source/Vision-Common.csproj # vision/samples/VisionSample/VisionSample.csproj # vision/source/Vision.csproj # wallet/samples/AndroidPayQuickstart/AndroidPayQuickstart.csproj # wallet/source/Wallet.csproj # wearable/source/Wearable.csproj