Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Commit

Permalink
Merge branch '15.0.1-binderate'
Browse files Browse the repository at this point in the history
# 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
Redth committed Mar 20, 2019
2 parents f50955b + 05966a2 commit af4d43b
Showing 2,197 changed files with 56,909 additions and 53,789 deletions.
44 changes: 22 additions & 22 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Submitting Issues

1. Please include all the requested information in the New Issue template and be as thorough as possible with your description.

2. If you can include a link to a solution/project which helps reproduce the issue, we will be more likely to resolve the issue more quickly.

3. If you're dealing with an exception or crash of some type, include any stack traces, build logs, or adb logcat information that is relevant.

4. Use markdown formatting to include code snippets, logs, etc.

-----------------------------------------------------------


# Contributing

1. You will need to complete a Contribution License Agreement before your pull request can be accepted. You can complete the CLA by going through the steps at [https://cla2.dotnetfoundation.org/](https://cla2.dotnetfoundation.org/).

2. You should fork/branch from the `dev` branch.

3. Make sure the `libs`, `samples`, `nuget`, and `component` targets all build.

4. Parameter name fixes should go in the `Metadata.ParameterNames.xml` file for each project.
# Submitting Issues

1. Please include all the requested information in the New Issue template and be as thorough as possible with your description.

2. If you can include a link to a solution/project which helps reproduce the issue, we will be more likely to resolve the issue more quickly.

3. If you're dealing with an exception or crash of some type, include any stack traces, build logs, or adb logcat information that is relevant.

4. Use markdown formatting to include code snippets, logs, etc.

-----------------------------------------------------------


# Contributing

1. You will need to complete a Contribution License Agreement before your pull request can be accepted. You can complete the CLA by going through the steps at [https://cla2.dotnetfoundation.org/](https://cla2.dotnetfoundation.org/).

2. You should fork/branch from the `dev` branch.

3. Make sure the `libs`, `samples`, `nuget`, and `component` targets all build.

4. Parameter name fixes should go in the `Metadata.ParameterNames.xml` file for each project.
32 changes: 16 additions & 16 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
### Xamarin.Android Version (eg: 6.0):


### Operating System & Version (eg: Mac OSX 10.11):


### Google Play Services Version (eg: 8.4.0):


### Describe your Issue:


### Steps to Reproduce (with link to sample solution if possible):


### Include any relevant Exception Stack traces, build logs, adb logs:
### Xamarin.Android Version (eg: 6.0):


### Operating System & Version (eg: Mac OSX 10.11):


### Google Play Services Version (eg: 8.4.0):


### Describe your Issue:


### Steps to Reproduce (with link to sample solution if possible):


### Include any relevant Exception Stack traces, build logs, adb logs:
14 changes: 7 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Google Play Services Version (eg: 8.4.0):


### Does this change any of the generated binding API's?


### Describe your contribution
### Google Play Services Version (eg: 8.4.0):


### Does this change any of the generated binding API's?


### Describe your contribution
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ output/
*.xam
*.DS_Store
*.pidb
*.user
*.userprefs
*.dotSettings
*.suo
@@ -28,4 +29,11 @@ Details.md
generated.targets
.droidres
cake.sh
cake.sh.commit
cake.sh.commit
/.vs
.vs/
tools/
.vscode/
generated
binderator
models.json
59 changes: 0 additions & 59 deletions GooglePlayServices.TypeForwarders.sln

This file was deleted.

Loading

0 comments on commit af4d43b

Please sign in to comment.