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

Commit

Permalink
Merge branch '11.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
Redth committed Dec 8, 2017
2 parents 1288c79 + d93860b commit c7a4634
Show file tree
Hide file tree
Showing 556 changed files with 5,373 additions and 6,245 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tools/
tools/**
!tools/packages.config
bin/
obj/
packages/
Expand All @@ -18,10 +19,13 @@ output/
*.nuspec
!*.template.nuspec
*/nuget/*.targets
!obsolete.targets

Resource.designer.cs
component.yaml
GettingStarted.md
Details.md
generated.targets
.droidres
cake.sh
cake.sh.commit
77 changes: 56 additions & 21 deletions GooglePlayServices.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cast", "cast\source\Cast.cs
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drive", "drive\source\Drive.csproj", "{8BAFA1ED-B5D9-49ED-A553-E557D2A0357F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitness", "fitness\source\Fitness.csproj", "{8900C5EF-1182-4E8B-88FE-596EC2DB379D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Location", "location\source\Location.csproj", "{F666DC89-9CE4-491C-8450-6FBC70298FA3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maps", "maps\source\Maps.csproj", "{7CB92D61-E2FF-472A-9FDF-7E42D15B3EE6}"
Expand All @@ -37,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plus", "plus\source\Plus.cs
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafetyNet", "safetynet\source\SafetyNet.csproj", "{7A015585-036A-4BD1-8D46-A669EFA89743}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SupportWearable", "support-wearable\source\SupportWearable.csproj", "{7DD8E926-9F75-4F25-95A3-920A5FF48EF8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vision", "vision\source\Vision.csproj", "{72CC5E29-5EA5-40E3-98E4-87ED8AB75589}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wallet", "wallet\source\Wallet.csproj", "{7AF74235-AEE2-4F3A-AEDB-7504ED93DDC0}"
Expand Down Expand Up @@ -95,8 +91,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basement.BuildTasks.Tests",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cast.Framework", "cast-framework\source\Cast.Framework.csproj", "{159A8C21-0A5B-4D99-9E07-6466F8E98AF7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clearcut", "clearcut\source\Clearcut.csproj", "{44CF1968-FCDA-4141-AE78-1EFD12DDF7D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gass", "gass\source\Gass.csproj", "{D705BF83-81FD-4CD9-AF3B-09C50FF42C83}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Places", "places\source\Places.csproj", "{D42D621B-0370-44F6-A58E-0749629F9F4D}"
Expand All @@ -109,6 +103,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagManager.V4.Impl", "tagma
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-AppIndexing", "firebase-appindexing\source\Firebase-AppIndexing.csproj", "{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Dynamic-Links", "firebase-dynamic-links\source\Firebase-Dynamic-Links.csproj", "{9FB742FE-1645-4A5B-B41B-2F0BBBE7F2BE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Perf", "firebase-perf\source\Firebase-Perf.csproj", "{2233FF89-3CDD-4FA5-844E-A43EDAE8463F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Auth-Api-Phone", "auth-api-phone\source\Auth-Api-Phone.csproj", "{B797EA6B-9566-4980-9665-F808C953B24D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oss-Licenses", "oss-licenses\source\Oss-Licenses.csproj", "{DCCFBAD3-A366-4C61-B56F-DBD46D68980F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vision-Common", "vision-common\source\Vision-Common.csproj", "{148E13D5-9D81-4937-801D-A8DF043B2A4F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitness", "fitness\source\Fitness.csproj", "{8900C5EF-1182-4E8B-88FE-596EC2DB379D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fido", "fido\source\Fido.csproj", "{B78600C5-A46A-4BEA-A060-D8074FA31469}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Firestore", "firebase-firestore\source\Firebase-Firestore.csproj", "{7A3C38F7-AD6A-4BF4-9F63-3C0B0A82FB5A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -191,18 +201,10 @@ Global
{7CB92D61-E2FF-472A-9FDF-7E42D15B3EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CB92D61-E2FF-472A-9FDF-7E42D15B3EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CB92D61-E2FF-472A-9FDF-7E42D15B3EE6}.Release|Any CPU.Build.0 = Release|Any CPU
{7DD8E926-9F75-4F25-95A3-920A5FF48EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DD8E926-9F75-4F25-95A3-920A5FF48EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DD8E926-9F75-4F25-95A3-920A5FF48EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DD8E926-9F75-4F25-95A3-920A5FF48EF8}.Release|Any CPU.Build.0 = Release|Any CPU
{865652D3-8D1A-4779-92FC-4C54719286B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{865652D3-8D1A-4779-92FC-4C54719286B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{865652D3-8D1A-4779-92FC-4C54719286B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{865652D3-8D1A-4779-92FC-4C54719286B7}.Release|Any CPU.Build.0 = Release|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Release|Any CPU.Build.0 = Release|Any CPU
{8BAFA1ED-B5D9-49ED-A553-E557D2A0357F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BAFA1ED-B5D9-49ED-A553-E557D2A0357F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BAFA1ED-B5D9-49ED-A553-E557D2A0357F}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -291,10 +293,6 @@ Global
{159A8C21-0A5B-4D99-9E07-6466F8E98AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{159A8C21-0A5B-4D99-9E07-6466F8E98AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{159A8C21-0A5B-4D99-9E07-6466F8E98AF7}.Release|Any CPU.Build.0 = Release|Any CPU
{44CF1968-FCDA-4141-AE78-1EFD12DDF7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{44CF1968-FCDA-4141-AE78-1EFD12DDF7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{44CF1968-FCDA-4141-AE78-1EFD12DDF7D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{44CF1968-FCDA-4141-AE78-1EFD12DDF7D6}.Release|Any CPU.Build.0 = Release|Any CPU
{D705BF83-81FD-4CD9-AF3B-09C50FF42C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D705BF83-81FD-4CD9-AF3B-09C50FF42C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D705BF83-81FD-4CD9-AF3B-09C50FF42C83}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -319,6 +317,38 @@ Global
{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}.Release|Any CPU.Build.0 = Release|Any CPU
{9FB742FE-1645-4A5B-B41B-2F0BBBE7F2BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FB742FE-1645-4A5B-B41B-2F0BBBE7F2BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FB742FE-1645-4A5B-B41B-2F0BBBE7F2BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FB742FE-1645-4A5B-B41B-2F0BBBE7F2BE}.Release|Any CPU.Build.0 = Release|Any CPU
{2233FF89-3CDD-4FA5-844E-A43EDAE8463F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2233FF89-3CDD-4FA5-844E-A43EDAE8463F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2233FF89-3CDD-4FA5-844E-A43EDAE8463F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2233FF89-3CDD-4FA5-844E-A43EDAE8463F}.Release|Any CPU.Build.0 = Release|Any CPU
{B797EA6B-9566-4980-9665-F808C953B24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B797EA6B-9566-4980-9665-F808C953B24D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B797EA6B-9566-4980-9665-F808C953B24D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B797EA6B-9566-4980-9665-F808C953B24D}.Release|Any CPU.Build.0 = Release|Any CPU
{DCCFBAD3-A366-4C61-B56F-DBD46D68980F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCCFBAD3-A366-4C61-B56F-DBD46D68980F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCCFBAD3-A366-4C61-B56F-DBD46D68980F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCCFBAD3-A366-4C61-B56F-DBD46D68980F}.Release|Any CPU.Build.0 = Release|Any CPU
{148E13D5-9D81-4937-801D-A8DF043B2A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{148E13D5-9D81-4937-801D-A8DF043B2A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{148E13D5-9D81-4937-801D-A8DF043B2A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{148E13D5-9D81-4937-801D-A8DF043B2A4F}.Release|Any CPU.Build.0 = Release|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8900C5EF-1182-4E8B-88FE-596EC2DB379D}.Release|Any CPU.Build.0 = Release|Any CPU
{B78600C5-A46A-4BEA-A060-D8074FA31469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B78600C5-A46A-4BEA-A060-D8074FA31469}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B78600C5-A46A-4BEA-A060-D8074FA31469}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B78600C5-A46A-4BEA-A060-D8074FA31469}.Release|Any CPU.Build.0 = Release|Any CPU
{7A3C38F7-AD6A-4BF4-9F63-3C0B0A82FB5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A3C38F7-AD6A-4BF4-9F63-3C0B0A82FB5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A3C38F7-AD6A-4BF4-9F63-3C0B0A82FB5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A3C38F7-AD6A-4BF4-9F63-3C0B0A82FB5A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
Expand All @@ -330,15 +360,13 @@ Global
{A0CDF507-32B7-4994-8248-94FAB8646E35} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{C1A9C587-B744-44D2-AD42-14386D424667} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{8BAFA1ED-B5D9-49ED-A553-E557D2A0357F} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{8900C5EF-1182-4E8B-88FE-596EC2DB379D} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{F666DC89-9CE4-491C-8450-6FBC70298FA3} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{7CB92D61-E2FF-472A-9FDF-7E42D15B3EE6} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{5DF42846-151E-40CD-A349-C0A0C6216F7B} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{A7ADD277-FCAB-46D5-8F18-2E4BFFDA3AE7} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{9E3CD219-C950-4AA9-88E5-818F42C12566} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{A2B43C02-A237-4222-999E-3354CBB6DB8D} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{7A015585-036A-4BD1-8D46-A669EFA89743} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{7DD8E926-9F75-4F25-95A3-920A5FF48EF8} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{72CC5E29-5EA5-40E3-98E4-87ED8AB75589} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{7AF74235-AEE2-4F3A-AEDB-7504ED93DDC0} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{92BDA198-6A78-4408-844C-CAAF4C04EAFD} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
Expand All @@ -365,12 +393,19 @@ Global
{21D99A15-AB98-4691-A45B-D236B2A91DEB} = {3330092C-6EB0-4AB6-9901-2F4070E2FD81}
{76CDBE93-0177-4980-8514-C4D785E1DC78} = {3330092C-6EB0-4AB6-9901-2F4070E2FD81}
{159A8C21-0A5B-4D99-9E07-6466F8E98AF7} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{44CF1968-FCDA-4141-AE78-1EFD12DDF7D6} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{D705BF83-81FD-4CD9-AF3B-09C50FF42C83} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{D42D621B-0370-44F6-A58E-0749629F9F4D} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{541FC839-6065-4681-B6A4-C3BF358F78E9} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{D7F811D2-C5E2-45BB-B7AB-88F7941A24B7} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{ED50788D-0553-48A2-A47A-6AD1C9DF41BE} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562} = {1EC5651F-83A6-4862-AED2-6BE5103652D0}
{9FB742FE-1645-4A5B-B41B-2F0BBBE7F2BE} = {1EC5651F-83A6-4862-AED2-6BE5103652D0}
{2233FF89-3CDD-4FA5-844E-A43EDAE8463F} = {1EC5651F-83A6-4862-AED2-6BE5103652D0}
{B797EA6B-9566-4980-9665-F808C953B24D} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{DCCFBAD3-A366-4C61-B56F-DBD46D68980F} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{148E13D5-9D81-4937-801D-A8DF043B2A4F} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{8900C5EF-1182-4E8B-88FE-596EC2DB379D} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{B78600C5-A46A-4BEA-A060-D8074FA31469} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E}
{7A3C38F7-AD6A-4BF4-9F63-3C0B0A82FB5A} = {1EC5651F-83A6-4862-AED2-6BE5103652D0}
EndGlobalSection
EndGlobal
41 changes: 41 additions & 0 deletions Metadata.Common.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<metadata>

<!-- Fix up some possible covariant return type errors -->
<attr path="/api/package/class/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
<attr path="/api/package/class/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>

<!-- We don't want to subclass this type, it will change the base type on a bunch of things from past versions -->
<add-node path="/api/package/*[@extends='com.google.android.gms.common.internal.safeparcel.zza']">
<implements name="android.os.Parcelable" name-generic-aware="android.os.Parcelable"></implements>
</add-node>
<attr path="/api/package/*[@extends='com.google.android.gms.common.internal.safeparcel.zza']" name="extends">java.lang.Object</attr>
<attr path="/api/package/*[@extends='com.google.android.gms.common.internal.safeparcel.zza']" name="extends-generic-aware">java.lang.Object</attr>






<add-node path="/api/package/*[@extends='com.google.android.gms.internal.zzbck' and @name != 'BitmapTeleporter' and @name != 'GoogleSignInAccount' and @name != 'GoogleSignInOptions']">
<implements name="android.os.Parcelable" name-generic-aware="android.os.Parcelable"></implements>
<method abstract="false" deprecated="not deprecated" final="true" name="describeContents" native="false" return="int" static="false" synchronized="false" visibility="public"></method>
</add-node>
<attr path="/api/package/*[@extends='com.google.android.gms.internal.zzbck']" name="extends">java.lang.Object</attr>

<remove-node path="/api/package/*/implements[@name='com.google.android.gms.internal.zzbco']" />


<add-node path="/api/package/*[not(implements/@name='android.os.Parcelable')]/implements[@name='com.google.android.gms.common.internal.ReflectedParcelable']/..">
<implements name="android.os.Parcelable" name-generic-aware="android.os.Parcelable"></implements>
</add-node>
<remove-node path="/api/package/*/implements[@name='com.google.android.gms.common.internal.ReflectedParcelable']" />


<add-node path="/api/package/*[not(implements/@name='android.os.Parcelable') and @extends='com.google.android.gms.common.internal.DowngradeableSafeParcel']">
<implements name="android.os.Parcelable" name-generic-aware="android.os.Parcelable"></implements>
</add-node>
<attr path="/api/package/*[@extends='com.google.android.gms.common.internal.DowngradeableSafeParcel']" name="extends">java.lang.Object</attr>
<attr path="/api/package/*[@extends='com.google.android.gms.common.internal.DowngradeableSafeParcel']" name="extends-generic-aware">java.lang.Object</attr>

<remove-node path="/api/package/*/implements[@name='com.google.android.gms.common.internal.DowngradeableSafeParcel']" />
</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
The Google Mobile Ads SDK is the latest generation in Google mobile advertising, featuring refined ad formats and streamlined APIs for access to mobile ad networks and advertising solutions. The SDK enables mobile app developers to maximize their monetization in native mobile apps.
</description>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://github.com/xamarin/GooglePlayServicesComponents/</projectUrl>
<projectUrl>https://github.com/xamarin/googleplayservicescomponents</projectUrl>
<licenseUrl>https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md</licenseUrl>
<iconUrl>https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-ads-lite_128x128.png</iconUrl>
<dependencies>
<group targetFramework="MonoAndroid70">
<group targetFramework="MonoAndroid80">
<dependency id="Xamarin.GooglePlayServices.Basement" version="[$version$]" />
</group>
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.GooglePlayServices.Ads.Lite.dll" target="lib/MonoAndroid70" />
<file src="output/Xamarin.GooglePlayServices.Ads.Lite.dll" target="lib/MonoAndroid80" />

<file src="ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.targets" target="build/MonoAndroid70" />
<file src="ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.targets" target="build/MonoAndroid80" />
</files>
</package>
15 changes: 7 additions & 8 deletions ads-lite/source/Ads.Lite.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -14,7 +13,7 @@
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AssemblyName>Xamarin.GooglePlayServices.Ads.Lite</AssemblyName>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<AndroidClassParser>class-parse</AndroidClassParser>
<DroidDocPaths>..\..\externals\docs\reference</DroidDocPaths>
<AndroidTlsProvider></AndroidTlsProvider>
Expand Down Expand Up @@ -50,16 +49,15 @@
</ItemGroup>
<ItemGroup>
<None Include="Jars\AboutJars.txt" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\EnumFields.xml" />
<TransformFile Include="Transforms\EnumMethods.xml" />
<TransformFile Include="Transforms\Metadata.xml" />
<TransformFile Include="Transforms\Metadata.generated.xml" />
<TransformFile Include="..\..\Metadata.Common.xml">
<Link>Transforms\Metadata.Common.xml</Link>
</TransformFile>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<Import Project="..\..\generated.targets" />
<ItemGroup>
<ProjectReference Include="..\..\basement\source\Basement.csproj">
<Project>{6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}</Project>
Expand All @@ -72,7 +70,8 @@
</InputJar>
</ItemGroup>
<ItemGroup>
<Folder Include="Additions\" />
<PackageReference Include="Xamarin.Build.Download" Version="0.4.7" />
</ItemGroup>
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.2\build\Xamarin.Build.Download.targets')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<Import Project="..\..\generated.targets" />
</Project>
7 changes: 6 additions & 1 deletion ads-lite/source/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

Expand All @@ -25,3 +25,8 @@

//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]

[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
2 changes: 0 additions & 2 deletions ads-lite/source/Transforms/Metadata.generated.xml

This file was deleted.

Loading

0 comments on commit c7a4634

Please sign in to comment.