diff --git a/.gitignore b/.gitignore index 6e70e68df..5a6a48d14 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,11 @@ output/ *.nuspec !*.template.nuspec +*/nuget/*.targets Resource.designer.cs component.yaml GettingStarted.md Details.md +generated.targets +.droidres diff --git a/GooglePlayServices.sln b/GooglePlayServices.sln index 7007962b5..1fcba6dfe 100644 --- a/GooglePlayServices.sln +++ b/GooglePlayServices.sln @@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gcm", "gcm\source\Gcm.cspro EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Analytics", "analytics\source\Analytics.csproj", "{EA04524D-2A97-4ED0-AD74-21F8C30DF4A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppIndexing", "appindexing\source\AppIndexing.csproj", "{A069B942-EE12-4283-8C4C-F46549D3978A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppInvite", "appinvite\source\AppInvite.csproj", "{A069B942-EE12-4283-9C4C-F46549D3978A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Auth", "auth\source\Auth.csproj", "{A0CDF507-32B7-4994-8248-94FAB8646E35}" @@ -77,12 +75,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Config", "firebase EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Crash", "firebase-crash\source\Firebase-Crash.csproj", "{7076C84E-08AE-404B-8F3C-8F66010FA1B1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth-Common", "firebase-auth-common\source\Firebase-Auth-Common.csproj", "{F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth", "firebase-auth\source\Firebase-Auth.csproj", "{62946D89-B6B1-4A38-A04D-C20912087EFD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth-Module", "firebase-auth-module\source\Firebase-Auth-Module.csproj", "{7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Database-Connection", "firebase-database-connection\source\Firebase-Database-Connection.csproj", "{2858C3DB-1E15-4D12-AF09-02CFD624ADD4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Database", "firebase-database\source\Firebase-Database.csproj", "{B02737A0-890C-4921-83A5-D77CFB8A6899}" @@ -111,6 +105,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Awareness", "awareness\sour EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantApps", "instantapps\source\InstantApps.csproj", "{D7F811D2-C5E2-45BB-B7AB-88F7941A24B7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagManager.V4.Impl", "tagmanager-v4-impl\source\TagManager.V4.Impl.csproj", "{ED50788D-0553-48A2-A47A-6AD1C9DF41BE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-AppIndexing", "firebase-appindexing\source\Firebase-AppIndexing.csproj", "{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -193,10 +191,6 @@ 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 - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.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 @@ -225,10 +219,6 @@ Global {9F7F996D-AF44-4947-8392-07B3ED2ED00D}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F7F996D-AF44-4947-8392-07B3ED2ED00D}.Release|Any CPU.ActiveCfg = Release|Any CPU {9F7F996D-AF44-4947-8392-07B3ED2ED00D}.Release|Any CPU.Build.0 = Release|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Release|Any CPU.Build.0 = Release|Any CPU {A069B942-EE12-4283-9C4C-F46549D3978A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A069B942-EE12-4283-9C4C-F46549D3978A}.Debug|Any CPU.Build.0 = Debug|Any CPU {A069B942-EE12-4283-9C4C-F46549D3978A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -289,10 +279,6 @@ Global {ECB1F68B-B588-4F3B-9A86-510CF4AAA784}.Debug|Any CPU.Build.0 = Debug|Any CPU {ECB1F68B-B588-4F3B-9A86-510CF4AAA784}.Release|Any CPU.ActiveCfg = Release|Any CPU {ECB1F68B-B588-4F3B-9A86-510CF4AAA784}.Release|Any CPU.Build.0 = Release|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Release|Any CPU.Build.0 = Release|Any CPU {F666DC89-9CE4-491C-8450-6FBC70298FA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F666DC89-9CE4-491C-8450-6FBC70298FA3}.Debug|Any CPU.Build.0 = Debug|Any CPU {F666DC89-9CE4-491C-8450-6FBC70298FA3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -325,6 +311,14 @@ Global {D7F811D2-C5E2-45BB-B7AB-88F7941A24B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7F811D2-C5E2-45BB-B7AB-88F7941A24B7}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7F811D2-C5E2-45BB-B7AB-88F7941A24B7}.Release|Any CPU.Build.0 = Release|Any CPU + {ED50788D-0553-48A2-A47A-6AD1C9DF41BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED50788D-0553-48A2-A47A-6AD1C9DF41BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED50788D-0553-48A2-A47A-6AD1C9DF41BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED50788D-0553-48A2-A47A-6AD1C9DF41BE}.Release|Any CPU.Build.0 = Release|Any CPU + {8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 EndGlobalSection GlobalSection(NestedProjects) = preSolution {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} @@ -332,7 +326,6 @@ Global {09362350-BB7F-4B4C-83B5-97F5C439B649} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} {1CE82D7E-9EA1-435F-AF8C-5E07AB917617} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} {EA04524D-2A97-4ED0-AD74-21F8C30DF4A5} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} - {A069B942-EE12-4283-8C4C-F46549D3978A} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} {A069B942-EE12-4283-9C4C-F46549D3978A} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} {A0CDF507-32B7-4994-8248-94FAB8646E35} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} {C1A9C587-B744-44D2-AD42-14386D424667} = {AFB1EDA0-E0D2-4E95-BAEC-9781B046413E} @@ -363,9 +356,7 @@ Global {CFB0A03A-F787-4EE9-9EA6-8A2A65E82704} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} {00F7A18F-D2C4-4014-8E4C-552A0A0B0967} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} {7076C84E-08AE-404B-8F3C-8F66010FA1B1} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} {62946D89-B6B1-4A38-A04D-C20912087EFD} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} {2858C3DB-1E15-4D12-AF09-02CFD624ADD4} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} {B02737A0-890C-4921-83A5-D77CFB8A6899} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} {2E333450-68BD-48C5-9540-CFA7A053DCA1} = {1EC5651F-83A6-4862-AED2-6BE5103652D0} @@ -379,5 +370,7 @@ Global {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} EndGlobalSection EndGlobal diff --git a/GpsConsts.cs b/GpsConsts.cs index 1b44dce25..d30b8abd6 100644 --- a/GpsConsts.cs +++ b/GpsConsts.cs @@ -3,9 +3,9 @@ // https://dl-ssl.google.com/android/repository/addon.xml static class __GpsConsts { - public const string Url = "https://dl-ssl.google.com/android/repository/google_m2repository_r36.zip"; - public const string Sha1sum = "fa55e43b0175167da7f8cbedea35331cd448cf9b"; - public const string Version = "9.6.1"; + public const string Url = "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc41_wear_2a3.zip"; + public const string Sha1sum = "12d2355caafea06987c8323fa53c3ecc61477a35"; + public const string Version = "10.0.0"; public const string WearVersion = "1.4.0"; public const string PackageName = "Xamarin.GooglePlayServices"; } diff --git a/ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.template.nuspec b/ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.template.nuspec index cee39994a..3666d1b74 100644 --- a/ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.template.nuspec +++ b/ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.template.nuspec @@ -18,10 +18,14 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-ads-lite_128x128.png - + + + + + diff --git a/ads-lite/source/Additions/Manifest.cs b/ads-lite/source/Additions/Manifest.cs deleted file mode 100644 index 04efd3f2d..000000000 --- a/ads-lite/source/Additions/Manifest.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using Android.App; -using Android.Content; -using Android.Runtime; - -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] - -namespace Android.Gms.Ads -{ -// - [Activity ( - Name="com.google.android.gms.ads.AdActivity", - ConfigurationChanges = Android.Content.PM.ConfigChanges.Keyboard - | Android.Content.PM.ConfigChanges.KeyboardHidden - | Android.Content.PM.ConfigChanges.Orientation - | Android.Content.PM.ConfigChanges.ScreenLayout - | Android.Content.PM.ConfigChanges.UiMode - | Android.Content.PM.ConfigChanges.ScreenSize - | Android.Content.PM.ConfigChanges.SmallestScreenSize, - Theme = "@android:style/Theme.Translucent")] - partial class AdActivity { } -} - -namespace Android.Gms.Ads.Purchase -{ -// - [Activity ( - Name="com.google.android.gms.ads.purchase.InAppPurchaseActivity", - Theme="@style/Theme.IAPTheme")] - partial class InAppPurchaseActivity { } -} - diff --git a/ads-lite/source/Ads.Lite.csproj b/ads-lite/source/Ads.Lite.csproj index 104b36763..40b8d824e 100644 --- a/ads-lite/source/Ads.Lite.csproj +++ b/ads-lite/source/Ads.Lite.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ v7.0 class-parse ..\..\externals\docs\reference + true @@ -45,14 +47,10 @@ - - Properties\GpsConsts.cs - - - + @@ -61,6 +59,7 @@ + {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} @@ -72,4 +71,8 @@ Jars\play-services-ads-lite.jar + + + + diff --git a/ads-lite/source/Properties/AssemblyInfo.cs b/ads-lite/source/Properties/AssemblyInfo.cs index 3e0329490..c4f9577dc 100644 --- a/ads-lite/source/Properties/AssemblyInfo.cs +++ b/ads-lite/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-ads-lite/" + __GpsConsts.Version + "/play-services-ads-lite-" + __GpsConsts.Version + ".aar"; -} diff --git a/ads-lite/source/Transforms/Metadata.xml b/ads-lite/source/Transforms/Metadata.xml index 46e463aff..a01213ba0 100644 --- a/ads-lite/source/Transforms/Metadata.xml +++ b/ads-lite/source/Transforms/Metadata.xml @@ -5,7 +5,6 @@ Google.Ads.Mediation Google.Ads.Mediation.Admob Google.Ads.Mediation.CustomEvent - Google.Ads.Afma.Nano Android.Gms.Ads Android.Gms.Ads.Formats @@ -38,12 +37,6 @@ - - source - size - dest - flags - public @@ -102,6 +95,6 @@ adapter adapter - ad + diff --git a/ads-lite/source/packages.config b/ads-lite/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/ads-lite/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ads/component/component.template.yaml b/ads/component/component.template.yaml index a8a34572a..008730490 100644 --- a/ads/component/component.template.yaml +++ b/ads/component/component.template.yaml @@ -33,5 +33,7 @@ samples: - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Ads - Xamarin.GooglePlayServices.Ads.Lite + removeNodes: + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/ads/nuget/Xamarin.GooglePlayServices.Ads.template.nuspec b/ads/nuget/Xamarin.GooglePlayServices.Ads.template.nuspec index c02bd92a5..56558c74b 100644 --- a/ads/nuget/Xamarin.GooglePlayServices.Ads.template.nuspec +++ b/ads/nuget/Xamarin.GooglePlayServices.Ads.template.nuspec @@ -18,14 +18,18 @@ http://components.xamarin.com/license/googleplayservices-ads/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-ads_128x128.png - - - - - + + + + + + + + + diff --git a/ads/samples/AdMobSample/AdMobSample.csproj b/ads/samples/AdMobSample/AdMobSample.csproj index 6d1e45743..2c2428402 100644 --- a/ads/samples/AdMobSample/AdMobSample.csproj +++ b/ads/samples/AdMobSample/AdMobSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -47,22 +48,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -118,5 +119,25 @@ {3F6BAE25-ADEB-468C-8384-AD655623C341} Base + + {D705BF83-81FD-4CD9-AF3B-09C50FF42C83} + Gass + + + {44CF1968-FCDA-4141-AE78-1EFD12DDF7D6} + Clearcut + + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + + + + + + + + \ No newline at end of file diff --git a/ads/samples/AdMobSample/packages.config b/ads/samples/AdMobSample/packages.config index 71e0c9953..247b0876a 100644 --- a/ads/samples/AdMobSample/packages.config +++ b/ads/samples/AdMobSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/ads/source/Additions/AboutAdditions.txt b/ads/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/ads/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/ads/source/Ads.csproj b/ads/source/Ads.csproj index 2c8e10b97..768099b19 100644 --- a/ads/source/Ads.csproj +++ b/ads/source/Ads.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ v7.0 class-parse ..\..\externals\docs\reference + true @@ -45,13 +47,10 @@ - - Properties\GpsConsts.cs - - + @@ -65,6 +64,7 @@ + {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} @@ -87,4 +87,8 @@ Gass + + + + diff --git a/ads/source/Properties/AssemblyInfo.cs b/ads/source/Properties/AssemblyInfo.cs index a3d830eba..32788e3bc 100644 --- a/ads/source/Properties/AssemblyInfo.cs +++ b/ads/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-ads/" + __GpsConsts.Version + "/play-services-ads-" + __GpsConsts.Version + ".aar"; -} diff --git a/ads/source/packages.config b/ads/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/ads/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/all/samples/GpsBuildAll/GpsBuildAll.csproj b/all/samples/GpsBuildAll/GpsBuildAll.csproj index 854423009..b71f191ae 100644 --- a/all/samples/GpsBuildAll/GpsBuildAll.csproj +++ b/all/samples/GpsBuildAll/GpsBuildAll.csproj @@ -49,31 +49,31 @@ - ..\..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -229,18 +229,10 @@ {B04C50F7-B0CC-4170-8820-9D584E1C0ED3} Auth.Base - - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F} - Firebase-Auth-Common - {62946D89-B6B1-4A38-A04D-C20912087EFD} Firebase-Auth - - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} - Firebase-Auth-Module - {00F7A18F-D2C4-4014-8E4C-552A0A0B0967} Firebase-Config @@ -298,5 +290,6 @@ Places - + + \ No newline at end of file diff --git a/all/samples/GpsBuildAll/packages.config b/all/samples/GpsBuildAll/packages.config index 55bb22259..07aa63fcb 100644 --- a/all/samples/GpsBuildAll/packages.config +++ b/all/samples/GpsBuildAll/packages.config @@ -1,12 +1,12 @@  - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/analytics-impl/nuget/Xamarin.GooglePlayServices.Analytics.Impl.template.nuspec b/analytics-impl/nuget/Xamarin.GooglePlayServices.Analytics.Impl.template.nuspec index 76e7b80ad..a8f0bd322 100644 --- a/analytics-impl/nuget/Xamarin.GooglePlayServices.Analytics.Impl.template.nuspec +++ b/analytics-impl/nuget/Xamarin.GooglePlayServices.Analytics.Impl.template.nuspec @@ -18,11 +18,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-analytics-impl_128x128.png - - + + + + + + diff --git a/analytics-impl/source/Additions/AboutAdditions.txt b/analytics-impl/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/analytics-impl/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/analytics-impl/source/Additions/IPendingResultExtensions.cs b/analytics-impl/source/Additions/IPendingResultExtensions.cs deleted file mode 100644 index 2c39d643a..000000000 --- a/analytics-impl/source/Additions/IPendingResultExtensions.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Threading.Tasks; -using Android.Gms.Common.Apis; -using Android.Runtime; - -namespace Android.Gms.Tagmanager { - public partial class TagManagerClass { - public async Task LoadContainerDefaultOnlyAsync (string containerId, int defaultContainerResourceId) { - return (await LoadContainerDefaultOnly (containerId, defaultContainerResourceId)).JavaCast (); - } - - public async Task LoadContainerDefaultOnlyAsync (string containerId, int defaultContainerResourceId, Android.OS.Handler handler) { - return (await LoadContainerDefaultOnly (containerId, defaultContainerResourceId, handler)).JavaCast (); - } - - public async Task LoadContainerPreferFreshAsync (string containerId, int defaultContainerResourceId) { - return (await LoadContainerPreferFresh (containerId, defaultContainerResourceId)).JavaCast (); - } - - public async Task LoadContainerPreferFreshAsync (string containerId, int defaultContainerResourceId, Android.OS.Handler handler) { - return (await LoadContainerPreferFresh (containerId, defaultContainerResourceId, handler)).JavaCast (); - } - - public async Task LoadContainerPreferNonDefaultAsync (string containerId, int defaultContainerResourceId) { - return (await LoadContainerPreferNonDefault (containerId, defaultContainerResourceId)).JavaCast (); - } - - public async Task LoadContainerPreferNonDefaultAsync (string containerId, int defaultContainerResourceId, Android.OS.Handler handler) { - return (await LoadContainerPreferNonDefault (containerId, defaultContainerResourceId, handler)).JavaCast (); - } - } -} \ No newline at end of file diff --git a/analytics-impl/source/Additions/Manifest.cs b/analytics-impl/source/Additions/Manifest.cs deleted file mode 100644 index 880851cfd..000000000 --- a/analytics-impl/source/Additions/Manifest.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] -[assembly: UsesPermission (Android.Manifest.Permission.WakeLock)] diff --git a/analytics-impl/source/Analytics.Impl.csproj b/analytics-impl/source/Analytics.Impl.csproj index ffb24812b..7987a26fb 100644 --- a/analytics-impl/source/Analytics.Impl.csproj +++ b/analytics-impl/source/Analytics.Impl.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ v7.0 class-parse ..\..\externals\docs\reference + true @@ -45,15 +47,10 @@ - - - Properties\GpsConsts.cs - - - + @@ -67,6 +64,7 @@ + {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} @@ -77,4 +75,8 @@ Base + + + + diff --git a/analytics-impl/source/Properties/AssemblyInfo.cs b/analytics-impl/source/Properties/AssemblyInfo.cs index a1f951024..96c59f474 100644 --- a/analytics-impl/source/Properties/AssemblyInfo.cs +++ b/analytics-impl/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-analytics-impl/" + __GpsConsts.Version + "/play-services-analytics-impl-" + __GpsConsts.Version + ".aar"; -} diff --git a/analytics-impl/source/Transforms/Metadata.xml b/analytics-impl/source/Transforms/Metadata.xml index 8bf27525f..cbef8e0b3 100644 --- a/analytics-impl/source/Transforms/Metadata.xml +++ b/analytics-impl/source/Transforms/Metadata.xml @@ -36,6 +36,10 @@ public + + false + false + com.google.android.gms.analytics.HitBuilders.HitBuilder com.google.android.gms.analytics.HitBuilders.HitBuilder diff --git a/analytics-impl/source/packages.config b/analytics-impl/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/analytics-impl/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/analytics/component/component.template.yaml b/analytics/component/component.template.yaml index 59ea23ccc..a768b1249 100644 --- a/analytics/component/component.template.yaml +++ b/analytics/component/component.template.yaml @@ -21,6 +21,7 @@ samples: - Tasks - Analytics - Analytics.Impl + - TagManager.V4.Impl installNuGets: - project: AnalyticsSample packages: @@ -29,5 +30,8 @@ samples: - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Analytics - Xamarin.GooglePlayServices.Analytics.Impl + - Xamarin.GooglePlayServices.TagManager.V4.Impl + removeNodes: + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/analytics/nuget/Xamarin.GooglePlayServices.Analytics.template.nuspec b/analytics/nuget/Xamarin.GooglePlayServices.Analytics.template.nuspec index 91c8d2c44..06740e7c6 100644 --- a/analytics/nuget/Xamarin.GooglePlayServices.Analytics.template.nuspec +++ b/analytics/nuget/Xamarin.GooglePlayServices.Analytics.template.nuspec @@ -18,12 +18,17 @@ http://components.xamarin.com/license/googleplayservices-analytics/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-analytics_128x128.png - - - + + + + + + + + diff --git a/analytics/samples/AnalyticsSample/AnalyticsSample.csproj b/analytics/samples/AnalyticsSample/AnalyticsSample.csproj index 96b1d7fe7..3d849a355 100644 --- a/analytics/samples/AnalyticsSample/AnalyticsSample.csproj +++ b/analytics/samples/AnalyticsSample/AnalyticsSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -46,31 +47,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -133,5 +134,15 @@ Tasks - + + + + + + + + + + + \ No newline at end of file diff --git a/analytics/samples/AnalyticsSample/packages.config b/analytics/samples/AnalyticsSample/packages.config index 55bb22259..3f96dfaed 100644 --- a/analytics/samples/AnalyticsSample/packages.config +++ b/analytics/samples/AnalyticsSample/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/analytics/source/Additions/AboutAdditions.txt b/analytics/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/analytics/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/analytics/source/Additions/Manifest.cs b/analytics/source/Additions/Manifest.cs deleted file mode 100644 index 880851cfd..000000000 --- a/analytics/source/Additions/Manifest.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] -[assembly: UsesPermission (Android.Manifest.Permission.WakeLock)] diff --git a/analytics/source/Analytics.csproj b/analytics/source/Analytics.csproj index b269feb39..68bd4dc46 100644 --- a/analytics/source/Analytics.csproj +++ b/analytics/source/Analytics.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ v7.0 class-parse ..\..\externals\docs\reference + true @@ -45,14 +47,10 @@ - - Properties\GpsConsts.cs - - - + @@ -66,6 +64,7 @@ + {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} @@ -83,5 +82,13 @@ {53F87D88-8871-41A2-9F81-B79AB02FEC24} Tasks + + {ED50788D-0553-48A2-A47A-6AD1C9DF41BE} + TagManager.V4.Impl + + + + + diff --git a/analytics/source/Properties/AssemblyInfo.cs b/analytics/source/Properties/AssemblyInfo.cs index f0a1b2e20..7eb49eade 100644 --- a/analytics/source/Properties/AssemblyInfo.cs +++ b/analytics/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-analytics/" + __GpsConsts.Version + "/play-services-analytics-" + __GpsConsts.Version + ".aar"; -} diff --git a/analytics/source/Transforms/Metadata.xml b/analytics/source/Transforms/Metadata.xml index acba0a41e..b13407709 100644 --- a/analytics/source/Transforms/Metadata.xml +++ b/analytics/source/Transforms/Metadata.xml @@ -24,83 +24,6 @@ flags - containerHolder - containerVersion + - - - - - Java.Lang.Object - Java.Lang.Object - - - public - - - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - com.google.android.gms.analytics.HitBuilders.HitBuilder - - com.google.android.gms.analytics.HitBuilders.EventBuilder - com.google.android.gms.analytics.HitBuilders.EventBuilder - com.google.android.gms.analytics.HitBuilders.EventBuilder - com.google.android.gms.analytics.HitBuilders.EventBuilder - - com.google.android.gms.analytics.HitBuilders.ExceptionBuilder - com.google.android.gms.analytics.HitBuilders.ExceptionBuilder - - com.google.android.gms.analytics.HitBuilders.ItemBuilder - com.google.android.gms.analytics.HitBuilders.ItemBuilder - com.google.android.gms.analytics.HitBuilders.ItemBuilder - com.google.android.gms.analytics.HitBuilders.ItemBuilder - com.google.android.gms.analytics.HitBuilders.ItemBuilder - com.google.android.gms.analytics.HitBuilders.ItemBuilder - com.google.android.gms.analytics.HitBuilders.ItemBuilder - - com.google.android.gms.analytics.HitBuilders.SocialBuilder - com.google.android.gms.analytics.HitBuilders.SocialBuilder - com.google.android.gms.analytics.HitBuilders.SocialBuilder - - com.google.android.gms.analytics.HitBuilders.TimingBuilder - com.google.android.gms.analytics.HitBuilders.TimingBuilder - com.google.android.gms.analytics.HitBuilders.TimingBuilder - com.google.android.gms.analytics.HitBuilders.TimingBuilder - - com.google.android.gms.analytics.HitBuilders.TransactionBuilder - com.google.android.gms.analytics.HitBuilders.TransactionBuilder - com.google.android.gms.analytics.HitBuilders.TransactionBuilder - com.google.android.gms.analytics.HitBuilders.TransactionBuilder - com.google.android.gms.analytics.HitBuilders.TransactionBuilder - com.google.android.gms.analytics.HitBuilders.TransactionBuilder - - - - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - java.util.Map<java.lang.String, java.lang.String> - - - diff --git a/analytics/source/packages.config b/analytics/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/analytics/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/appindexing/nuget/Xamarin.GooglePlayServices.AppIndexing.template.nuspec b/appindexing/nuget/Xamarin.GooglePlayServices.AppIndexing.template.nuspec deleted file mode 100644 index 819d65c7f..000000000 --- a/appindexing/nuget/Xamarin.GooglePlayServices.AppIndexing.template.nuspec +++ /dev/null @@ -1,30 +0,0 @@ - - - - Xamarin.GooglePlayServices.AppIndexing - Xamarin Google Play Services - App Indexing - $version$ - Xamarin Inc. - Xamarin Inc. - true - Xamarin.Android Bindings for Google Play Services - AppIndexing $aar-version$ - - Xamarin.Android Bindings for Google Play Services - AppIndexing $aar-version$ - - App Indexing helps you get your app found in Google Search. Once your app is indexed, mobile users who search for content related to your app can see an install button to your Android app in Search results. This helps you increase your install base. - - Copyright © Microsoft Corporation - http://components.xamarin.com/view/googleplayservices-appindexing/ - http://components.xamarin.com/license/googleplayservices-appindexing/ - https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-appindexing_128x128.png - - - - - - - - - - - diff --git a/appindexing/samples/AppIndexingSample/packages.config b/appindexing/samples/AppIndexingSample/packages.config deleted file mode 100644 index 71e0c9953..000000000 --- a/appindexing/samples/AppIndexingSample/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/appindexing/source/Additions/AboutAdditions.txt b/appindexing/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/appindexing/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/appindexing/source/Properties/AssemblyInfo.cs b/appindexing/source/Properties/AssemblyInfo.cs deleted file mode 100644 index c5b1495d9..000000000 --- a/appindexing/source/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using Android.App; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("Xamarin.GooglePlayServices.AppIndexing")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("Microsoft Corporation")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-appindexing/" + __GpsConsts.Version + "/play-services-appindexing-" + __GpsConsts.Version + ".aar"; -} diff --git a/appindexing/source/packages.config b/appindexing/source/packages.config deleted file mode 100644 index 71e0c9953..000000000 --- a/appindexing/source/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/appinvite/component/component.template.yaml b/appinvite/component/component.template.yaml index 19578e717..b91ab754b 100644 --- a/appinvite/component/component.template.yaml +++ b/appinvite/component/component.template.yaml @@ -27,5 +27,7 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.AppInvite + removeNodes: + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/appinvite/nuget/Xamarin.GooglePlayServices.AppInvite.template.nuspec b/appinvite/nuget/Xamarin.GooglePlayServices.AppInvite.template.nuspec index 5dd194c2d..143ca33c1 100644 --- a/appinvite/nuget/Xamarin.GooglePlayServices.AppInvite.template.nuspec +++ b/appinvite/nuget/Xamarin.GooglePlayServices.AppInvite.template.nuspec @@ -18,12 +18,16 @@ http://components.xamarin.com/license/googleplayservices-appinvite/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-appinvite_128x128.png - - - + + + + + + + diff --git a/appinvite/samples/AppInviteSample.sln b/appinvite/samples/AppInviteSample.sln index 290c97292..630358828 100644 --- a/appinvite/samples/AppInviteSample.sln +++ b/appinvite/samples/AppInviteSample.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppInvite", "..\source\AppI EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basement", "..\..\basement\source\Basement.csproj", "{6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tasks", "..\..\tasks\source\Tasks.csproj", "{53F87D88-8871-41A2-9F81-B79AB02FEC24}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,5 +39,9 @@ Global {DF69BD26-A581-41A9-8889-289786B2F7BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF69BD26-A581-41A9-8889-289786B2F7BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF69BD26-A581-41A9-8889-289786B2F7BF}.Release|Any CPU.Build.0 = Release|Any CPU + {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/appinvite/samples/AppInviteSample/AppInviteSample.csproj b/appinvite/samples/AppInviteSample/AppInviteSample.csproj index 82a5421da..e7d682d91 100644 --- a/appinvite/samples/AppInviteSample/AppInviteSample.csproj +++ b/appinvite/samples/AppInviteSample/AppInviteSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -99,5 +100,17 @@ {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} Basement + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + + + + + + + + \ No newline at end of file diff --git a/appinvite/samples/AppInviteSample/packages.config b/appinvite/samples/AppInviteSample/packages.config index 71e0c9953..247b0876a 100644 --- a/appinvite/samples/AppInviteSample/packages.config +++ b/appinvite/samples/AppInviteSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/appinvite/source/Additions/AboutAdditions.txt b/appinvite/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/appinvite/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/appinvite/source/Additions/Manifest.cs b/appinvite/source/Additions/Manifest.cs deleted file mode 100644 index bf22b025f..000000000 --- a/appinvite/source/Additions/Manifest.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using Android.Runtime; -using Android.App; - -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] - -namespace Android.Gms.AppInvite -{ - // PACKAGE: com.google.android.gms.appinvite - -// -// -// -// -// -// - [Activity ( - Name="com.google.android.gms.appinvite.PreviewActivity", - Exported=true, - Theme="@style/Theme.AppInvite.Preview")] - [IntentFilter (new [] { "com.google.android.gms.appinvite.ACTION_PREVIEW" }, - Categories = new [] { global::Android.Content.Intent.CategoryDefault })] - partial class PreviewActivity { } -} - diff --git a/appinvite/source/AppInvite.csproj b/appinvite/source/AppInvite.csproj index be4a0b811..51bbe56f4 100644 --- a/appinvite/source/AppInvite.csproj +++ b/appinvite/source/AppInvite.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,35 +48,30 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - - @@ -104,4 +101,12 @@ + + + + + + + + diff --git a/appinvite/source/Properties/AssemblyInfo.cs b/appinvite/source/Properties/AssemblyInfo.cs index bd4545312..9ba7b52a9 100644 --- a/appinvite/source/Properties/AssemblyInfo.cs +++ b/appinvite/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-appinvite/" + __GpsConsts.Version + "/play-services-appinvite-" + __GpsConsts.Version + ".aar"; -} diff --git a/appinvite/source/packages.config b/appinvite/source/packages.config index 71e0c9953..247b0876a 100644 --- a/appinvite/source/packages.config +++ b/appinvite/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/auth-base/nuget/Xamarin.GooglePlayServices.Auth.Base.template.nuspec b/auth-base/nuget/Xamarin.GooglePlayServices.Auth.Base.template.nuspec index 484222d0d..43fa01ea9 100644 --- a/auth-base/nuget/Xamarin.GooglePlayServices.Auth.Base.template.nuspec +++ b/auth-base/nuget/Xamarin.GooglePlayServices.Auth.Base.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-auth-base_128x128.png - - + + + + + + diff --git a/auth-base/source/Additions/AboutAdditions.txt b/auth-base/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/auth-base/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/auth-base/source/Auth.Base.csproj b/auth-base/source/Auth.Base.csproj index 893bb432c..d6e62efd8 100644 --- a/auth-base/source/Auth.Base.csproj +++ b/auth-base/source/Auth.Base.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,33 +48,29 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - @@ -93,9 +91,17 @@ + Jars\play-services-auth-base.jar + + + + + + + diff --git a/auth-base/source/Properties/AssemblyInfo.cs b/auth-base/source/Properties/AssemblyInfo.cs index 530971b7d..74761f258 100644 --- a/auth-base/source/Properties/AssemblyInfo.cs +++ b/auth-base/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-auth-base/" + __GpsConsts.Version + "/play-services-auth-base-" + __GpsConsts.Version + ".aar"; -} diff --git a/auth-base/source/Transforms/Metadata.xml b/auth-base/source/Transforms/Metadata.xml index 299db595d..b93e5462c 100644 --- a/auth-base/source/Transforms/Metadata.xml +++ b/auth-base/source/Transforms/Metadata.xml @@ -21,4 +21,9 @@ dest flags + falsed + + + + diff --git a/auth-base/source/packages.config b/auth-base/source/packages.config index 71e0c9953..247b0876a 100644 --- a/auth-base/source/packages.config +++ b/auth-base/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/auth/nuget/Xamarin.GooglePlayServices.Auth.template.nuspec b/auth/nuget/Xamarin.GooglePlayServices.Auth.template.nuspec index e75c63df0..d80e49463 100644 --- a/auth/nuget/Xamarin.GooglePlayServices.Auth.template.nuspec +++ b/auth/nuget/Xamarin.GooglePlayServices.Auth.template.nuspec @@ -16,12 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-auth_128x128.png - - - + + + + + + + + diff --git a/auth/source/Additions/AboutAdditions.txt b/auth/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/auth/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/auth/source/Additions/Manifest.cs b/auth/source/Additions/Manifest.cs deleted file mode 100644 index 2cef4a085..000000000 --- a/auth/source/Additions/Manifest.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using Android.Runtime; -using Android.App; - -namespace Android.Gms.Auth.Api.SignIn.Internal -{ - // PACKAGE: com.google.android.gms.auth - -// - [Activity ( - Name="com.google.android.gms.auth.api.signin.internal.SignInHubActivity", - Theme="@android:style/Theme.Translucent.NoTitleBar", - ExcludeFromRecents=true, - Exported=false)] - partial class SignInHubActivity { } - -// -// - [Service ( - Name="com.google.android.gms.auth.api.signin.RevocationBoundService", - Exported=true, - Permission="com.google.android.gms.auth.api.signin.permission.REVOCATION_NOTIFICATION")] - partial class RevocationBoundService { } -} - diff --git a/auth/source/Auth.csproj b/auth/source/Auth.csproj index c78fc16dd..8494d6527 100644 --- a/auth/source/Auth.csproj +++ b/auth/source/Auth.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,34 +48,29 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - - @@ -101,6 +98,18 @@ {B04C50F7-B0CC-4170-8820-9D584E1C0ED3} Auth.Base + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + + + + + + + + diff --git a/auth/source/Properties/AssemblyInfo.cs b/auth/source/Properties/AssemblyInfo.cs index ee0a1453e..89c0934a8 100644 --- a/auth/source/Properties/AssemblyInfo.cs +++ b/auth/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-auth/" + __GpsConsts.Version + "/play-services-auth-" + __GpsConsts.Version + ".aar"; -} diff --git a/auth/source/packages.config b/auth/source/packages.config index 71e0c9953..247b0876a 100644 --- a/auth/source/packages.config +++ b/auth/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/awareness/nuget/Xamarin.GooglePlayServices.Awareness.template.nuspec b/awareness/nuget/Xamarin.GooglePlayServices.Awareness.template.nuspec index 4f0acb07d..9e4f35034 100644 --- a/awareness/nuget/Xamarin.GooglePlayServices.Awareness.template.nuspec +++ b/awareness/nuget/Xamarin.GooglePlayServices.Awareness.template.nuspec @@ -16,13 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-awareness_128x128.png - - - - + + + + + + + + diff --git a/awareness/source/Additions/AboutAdditions.txt b/awareness/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/awareness/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/awareness/source/Awareness.csproj b/awareness/source/Awareness.csproj index 381dca468..c73c4cf7b 100644 --- a/awareness/source/Awareness.csproj +++ b/awareness/source/Awareness.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,34 +48,30 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - @@ -102,9 +100,17 @@ + Jars\play-services-awareness.jar + + + + + + + diff --git a/awareness/source/Properties/AssemblyInfo.cs b/awareness/source/Properties/AssemblyInfo.cs index e13180aa5..a819419c2 100644 --- a/awareness/source/Properties/AssemblyInfo.cs +++ b/awareness/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-awareness/" + __GpsConsts.Version + "/play-services-awareness-" + __GpsConsts.Version + ".aar"; -} diff --git a/awareness/source/packages.config b/awareness/source/packages.config index 71e0c9953..247b0876a 100644 --- a/awareness/source/packages.config +++ b/awareness/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/base/nuget/Xamarin.GooglePlayServices.Base.template.nuspec b/base/nuget/Xamarin.GooglePlayServices.Base.template.nuspec index 5221ba4ef..5a8f82a3c 100644 --- a/base/nuget/Xamarin.GooglePlayServices.Base.template.nuspec +++ b/base/nuget/Xamarin.GooglePlayServices.Base.template.nuspec @@ -18,11 +18,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-base_128x128.png - - + + + + + + diff --git a/base/source/Additions/AboutAdditions.txt b/base/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/base/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/base/source/Additions/DataBufferAdditions.cs b/base/source/Additions/DataBufferAdditions.cs index 0d3af0772..b860d0c20 100644 --- a/base/source/Additions/DataBufferAdditions.cs +++ b/base/source/Additions/DataBufferAdditions.cs @@ -5,17 +5,17 @@ namespace Android.Gms.Common.Data { //Android.Gms.Common.Data -> AbstractDataBuffer -// public partial class AbstractDataBuffer : IEnumerable -// { -// public IEnumerator GetEnumerator() -// { -// return this.ToEnumerable ().GetEnumerator(); -// } -// -// System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() -// { -// return this.GetEnumerator(); -// } -// } + //public partial class AbstractDataBuffer : IEnumerable + //{ + // public IEnumerator GetEnumerator() + // { + // return this.ToEnumerable ().GetEnumerator(); + // } + + // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + // { + // return this.GetEnumerator(); + // } + //} } diff --git a/base/source/Additions/Manifest.cs b/base/source/Additions/Manifest.cs deleted file mode 100644 index 9846e18cd..000000000 --- a/base/source/Additions/Manifest.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Android.App; - -namespace Android.Gms.Common.Apis -{ - [Activity ( - Name="com.google.android.gms.common.api.GoogleApiActivity", - Exported=false, - Theme = "@android:style/Theme.Translucent.NoTitleBar")] - public partial class GoogleApiActivity - { - } -} - diff --git a/base/source/Base.csproj b/base/source/Base.csproj index 6d2fbf7f1..13a63852f 100644 --- a/base/source/Base.csproj +++ b/base/source/Base.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -20,6 +21,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -47,22 +49,22 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -70,15 +72,10 @@ - - Properties\GpsConsts.cs - - - @@ -104,4 +101,12 @@ + + + + + + + + diff --git a/base/source/Properties/AssemblyInfo.cs b/base/source/Properties/AssemblyInfo.cs index f5ebbde85..121da0981 100644 --- a/base/source/Properties/AssemblyInfo.cs +++ b/base/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-base/" + __GpsConsts.Version + "/play-services-base-" + __GpsConsts.Version + ".aar"; -} diff --git a/base/source/Transforms/Metadata.xml b/base/source/Transforms/Metadata.xml index b58d69711..eb2438a2f 100644 --- a/base/source/Transforms/Metadata.xml +++ b/base/source/Transforms/Metadata.xml @@ -1,21 +1,14 @@  - Android.Gms.Actions - Android.Gms.Auth - Android.Gms.Auth.Account Android.Gms.Common Android.Gms.Common.Data Android.Gms.Common.Images - Android.Gms.Common.Internal - Android.Gms.Common.Api.Internal + Android.Gms.Common.Internal + Android.Gms.Common.Server Android.Gms.Auth.Api.SignIn Android.Gms.Auth.Api.SignIn.Internal Android.Gms.Common.Apis - Android.Gms.SignIn.Internal - - - @@ -23,29 +16,17 @@ - - - - - - Java.Lang.Object - Java.Lang.Object[] - - - - + - source - size dest flags @@ -53,4 +34,7 @@ Android.Gms.Common.Apis.Api.IApiOptionsHasOptions Android.Gms.Common.Apis.Api.IApiOptionsHasOptions + + false + false diff --git a/base/source/packages.config b/base/source/packages.config index 71e0c9953..247b0876a 100644 --- a/base/source/packages.config +++ b/base/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/basement/nuget/Xamarin.GooglePlayServices.Basement.template.nuspec b/basement/nuget/Xamarin.GooglePlayServices.Basement.template.nuspec index eba6659db..3652a4313 100644 --- a/basement/nuget/Xamarin.GooglePlayServices.Basement.template.nuspec +++ b/basement/nuget/Xamarin.GooglePlayServices.Basement.template.nuspec @@ -18,12 +18,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-basement_128x128.png - + + + + - - + + diff --git a/basement/source/Additions/AboutAdditions.txt b/basement/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/basement/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/basement/source/Additions/Manifest.cs b/basement/source/Additions/Manifest.cs deleted file mode 100644 index e6f7fa751..000000000 --- a/basement/source/Additions/Manifest.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.App; - -[assembly:MetaData ("com.google.android.gms.version", Value = "@integer/google_play_services_version")] diff --git a/basement/source/Basement.csproj b/basement/source/Basement.csproj index a0a8f9d99..4c59f4a81 100644 --- a/basement/source/Basement.csproj +++ b/basement/source/Basement.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -13,13 +14,14 @@ Xamarin.GooglePlayServices.Basement v7.0 - jar2xml + class-parse ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -47,22 +49,22 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -70,13 +72,8 @@ - - Properties\GpsConsts.cs - - - @@ -92,4 +89,12 @@ + + + + + + + + diff --git a/basement/source/Properties/AssemblyInfo.cs b/basement/source/Properties/AssemblyInfo.cs index 273e2ba51..02fc4d9dd 100644 --- a/basement/source/Properties/AssemblyInfo.cs +++ b/basement/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-basement/" + __GpsConsts.Version + "/play-services-basement-" + __GpsConsts.Version + ".aar"; -} diff --git a/basement/source/Transforms/Metadata.xml b/basement/source/Transforms/Metadata.xml index f734dd32d..e2bdcd62f 100644 --- a/basement/source/Transforms/Metadata.xml +++ b/basement/source/Transforms/Metadata.xml @@ -1,57 +1,38 @@  - Android.Gms.Auth - - - Android.Gms.Auth.Api.Credentials - - - Android.Gms.Auth.Api.SignIn.Internal - Android.Gms.Auth.FirstParty.Shared Android.Gms.Actions - Android.Gms.Common - Android.Gms.Clearcut - Android.Gms.Common.Annotations - Android.Gms.Common.Apis - Android.Gms.Common.Apis.Internal + Android.Gms.Common + Android.Gms.Common.Annotations + Android.Gms.Common.Apis Android.Gms.Common.Internal Android.Gms.Common.Internal.SafeParcel - Android.Gms.Common.Server - Android.Gms.Common.Server.Converter - Android.Gms.Common.Server.Response Android.Gms.Common.Stats Android.Gms.Common.Util Android.Gms.Dynamic + Android.Gms.Dynamite Android.Gms.Dynamite.Descriptors.Flags Android.Gms.Iid Android.Gms.Security - - Android.Gms.Ads.Identifier - Android.Gms.Location.Places Firebase - - Statuses - - - - - - - - - + + Android.Gms.Flags.Impl + Android.Gms.Internal + - - + + + Java.Lang.Object + Java.Lang.Object[] + source size @@ -59,59 +40,23 @@ flags + + Statuses + + + false + false + false - - - - - - - - - - Java.Lang.Object - - - - - - - - - - - - - - - - - - - - - protected override - Java.Lang.Object + + - - - - - Android.Gms.Common.Apis.Api.IApiOptionsHasOptions - Java.Lang.Object - Java.Lang.Object[] - - - source - size - dest - flags + + + - - diff --git a/basement/source/packages.config b/basement/source/packages.config index 71e0c9953..247b0876a 100644 --- a/basement/source/packages.config +++ b/basement/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/build.cake b/build.cake index b09b9568f..d38b96853 100644 --- a/build.cake +++ b/build.cake @@ -2,27 +2,29 @@ #tool nuget:?package=XamarinComponent #tool nuget:?package=Cake.MonoApiTools +#addin nuget:?package=Cake.Json #addin nuget:?package=Cake.XCode #addin nuget:?package=Cake.Xamarin -#addin nuget:?package=Cake.Xamarin.Build +#addin nuget:?package=Cake.Xamarin.Build&version=1.1.11 #addin nuget:?package=Cake.FileHelpers #addin nuget:?package=Cake.MonoApiTools -// To find new URL: https://dl-ssl.google.com/android/repository/addon.xml and search for google_play_services_*.zip -var DOCS_URL = "https://dl-ssl.google.com/android/repository/google_play_services_9683000_r33.zip"; -var M2_REPOSITORY = "https://dl-ssl.google.com/android/repository/google_m2repository_r36.zip"; +// To find new URL: https://dl-ssl.google.com/android/repository/addon.xml and search for google_play_services_*.zip\ +// FROM: https://dl.google.com/android/repository/addon2-1.xml +var DOCS_URL = "https://dl-ssl.google.com/android/repository/google_play_services_v8_rc41.zip"; +var M2_REPOSITORY = "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip"; // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff -var BASE_API_INFO_URL = "https://github.com/xamarin/GooglePlayServicesComponents/releases/download/29.0.0.2/api-info.xml"; +var BASE_API_INFO_URL = "https://github.com/xamarin/GooglePlayServicesComponents/releases/download/32.961.0/api-info.xml"; -var PLAY_COMPONENT_VERSION = "32.961.0.0"; -var PLAY_NUGET_VERSION = "32.961.0"; -var PLAY_AAR_VERSION = "9.6.1"; -var VERSION_DESC = "9.6.1"; +var PLAY_COMPONENT_VERSION = "42.1001.0.0"; +var PLAY_NUGET_VERSION = "42.1001.0"; +var PLAY_AAR_VERSION = "10.0.1"; +var VERSION_DESC = "10.0.1"; var WEAR_COMPONENT_VERSION = "1.4.0.0"; var WEAR_NUGET_VERSION = "1.4.0"; -var WEAR_AAR_VERSION = PLAY_AAR_VERSION; +var WEAR_AAR_VERSION = "1.4.0"; var WEARABLE_SUPPORT_VERSION = "1.4.0"; var WEARABLE_VERSION = "1.0.0"; @@ -33,75 +35,91 @@ var FIREBASE_AAR_VERSION = PLAY_AAR_VERSION; var TARGET = Argument ("t", Argument ("target", "Default")); +var CPU_COUNT = System.Environment.ProcessorCount; +var ALWAYS_MSBUILD = false; + var AAR_INFOS = new [] { - new AarInfo ("play-services-auth", "android/gms/play-services-auth", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-auth-base", "android/gms/play-services-auth-base", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-awareness", "android/gms/play-services-awareness", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-base", "android/gms/play-services-base", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-basement", "android/gms/play-services-basement", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-ads", "android/gms/play-services-ads", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-ads-lite", "android/gms/play-services-ads-lite", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-analytics", "android/gms/play-services-analytics", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-analytics-impl", "android/gms/play-services-analytics-impl", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-appindexing", "android/gms/play-services-appindexing", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-appinvite", "android/gms/play-services-appinvite", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-cast", "android/gms/play-services-cast", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-cast-framework", "android/gms/play-services-cast-framework", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-clearcut", "android/gms/play-services-clearcut", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-drive", "android/gms/play-services-drive", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-fitness", "android/gms/play-services-fitness", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-games", "android/gms/play-services-games", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-gass", "android/gms/play-services-gass", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-gcm", "android/gms/play-services-gcm", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-identity", "android/gms/play-services-identity", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-iid", "android/gms/play-services-iid", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-instantapps", "android/gms/play-services-instantapps", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-location", "android/gms/play-services-location", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-maps", "android/gms/play-services-maps", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-nearby", "android/gms/play-services-nearby", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-panorama", "android/gms/play-services-panorama", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-places", "android/gms/play-services-places", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-plus", "android/gms/play-services-plus", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-safetynet", "android/gms/play-services-safetynet", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-tasks", "android/gms/play-services-tasks", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-tagmanager", "android/gms/play-services-tagmanager", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-tagmanager-api", "android/gms/play-services-tagmanager-api", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-vision", "android/gms/play-services-vision", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-wallet", "android/gms/play-services-wallet", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - new AarInfo ("play-services-wearable", "android/gms/play-services-wearable", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), - - new AarInfo ("firebase-ads", "firebase/firebase-ads", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-analytics", "firebase/firebase-analytics", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-analytics-impl", "firebase/firebase-analytics-impl", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-auth", "firebase/firebase-auth", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-auth-common", "firebase/firebase-auth-common", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-auth-module", "firebase/firebase-auth-module", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-common", "firebase/firebase-common", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-config", "firebase/firebase-config", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-core", "firebase/firebase-core", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-crash", "firebase/firebase-crash", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-database", "firebase/firebase-database", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-database-connection", "firebase/firebase-database-connection", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-iid", "firebase/firebase-iid", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-invites", "firebase/firebase-invites", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-messaging", "firebase/firebase-messaging", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-storage", "firebase/firebase-storage", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), - new AarInfo ("firebase-storage-common", "firebase/firebase-storage-common", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("ads", "play-services-ads", "android/gms/play-services-ads", "Xamarin.GooglePlayServices.Ads", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("ads-lite", "play-services-ads-lite", "android/gms/play-services-ads-lite", "Xamarin.GooglePlayServices.Ads.Lite", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("analytics", "play-services-analytics", "android/gms/play-services-analytics", "Xamarin.GooglePlayServices.Analytics", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("analytics-impl", "play-services-analytics-impl", "android/gms/play-services-analytics-impl", "Xamarin.GooglePlayServices.Analytics.Impl", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("auth", "play-services-auth", "android/gms/play-services-auth", "Xamarin.GooglePlayServices.Auth", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("auth-base", "play-services-auth-base", "android/gms/play-services-auth-base", "Xamarin.GooglePlayServices.Auth.Base", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("awareness", "play-services-awareness", "android/gms/play-services-awareness", "Xamarin.GooglePlayServices.Awareness", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("base", "play-services-base", "android/gms/play-services-base", "Xamarin.GooglePlayServices.Base", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("basement", "play-services-basement", "android/gms/play-services-basement", "Xamarin.GooglePlayServices.Basement", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("appinvite", "play-services-appinvite", "android/gms/play-services-appinvite", "Xamarin.GooglePlayServices.AppInvite", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("cast", "play-services-cast", "android/gms/play-services-cast", "Xamarin.GooglePlayServices.Cast", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("cast-framework", "play-services-cast-framework", "android/gms/play-services-cast-framework", "Xamarin.GooglePlayServices.Cast.Framework", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("clearcut", "play-services-clearcut", "android/gms/play-services-clearcut", "Xamarin.GooglePlayServices.Clearcut", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("drive", "play-services-drive", "android/gms/play-services-drive", "Xamarin.GooglePlayServices.Drive", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("fitness", "play-services-fitness", "android/gms/play-services-fitness", "Xamarin.GooglePlayServices.Fitness", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("games", "play-services-games", "android/gms/play-services-games", "Xamarin.GooglePlayServices.Games", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("gass", "play-services-gass", "android/gms/play-services-gass", "Xamarin.GooglePlayServices.Gass", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("gcm", "play-services-gcm", "android/gms/play-services-gcm", "Xamarin.GooglePlayServices.Gcm", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("identity", "play-services-identity", "android/gms/play-services-identity", "Xamarin.GooglePlayServices.Identity", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("iid", "play-services-iid", "android/gms/play-services-iid", "Xamarin.GooglePlayServices.Iid", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("instantapps", "play-services-instantapps", "android/gms/play-services-instantapps", "Xamarin.GooglePlayServices.InstantApps", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("location", "play-services-location", "android/gms/play-services-location", "Xamarin.GooglePlayServices.Location", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("maps", "play-services-maps", "android/gms/play-services-maps", "Xamarin.GooglePlayServices.Maps", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("nearby", "play-services-nearby", "android/gms/play-services-nearby", "Xamarin.GooglePlayServices.Nearby", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("panorama", "play-services-panorama", "android/gms/play-services-panorama", "Xamarin.GooglePlayServices.Panorama", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("places", "play-services-places", "android/gms/play-services-places", "Xamarin.GooglePlayServices.Places", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("plus", "play-services-plus", "android/gms/play-services-plus", "Xamarin.GooglePlayServices.Plus", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("safetynet", "play-services-safetynet", "android/gms/play-services-safetynet", "Xamarin.GooglePlayServices.SafetyNet", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("tasks", "play-services-tasks", "android/gms/play-services-tasks", "Xamarin.GooglePlayServices.Tasks", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("tagmanager", "play-services-tagmanager", "android/gms/play-services-tagmanager", "Xamarin.GooglePlayServices.TagManager", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("tagmanager-api", "play-services-tagmanager-api", "android/gms/play-services-tagmanager-api", "Xamarin.GooglePlayServices.TagManager.Api", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("tagmanager-v4-impl", "play-services-tagmanager-v4-impl", "android/gms/play-services-tagmanager-v4-impl", "Xamarin.GooglePlayServices.TagManager.V4.Impl", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("vision", "play-services-vision", "android/gms/play-services-vision", "Xamarin.GooglePlayServices.Vision", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("wallet", "play-services-wallet", "android/gms/play-services-wallet", "Xamarin.GooglePlayServices.Wallet", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + new AarInfo ("wearable", "play-services-wearable", "android/gms/play-services-wearable", "Xamarin.GooglePlayServices.Wearable", PLAY_AAR_VERSION, PLAY_NUGET_VERSION, PLAY_COMPONENT_VERSION), + + new AarInfo ("support-wearable", "wearable", "android/support/wearable", "Xamarin.Android.Wear", WEAR_AAR_VERSION, WEAR_NUGET_VERSION, WEAR_COMPONENT_VERSION), + + new AarInfo ("firebase-ads", "firebase-ads", "firebase/firebase-ads", "Xamarin.Firebase.Ads", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-analytics", "firebase-analytics", "firebase/firebase-analytics", "Xamarin.Firebase.Analytics", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-analytics-impl", "firebase-analytics-impl", "firebase/firebase-analytics-impl", "Xamarin.Firebase.Analytics.Impl", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-appindexing", "firebase-appindexing", "firebase/firebase-appindexing", "Xamarin.Firebase.AppIndexing", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-auth", "firebase-auth", "firebase/firebase-auth", "Xamarin.Firebase.Auth", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-common", "firebase-common", "firebase/firebase-common", "Xamarin.Firebase.Common", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-config", "firebase-config", "firebase/firebase-config", "Xamarin.Firebase.Config", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-core", "firebase-core", "firebase/firebase-core", "Xamarin.Firebase.Core", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-crash", "firebase-crash", "firebase/firebase-crash", "Xamarin.Firebase.Crash", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-database", "firebase-database", "firebase/firebase-database", "Xamarin.Firebase.Database", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-database-connection", "firebase-database-connection", "firebase/firebase-database-connection", "Xamarin.Firebase.Database.Connection", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-iid", "firebase-iid", "firebase/firebase-iid", "Xamarin.Firebase.Iid", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-invites", "firebase-invites", "firebase/firebase-invites", "Xamarin.Firebase.Invites", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-messaging", "firebase-messaging", "firebase/firebase-messaging", "Xamarin.Firebase.Messaging", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-storage", "firebase-storage", "firebase/firebase-storage", "Xamarin.Firebase.Storage", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), + new AarInfo ("firebase-storage-common", "firebase-storage-common", "firebase/firebase-storage-common", "Xamarin.Firebase.Storage.Common", FIREBASE_AAR_VERSION, FIREBASE_NUGET_VERSION, FIREBASE_COMPONENT_VERSION), }; +class PartialZipInfo { + public string Url { get;set; } + public string LocalPath { get;set; } + public string Md5 { get;set; } + public long RangeStart { get;set; } + public long RangeEnd { get;set; } +} + class AarInfo { - public AarInfo (string name, string path, string aarVersion, string nugetVersion, string componentVersion) + public AarInfo (string bindingDir, string dir, string path, string nugetId, string aarVersion, string nugetVersion, string componentVersion) { - Name = name; + BindingDir = bindingDir; + Dir = dir; Path = path; + NugetId = nugetId; AarVersion = aarVersion; NuGetVersion = nugetVersion; ComponentVersion = componentVersion; } - public string Name { get; set; } + public string BindingDir { get;set; } + public string Dir { get; set; } public string Path { get; set; } + public string NugetId { get;set; } public string AarVersion { get; set; } public string NuGetVersion { get; set; } public string ComponentVersion { get; set; } @@ -120,6 +138,8 @@ var buildSpec = new BuildSpec { new DefaultSolutionBuilder { SolutionPath = "./GooglePlayServices.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, + MaxCpuCount = CPU_COUNT, + AlwaysUseMSBuild = ALWAYS_MSBUILD, OutputFiles = new [] { new OutputFileCopy { FromFile = "./base/source/bin/Release/Xamarin.GooglePlayServices.Base.dll" }, new OutputFileCopy { FromFile = "./basement/source/bin/Release/Xamarin.GooglePlayServices.Basement.dll" }, @@ -128,7 +148,6 @@ var buildSpec = new BuildSpec { new OutputFileCopy { FromFile = "./analytics/source/bin/Release/Xamarin.GooglePlayServices.Analytics.dll" }, new OutputFileCopy { FromFile = "./analytics-impl/source/bin/Release/Xamarin.GooglePlayServices.Analytics.Impl.dll" }, new OutputFileCopy { FromFile = "./appinvite/source/bin/Release/Xamarin.GooglePlayServices.AppInvite.dll" }, - new OutputFileCopy { FromFile = "./appindexing/source/bin/Release/Xamarin.GooglePlayServices.AppIndexing.dll" }, new OutputFileCopy { FromFile = "./auth/source/bin/Release/Xamarin.GooglePlayServices.Auth.dll" }, new OutputFileCopy { FromFile = "./auth-base/source/bin/Release/Xamarin.GooglePlayServices.Auth.Base.dll" }, new OutputFileCopy { FromFile = "./awareness/source/bin/Release/Xamarin.GooglePlayServices.Awareness.dll" }, @@ -153,16 +172,16 @@ var buildSpec = new BuildSpec { new OutputFileCopy { FromFile = "./vision/source/bin/Release/Xamarin.GooglePlayServices.Vision.dll" }, new OutputFileCopy { FromFile = "./wallet/source/bin/Release/Xamarin.GooglePlayServices.Wallet.dll" }, new OutputFileCopy { FromFile = "./wearable/source/bin/Release/Xamarin.GooglePlayServices.Wearable.dll" }, - new OutputFileCopy { FromFile = "./support-wearable/source/bin/Release/Xamarin.Android.Wearable.dll" }, + new OutputFileCopy { FromFile = "./support-wearable/source/bin/Release/Xamarin.Android.Wear.dll" }, new OutputFileCopy { FromFile = "./tagmanager/source/bin/Release/Xamarin.GooglePlayServices.TagManager.dll" }, new OutputFileCopy { FromFile = "./tagmanager-api/source/bin/Release/Xamarin.GooglePlayServices.TagManager.Api.dll" }, + new OutputFileCopy { FromFile = "./tagmanager-v4-impl/source/bin/Release/Xamarin.GooglePlayServices.TagManager.V4.Impl.dll" }, new OutputFileCopy { FromFile = "./tasks/source/bin/Release/Xamarin.GooglePlayServices.Tasks.dll" }, new OutputFileCopy { FromFile = "./firebase-analytics/source/bin/Release/Xamarin.Firebase.Analytics.dll" }, new OutputFileCopy { FromFile = "./firebase-analytics-impl/source/bin/Release/Xamarin.Firebase.Analytics.Impl.dll" }, + new OutputFileCopy { FromFile = "./firebase-appindexing/source/bin/Release/Xamarin.Firebase.AppIndexing.dll" }, new OutputFileCopy { FromFile = "./firebase-auth/source/bin/Release/Xamarin.Firebase.Auth.dll" }, - new OutputFileCopy { FromFile = "./firebase-auth-common/source/bin/Release/Xamarin.Firebase.Auth.Common.dll" }, - new OutputFileCopy { FromFile = "./firebase-auth-module/source/bin/Release/Xamarin.Firebase.Auth.Module.dll" }, new OutputFileCopy { FromFile = "./firebase-common/source/bin/Release/Xamarin.Firebase.Common.dll" }, new OutputFileCopy { FromFile = "./firebase-config/source/bin/Release/Xamarin.Firebase.Config.dll" }, new OutputFileCopy { FromFile = "./firebase-crash/source/bin/Release/Xamarin.Firebase.Crash.dll" }, @@ -177,35 +196,35 @@ var buildSpec = new BuildSpec { }, Samples = new [] { - new DefaultSolutionBuilder { SolutionPath = "./ads/samples/AdMobSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./analytics/samples/AnalyticsSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./appinvite/samples/AppInviteSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./appindexing/samples/AppIndexingSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./cast/samples/CastingCall.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./drive/samples/DriveSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./fitness/samples/BasicSensorsApi.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./games/samples/BeGenerous.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./gcm/samples/GCMSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./location/samples/LocationSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./maps/samples/MapsSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./nearby/samples/NearbySample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./panorama/samples/PanoramaSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./places/samples/PlacesAsync.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./plus/samples/PlusSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./safetynet/samples/SafetyNetSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./vision/samples/VisionSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./wallet/samples/AndroidPayQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./support-wearable/samples/MultiPageSample.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./support-wearable/samples/WatchFaceSample.sln", BuildsOn = buildsOnWinMac }, - - new DefaultSolutionBuilder { SolutionPath = "./firebase-ads/samples/FirebaseAdmobQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-analytics/samples/FirebaseAnalyticsQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-auth/samples/FirebaseAuthQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-config/samples/FirebaseConfigQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-crash/samples/FirebaseCrashReportingQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-invites/samples/FirebaseInvitesQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-messaging/samples/FirebaseMessagingQuickstart.sln", BuildsOn = buildsOnWinMac }, - new DefaultSolutionBuilder { SolutionPath = "./firebase-storage/samples/FirebaseStorageQuickstart.sln", BuildsOn = buildsOnWinMac }, + new DefaultSolutionBuilder { SolutionPath = "./ads/samples/AdMobSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./analytics/samples/AnalyticsSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./appinvite/samples/AppInviteSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./cast/samples/CastingCall.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./drive/samples/DriveSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./fitness/samples/BasicSensorsApi.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./games/samples/BeGenerous.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./gcm/samples/GCMSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./location/samples/LocationSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./maps/samples/MapsSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./nearby/samples/NearbySample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./panorama/samples/PanoramaSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./places/samples/PlacesAsync.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./plus/samples/PlusSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./safetynet/samples/SafetyNetSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./vision/samples/VisionSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./wallet/samples/AndroidPayQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./support-wearable/samples/MultiPageSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./support-wearable/samples/WatchFaceSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + + new DefaultSolutionBuilder { SolutionPath = "./firebase-ads/samples/FirebaseAdmobQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-analytics/samples/FirebaseAnalyticsQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-appindexing/samples/AppIndexingSample.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-auth/samples/FirebaseAuthQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-config/samples/FirebaseConfigQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-crash/samples/FirebaseCrashReportingQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-invites/samples/FirebaseInvitesQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-messaging/samples/FirebaseMessagingQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, + new DefaultSolutionBuilder { SolutionPath = "./firebase-storage/samples/FirebaseStorageQuickstart.sln", BuildsOn = buildsOnWinMac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = ALWAYS_MSBUILD }, }, NuGets = new [] { @@ -215,7 +234,6 @@ var buildSpec = new BuildSpec { new NuGetInfo { NuSpec = "./ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./analytics/nuget/Xamarin.GooglePlayServices.Analytics.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./analytics-impl/nuget/Xamarin.GooglePlayServices.Analytics.Impl.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, - new NuGetInfo { NuSpec = "./appindexing/nuget/Xamarin.GooglePlayServices.AppIndexing.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./appinvite/nuget/Xamarin.GooglePlayServices.AppInvite.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./auth/nuget/Xamarin.GooglePlayServices.Auth.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./auth-base/nuget/Xamarin.GooglePlayServices.Auth.Base.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, @@ -244,14 +262,14 @@ var buildSpec = new BuildSpec { new NuGetInfo { NuSpec = "./support-wearable/nuget/Xamarin.Android.Wear.nuspec", Version = WEAR_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./tagmanager/nuget/Xamarin.GooglePlayServices.TagManager.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./tagmanager-api/nuget/Xamarin.GooglePlayServices.TagManager.Api.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, + new NuGetInfo { NuSpec = "./tagmanager-v4-impl/nuget/Xamarin.GooglePlayServices.TagManager.V4.Impl.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./tasks/nuget/Xamarin.GooglePlayServices.Tasks.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-ads/nuget/Xamarin.Firebase.Ads.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-analytics/nuget/Xamarin.Firebase.Analytics.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-analytics-impl/nuget/Xamarin.Firebase.Analytics.Impl.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, + new NuGetInfo { NuSpec = "./firebase-appindexing/nuget/Xamarin.Firebase.AppIndexing.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-auth/nuget/Xamarin.Firebase.Auth.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, - new NuGetInfo { NuSpec = "./firebase-auth-common/nuget/Xamarin.Firebase.Auth.Common.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, - new NuGetInfo { NuSpec = "./firebase-auth-module/nuget/Xamarin.Firebase.Auth.Module.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-common/nuget/Xamarin.Firebase.Common.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-config/nuget/Xamarin.Firebase.Config.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, new NuGetInfo { NuSpec = "./firebase-crash/nuget/Xamarin.Firebase.Crash.nuspec", Version = PLAY_NUGET_VERSION, RequireLicenseAcceptance = true }, @@ -271,7 +289,6 @@ var buildSpec = new BuildSpec { Components = new [] { new Component { ManifestDirectory = "./ads/component" }, new Component { ManifestDirectory = "./analytics/component" }, - new Component { ManifestDirectory = "./appindexing/component" }, new Component { ManifestDirectory = "./appinvite/component" }, new Component { ManifestDirectory = "./cast/component" }, new Component { ManifestDirectory = "./drive/component" }, @@ -290,6 +307,7 @@ var buildSpec = new BuildSpec { new Component { ManifestDirectory = "./firebase-ads/component" }, new Component { ManifestDirectory = "./firebase-analytics/component" }, + new Component { ManifestDirectory = "./firebase-appindexing/component" }, new Component { ManifestDirectory = "./firebase-auth/component" }, new Component { ManifestDirectory = "./firebase-config/component" }, new Component { ManifestDirectory = "./firebase-crash/component" }, @@ -299,7 +317,13 @@ var buildSpec = new BuildSpec { } }; - +var NUGET_SOURCES = EnvironmentVariable ("NUGET_SOURCES") ?? Argument ("nugetsources", string.Empty);; +if (!string.IsNullOrEmpty (NUGET_SOURCES)) { + buildSpec.NuGetSources = NUGET_SOURCES.Split (';',',').Select (ns => new NuGetSource { Url = ns }).ToArray (); + Information ("Using Nuget Sources:"); + foreach (var nsrc in buildSpec.NuGetSources) + Information (" {0}", nsrc.Url); +} Task ("externals") .WithCriteria (() => !FileExists ("./externals/play-services-base.aar")).Does (() => @@ -319,9 +343,9 @@ Task ("externals") foreach (var aar in AAR_INFOS) { CopyFile ( - string.Format (path + "m2repository/com/google/{0}/{1}/{2}-{3}.aar", aar.Path, aar.AarVersion, aar.Name, aar.AarVersion), - string.Format (path + "{0}.aar", aar.Name)); - Unzip (path + aar.Name + ".aar", path + aar.Name); + string.Format (path + "m2repository/com/google/{0}/{1}/{2}-{3}.aar", aar.Path, aar.AarVersion, aar.Dir, aar.AarVersion), + string.Format (path + "{0}.aar", aar.Dir)); + Unzip (path + aar.Dir + ".aar", path + aar.Dir); } // Get Wearable stuff @@ -338,7 +362,7 @@ Task ("externals") DeleteDirectory (path + "google-play-services", true); } - // Put the uitest.keystore in our artifacts for downstream jobs to use + // Put the uitest.keystore in our artifacts for downstream jobs to use EnsureDirectoryExists ("./output"); if (FileExists ("./uitest.keystore")) CopyFile ("./uitest.keystore", "./output/uitest.keystore"); @@ -356,8 +380,8 @@ Task ("diff") "./wearable/source/bin/Release/" }; - MonoApiInfo ("./output/GooglePlayServices.Merged.dll", - "./output/GooglePlayServices.api-info.xml", + MonoApiInfo ("./output/GooglePlayServices.Merged.dll", + "./output/GooglePlayServices.api-info.xml", new MonoApiInfoToolSettings { SearchPaths = SEARCH_DIRS }); // Grab the last public release's api-info.xml to use as a base to compare and make an API diff @@ -365,13 +389,13 @@ Task ("diff") // Now diff against current release'd api info // eg: mono mono-api-diff.exe ./gps.r26.xml ./gps.r27.xml > gps.diff.xml - MonoApiDiff ("./output/GooglePlayServices.api-info.previous.xml", + MonoApiDiff ("./output/GooglePlayServices.api-info.previous.xml", "./output/GooglePlayServices.api-info.xml", "./output/GooglePlayServices.api-diff.xml"); // Now let's make a purty html file // eg: mono mono-api-html.exe -c -x ./gps.previous.info.xml ./gps.current.info.xml > gps.diff.html - MonoApiHtml ("./output/GooglePlayServices.api-info.previous.xml", + MonoApiHtml ("./output/GooglePlayServices.api-info.previous.xml", "./output/GooglePlayServices.api-info.xml", "./output/GooglePlayServices.api-diff.html"); }); @@ -396,13 +420,29 @@ Task ("merge").IsDependentOn ("libs").Does (() => }); }); - Task ("clean").IsDependentOn ("clean-base").Does (() => { + if (FileExists ("./generated.targets")) + DeleteFile ("./generated.targets"); + if (DirectoryExists ("./externals")) DeleteDirectory ("./externals", true); + + CleanDirectories ("./**/packages"); }); +Task ("cleanwin").Does (() => +{ + if (FileExists ("./generated.targets")) + DeleteFile ("./generated.targets"); + + if (DirectoryExists ("./externals")) + DeleteDirectory ("./externals", true); + + CleanDirectories ("./**/packages"); +}); + + Task ("component-docs").Does (() => { var gettingStartedTemplates = new Dictionary (); @@ -498,19 +538,125 @@ Task ("component-setup").Does (() => Task ("component").IsDependentOn ("component-docs").IsDependentOn ("component-setup").IsDependentOn ("component-base"); -Task ("nuget-setup").Does (() => -{ - var nuspecs = GetFiles ("./**/nuget/*.template.nuspec"); - foreach (var nuspec in nuspecs) { - var nuspecTxt = FileReadText (nuspec) - .Replace ("$aar-version$", VERSION_DESC); +Task ("nuget-setup").IsDependentOn ("buildtasks").Does (() => { + + var templateText = FileReadText ("./template.targets"); + if (FileExists ("./generated.targets")) + DeleteFile ("./generated.targets"); + + var downloadParts = DeserializeJsonFromFile> ("./partial-download-info.json"); + + foreach (var aar in AAR_INFOS) { + + // Write out the nuspec from template + var nuspec = new FilePath ("./" + aar.BindingDir + "/nuget/" + aar.NugetId + ".template.nuspec"); + var nuspecTxt = FileReadText (nuspec).Replace ("$aar-version$", VERSION_DESC); var newNuspec = nuspec.FullPath.Replace (".template.nuspec", ".nuspec"); FileWriteText (newNuspec, nuspecTxt); + + // Write out the .targets + var part = downloadParts.FirstOrDefault (p => p.LocalPath.EndsWith ("/" + aar.Dir + "-" + aar.AarVersion + ".aar")); + + if (part == null) + throw new Exception ("No matching part found for '" + aar.Dir + "-" + aar.AarVersion + "' in partial-download-info.json "); + + var msName = aar.Dir.Replace("-", ""); + + var xbdKey = "playservices-" + PLAY_AAR_VERSION + "/" + msName; + if (aar.Dir.StartsWith ("firebase-")) + xbdKey = "firebase-" + FIREBASE_AAR_VERSION + "/" + msName; + + var items = new Dictionary { + { "_XbdUrl_", "_XbdUrl_" + msName }, + { "_XbdKey_", "_XbdKey_" + msName }, + { "_XbdAarFile_", "_XbdAarFile_" + msName }, + { "_XbdAarFileInSdk_", "_XbdAarFileInSdk_" + msName }, + { "_XbdAssemblyName_", "_XbdAssemblyName_" + msName }, + { "_XbdAarFileFullPath_", "_XbdAarFileFullPath_" + msName }, + { "_XbdRestoreItems_", "_XbdRestoreItems_" + msName }, + { "$XbdUrl$", M2_REPOSITORY }, + { "$XbdMd5$", part.Md5 }, + { "$XbdKey$", xbdKey }, + { "$XbdAssemblyName$", aar.NugetId }, + { "$XbdRangeStart$", part.RangeStart.ToString() }, + { "$XbdRangeEnd$", part.RangeEnd.ToString() }, + { "$AarKey$", aar.Dir }, + { "$AarVersion$", aar.AarVersion }, + { "$AarInnerPath$", aar.Path.Replace ("/", "\\") }, + }; + + var targetsText = templateText; + + foreach (var kvp in items) + targetsText = targetsText.Replace (kvp.Key, kvp.Value); + + var targetsFile = new FilePath (string.Format ("{0}/nuget/{1}.targets", aar.BindingDir, aar.NugetId)); + FileWriteText (targetsFile, targetsText); + + // Merge each generated targets file into one main one + // this makes one file to import into our actual binding projects + // which is much easier/less maintenance + if (!FileExists ("./generated.targets")) + FileWriteText ("./generated.targets", "\n\n"); + + // Load the doc to append to, and the doc to append + var xFileRoot = System.Xml.Linq.XDocument.Load ("./generated.targets"); + System.Xml.Linq.XNamespace nsRoot = xFileRoot.Root.Name.Namespace; + var xFileChild = System.Xml.Linq.XDocument.Load (MakeAbsolute (targetsFile).FullPath); + System.Xml.Linq.XNamespace nsChild = xFileRoot.Root.Name.Namespace; + + // Add all the elements under into the existing file's node + foreach (var xItemToAdd in xFileChild.Element (nsChild + "Project").Elements ()) + xFileRoot.Element (nsRoot + "Project").Add (xItemToAdd); + + // Inject a property to prevent errors from missing assemblies in .targets + // this allows us to use one big .targets file in all the projects and not have to figure out which specific + // ones each project needs to reference for development purposes + if (!xFileRoot.Descendants (nsRoot + "XamarinBuildResourceMergeThrowOnMissingAssembly").Any ()) { + xFileRoot.Element (nsRoot + "Project") + .AddFirst (new System.Xml.Linq.XElement (nsRoot + "PropertyGroup", + new System.Xml.Linq.XElement (nsRoot + "XamarinBuildResourceMergeThrowOnMissingAssembly", false))); + } + + xFileRoot.Save ("./generated.targets"); + + // Check for an existing .targets file in this nuget package + // we need to merge the generated one with it if it exists + // nuget only allows one automatic .targets file in the build/ folder + // of the nuget package, which must be named {nuget-package-id}.targets + // so we need to merge them all into one + var mergeFile = new FilePath (aar.BindingDir + "/nuget/merge.targets"); + + if (FileExists (mergeFile)) { + Information ("merge.targets found, merging into generated file..."); + + // Load the doc to append to, and the doc to append + var xOrig = System.Xml.Linq.XDocument.Load (MakeAbsolute(targetsFile).FullPath); + System.Xml.Linq.XNamespace nsOrig = xOrig.Root.Name.Namespace; + var xMerge = System.Xml.Linq.XDocument.Load (MakeAbsolute(mergeFile).FullPath); + System.Xml.Linq.XNamespace nsMerge = xMerge.Root.Name.Namespace; + // Add all the elements under into the existing file's node + foreach (var xItemToAdd in xMerge.Element (nsMerge + "Project").Elements ()) + xOrig.Element (nsOrig + "Project").Add (xItemToAdd); + + xOrig.Save (MakeAbsolute (targetsFile).FullPath); + } } }); -Task ("nuget").IsDependentOn ("nuget-setup").IsDependentOn ("libs").IsDependentOn ("nuget-base"); +Task ("nuget").IsDependentOn ("nuget-setup").IsDependentOn ("nuget-base").IsDependentOn ("libs"); + +Task ("libs").IsDependentOn ("nuget-setup").IsDependentOn ("libs-base"); + +Task ("buildtasks").Does (() => +{ + NuGetRestore ("./basement/buildtasks/Basement-BuildTasks.csproj"); + + DotNetBuild ("./basement/buildtasks/Basement-BuildTasks.csproj", c => c.Configuration = "Release"); + + CopyFile ("./basement/buildtasks/bin/Release/Xamarin.GooglePlayServices.Basement.targets", "./basement/nuget/merge.targets"); +}); SetupXamarinBuildTasks (buildSpec, Tasks, Task); diff --git a/build.ps1 b/build.ps1 index 9c61f568c..977226ee3 100644 --- a/build.ps1 +++ b/build.ps1 @@ -52,6 +52,7 @@ $NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" $NUGET_URL = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" +$CAKE_PACKAGES_CONFIG = Join-Path $PSScriptRoot "cake.packages.config" # Should we use mono? $UseMono = ""; @@ -81,9 +82,14 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { # Make sure that packages.config exist. if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch { - Throw "Could not download packages.config." + if (!(Test-Path $CAKE_PACKAGES_CONFIG)) { + Write-Verbose -Message "Downloading packages.config..." + try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch { + Throw "Could not download packages.config." + } + } else { + Write-Verbose -Message "using local cake.packages.config..." + Copy-Item $CAKE_PACKAGES_CONFIG $PACKAGES_CONFIG } } diff --git a/build.sh b/build.sh index bc44d9752..158be6c46 100644 --- a/build.sh +++ b/build.sh @@ -41,11 +41,16 @@ fi # Make sure that packages.config exist. if [ ! -f "$TOOLS_DIR/packages.config" ]; then - echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occured while downloading packages.config." - exit 1 + if [ ! -f "$SCRIPT_DIR/cake.packages.config" ]; then + echo "Downloading packages.config..." + curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages + if [ $? -ne 0 ]; then + echo "An error occured while downloading packages.config." + exit 1 + fi + else + echo "using local cake.packages.config..." + cp "$SCRIPT_DIR/cake.packages.config" "$TOOLS_DIR/packages.config" fi fi @@ -53,27 +58,13 @@ fi if [ ! -f "$NUGET_EXE" ]; then echo "Downloading NuGet..." curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe + # v3/Latest URL: https://dist.nuget.org/win-x86-commandline/latest/nuget.exe if [ $? -ne 0 ]; then echo "An error occured while downloading nuget.exe." exit 1 fi fi -# BEGIN TEMP WORKAROUND -# There is a bug in Mono's System.IO.Compression -# This binary fixes the bug for now -# Download System.IO.Compression if it does not exist. -SYSIOCOMP=$TOOLS_DIR/System.IO.Compression.dll -if [ ! -f "$SYSIOCOMP" ]; then - echo "Downloading System.IO.Compression.dll ..." - curl -Lsfo "$SYSIOCOMP" http://xamarin-components-binaries.s3.amazonaws.com/System.IO.Compression.dll - if [ $? -ne 0 ]; then - echo "An error occured while downloading System.IO.Compression.dll." - exit 1 - fi -fi -# END TEMP WORKAROUND - # Restore tools from NuGet. pushd "$TOOLS_DIR" >/dev/null mono "$NUGET_EXE" install -ExcludeVersion diff --git a/cake.packages.config b/cake.packages.config new file mode 100644 index 000000000..7486c1936 --- /dev/null +++ b/cake.packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec b/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec index 5cd569cad..349778589 100644 --- a/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec +++ b/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec @@ -16,12 +16,16 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-cast-framework_128x128.png - - - + + + + + + + diff --git a/cast-framework/source/Additions/AboutAdditions.txt b/cast-framework/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/cast-framework/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/cast-framework/source/Additions/Manifest.cs b/cast-framework/source/Additions/Manifest.cs deleted file mode 100644 index 82c353d50..000000000 --- a/cast-framework/source/Additions/Manifest.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using Android.App; -using Android.Content; - -// -// -// -// -// -// -// -// - -namespace Android.Gms.Cast.Framework.Media -{ - [BroadcastReceiver (Name="com.google.android.gms.cast.framework.media.MediaIntentReceiver")] - partial class MediaIntentReceiver { } - - [Service(Name = "com.google.android.gms.cast.framework.media.MediaNotificationService")] - partial class MediaNotificationService { } -} - -namespace Android.Gms.Cast.Framework -{ - [Service(Name = "com.google.android.gms.cast.framework.ReconnectionService")] - partial class MediaNotificationService { } -} diff --git a/cast-framework/source/Cast.Framework.csproj b/cast-framework/source/Cast.Framework.csproj index c28667590..8cdda44d4 100644 --- a/cast-framework/source/Cast.Framework.csproj +++ b/cast-framework/source/Cast.Framework.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,41 +48,36 @@ - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll + ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - - @@ -105,9 +102,17 @@ + Jars\play-services-cast-framework.jar + + + + + + + diff --git a/cast-framework/source/Properties/AssemblyInfo.cs b/cast-framework/source/Properties/AssemblyInfo.cs index cead9a25c..309487f5c 100644 --- a/cast-framework/source/Properties/AssemblyInfo.cs +++ b/cast-framework/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-cast-framework/" + __GpsConsts.Version + "/play-services-cast-framework-" + __GpsConsts.Version + ".aar"; -} diff --git a/cast-framework/source/Transforms/EnumFields.xml b/cast-framework/source/Transforms/EnumFields.xml index e9af0eeb3..87cc5b8d5 100644 --- a/cast-framework/source/Transforms/EnumFields.xml +++ b/cast-framework/source/Transforms/EnumFields.xml @@ -15,4 +15,10 @@ - An optional "bitfield" attribute marks the enum type with [Flags]. - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute. --> + + + + + + diff --git a/cast-framework/source/Transforms/EnumMethods.xml b/cast-framework/source/Transforms/EnumMethods.xml index 2efa81467..bd92fa0b4 100644 --- a/cast-framework/source/Transforms/EnumMethods.xml +++ b/cast-framework/source/Transforms/EnumMethods.xml @@ -15,4 +15,7 @@ - To change the type of the return value, use "return" as the parameter name. - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project. --> + + + diff --git a/cast-framework/source/packages.config b/cast-framework/source/packages.config index 71e0c9953..247b0876a 100644 --- a/cast-framework/source/packages.config +++ b/cast-framework/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/cast/component/component.template.yaml b/cast/component/component.template.yaml index b2068e821..7eb865ae3 100644 --- a/cast/component/component.template.yaml +++ b/cast/component/component.template.yaml @@ -27,5 +27,7 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Cast + removeNodes: + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/cast/nuget/Xamarin.GooglePlayServices.Cast.template.nuspec b/cast/nuget/Xamarin.GooglePlayServices.Cast.template.nuspec index 8915232d9..3b6ec88a8 100644 --- a/cast/nuget/Xamarin.GooglePlayServices.Cast.template.nuspec +++ b/cast/nuget/Xamarin.GooglePlayServices.Cast.template.nuspec @@ -18,12 +18,16 @@ http://components.xamarin.com/license/googleplayservices-cast/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-cast_128x128.png - - - + + + + + + + diff --git a/cast/samples/CastingCall/CastingCall.csproj b/cast/samples/CastingCall/CastingCall.csproj index 6c38ad19a..22dec7078 100644 --- a/cast/samples/CastingCall/CastingCall.csproj +++ b/cast/samples/CastingCall/CastingCall.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -46,37 +47,37 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.Palette.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll + ..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.v7.MediaRouter.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + ..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll @@ -122,6 +123,18 @@ Tasks + - + + + + + + + + + + + + \ No newline at end of file diff --git a/cast/samples/CastingCall/packages.config b/cast/samples/CastingCall/packages.config index e9e558e42..a69fe88c9 100644 --- a/cast/samples/CastingCall/packages.config +++ b/cast/samples/CastingCall/packages.config @@ -1,14 +1,15 @@  - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/cast/source/Additions/AboutAdditions.txt b/cast/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/cast/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/cast/source/Cast.csproj b/cast/source/Cast.csproj index d75dea8bc..ff8917cdd 100644 --- a/cast/source/Cast.csproj +++ b/cast/source/Cast.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -45,52 +47,48 @@ - - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v7.Palette.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll + ..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll False - ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll False + + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + - - Properties\GpsConsts.cs - - @@ -116,5 +114,17 @@ - + + + + + + + + + + + + + diff --git a/cast/source/Properties/AssemblyInfo.cs b/cast/source/Properties/AssemblyInfo.cs index 0718209f3..0c62d907f 100644 --- a/cast/source/Properties/AssemblyInfo.cs +++ b/cast/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-cast/" + __GpsConsts.Version + "/play-services-cast-" + __GpsConsts.Version + ".aar"; -} diff --git a/cast/source/packages.config b/cast/source/packages.config index c771ee60a..a69fe88c9 100644 --- a/cast/source/packages.config +++ b/cast/source/packages.config @@ -1,13 +1,15 @@  - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/clearcut/nuget/Xamarin.GooglePlayServices.Clearcut.template.nuspec b/clearcut/nuget/Xamarin.GooglePlayServices.Clearcut.template.nuspec index 7eba0d8a2..aab8c8520 100644 --- a/clearcut/nuget/Xamarin.GooglePlayServices.Clearcut.template.nuspec +++ b/clearcut/nuget/Xamarin.GooglePlayServices.Clearcut.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-clearcut_128x128.png - - + + + + + + diff --git a/clearcut/source/Additions/AboutAdditions.txt b/clearcut/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/clearcut/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/clearcut/source/Clearcut.csproj b/clearcut/source/Clearcut.csproj index 28f8188de..cbdc2e5f6 100644 --- a/clearcut/source/Clearcut.csproj +++ b/clearcut/source/Clearcut.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,18 +48,15 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -76,9 +75,14 @@ + Jars\play-services-clearcut.jar + + + + diff --git a/clearcut/source/Properties/AssemblyInfo.cs b/clearcut/source/Properties/AssemblyInfo.cs index 5c6c81ba9..41f22525e 100644 --- a/clearcut/source/Properties/AssemblyInfo.cs +++ b/clearcut/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-clearcut/" + __GpsConsts.Version + "/play-services-clearcut-" + __GpsConsts.Version + ".aar"; -} diff --git a/clearcut/source/packages.config b/clearcut/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/clearcut/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/drive/component/component.template.yaml b/drive/component/component.template.yaml index 7d2bd5b56..22fa7c4fd 100644 --- a/drive/component/component.template.yaml +++ b/drive/component/component.template.yaml @@ -27,5 +27,7 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Drive + removeNodes: + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/drive/nuget/Xamarin.GooglePlayServices.Drive.template.nuspec b/drive/nuget/Xamarin.GooglePlayServices.Drive.template.nuspec index 7c1f7db4b..e93c758d1 100644 --- a/drive/nuget/Xamarin.GooglePlayServices.Drive.template.nuspec +++ b/drive/nuget/Xamarin.GooglePlayServices.Drive.template.nuspec @@ -18,11 +18,15 @@ http://components.xamarin.com/license/googleplayservices-drive/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-drive_128x128.png - - + + + + + + diff --git a/drive/samples/DriveSample/DriveSample.csproj b/drive/samples/DriveSample/DriveSample.csproj index 1bfe3f785..5ee55df49 100644 --- a/drive/samples/DriveSample/DriveSample.csproj +++ b/drive/samples/DriveSample/DriveSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -101,4 +102,15 @@ Tasks + + + + + + + + + + + \ No newline at end of file diff --git a/drive/samples/DriveSample/packages.config b/drive/samples/DriveSample/packages.config index 71e0c9953..247b0876a 100644 --- a/drive/samples/DriveSample/packages.config +++ b/drive/samples/DriveSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/drive/source/Additions/AboutAdditions.txt b/drive/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/drive/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/drive/source/Drive.csproj b/drive/source/Drive.csproj index bb180080b..1c1710319 100644 --- a/drive/source/Drive.csproj +++ b/drive/source/Drive.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,7 +48,7 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -54,13 +56,10 @@ - - Properties\GpsConsts.cs - - + @@ -88,4 +87,6 @@ + + diff --git a/drive/source/Properties/AssemblyInfo.cs b/drive/source/Properties/AssemblyInfo.cs index d635d00fd..bc9a3ebc4 100644 --- a/drive/source/Properties/AssemblyInfo.cs +++ b/drive/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-drive/" + __GpsConsts.Version + "/play-services-drive-" + __GpsConsts.Version + ".aar"; -} diff --git a/drive/source/Transforms/Metadata.xml b/drive/source/Transforms/Metadata.xml index a71f1bd15..35e89d8b6 100644 --- a/drive/source/Transforms/Metadata.xml +++ b/drive/source/Transforms/Metadata.xml @@ -25,7 +25,7 @@ - + @@ -43,5 +43,5 @@ public override Java.Lang.Object - + false diff --git a/drive/source/packages.config b/drive/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/drive/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-ads/component/component.template.yaml b/firebase-ads/component/component.template.yaml index 2b30ffc20..89665673c 100644 --- a/firebase-ads/component/component.template.yaml +++ b/firebase-ads/component/component.template.yaml @@ -36,5 +36,6 @@ samples: - Xamarin.GooglePlayServices.Ads.Lite removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-ads/nuget/Xamarin.Firebase.Ads.template.nuspec b/firebase-ads/nuget/Xamarin.Firebase.Ads.template.nuspec index cba9253cf..864f60240 100644 --- a/firebase-ads/nuget/Xamarin.Firebase.Ads.template.nuspec +++ b/firebase-ads/nuget/Xamarin.Firebase.Ads.template.nuspec @@ -16,8 +16,10 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-ads_128x128.png - - + + + + diff --git a/firebase-ads/samples/FirebaseAdmobQuickstart/FirebaseAdmobQuickstart.csproj b/firebase-ads/samples/FirebaseAdmobQuickstart/FirebaseAdmobQuickstart.csproj index 244f81e90..bba966e67 100644 --- a/firebase-ads/samples/FirebaseAdmobQuickstart/FirebaseAdmobQuickstart.csproj +++ b/firebase-ads/samples/FirebaseAdmobQuickstart/FirebaseAdmobQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,31 +45,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -140,6 +141,16 @@ + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-ads/samples/FirebaseAdmobQuickstart/MainActivity.cs b/firebase-ads/samples/FirebaseAdmobQuickstart/MainActivity.cs index 943e6dfab..40bc691eb 100644 --- a/firebase-ads/samples/FirebaseAdmobQuickstart/MainActivity.cs +++ b/firebase-ads/samples/FirebaseAdmobQuickstart/MainActivity.cs @@ -14,7 +14,8 @@ namespace Admob { - [Activity(Label = "Admob", MainLauncher = true), IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.ActionMain, Intent.CategoryLauncher })] + [Activity(Label = "Admob", MainLauncher = true, Theme="@style/Theme.AppCompat")] + [IntentFilter(new[] { Intent.ActionView }, Categories = new[] { Intent.ActionMain, Intent.CategoryLauncher })] [MetaData("android.support.PARENT_ACTIVITY", Value = ".MainActivity")] public class MainActivity : AppCompatActivity //FragmentActivity, IAppCompatCallback, Android.Support.V4.App.TaskStackBuilder.ISupportParentable, Android.Support.V7.App.ActionBarDrawerToggle.IDelegateProvider { diff --git a/firebase-ads/samples/FirebaseAdmobQuickstart/packages.config b/firebase-ads/samples/FirebaseAdmobQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-ads/samples/FirebaseAdmobQuickstart/packages.config +++ b/firebase-ads/samples/FirebaseAdmobQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-analytics-impl/nuget/Xamarin.Firebase.Analytics.Impl.template.nuspec b/firebase-analytics-impl/nuget/Xamarin.Firebase.Analytics.Impl.template.nuspec index a095fb7c7..21fa80c02 100644 --- a/firebase-analytics-impl/nuget/Xamarin.Firebase.Analytics.Impl.template.nuspec +++ b/firebase-analytics-impl/nuget/Xamarin.Firebase.Analytics.Impl.template.nuspec @@ -16,12 +16,16 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-analytics-impl_128x128.png - - - + + + + + + + diff --git a/firebase-analytics-impl/source/Firebase-Analytics-Impl.csproj b/firebase-analytics-impl/source/Firebase-Analytics-Impl.csproj index 905fe8325..d34968fb9 100644 --- a/firebase-analytics-impl/source/Firebase-Analytics-Impl.csproj +++ b/firebase-analytics-impl/source/Firebase-Analytics-Impl.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,13 +47,11 @@ - - Properties\GpsConsts.cs - + @@ -74,9 +74,11 @@ + Jars\firebase-analytics-impl.jar + diff --git a/firebase-analytics-impl/source/Properties/AssemblyInfo.cs b/firebase-analytics-impl/source/Properties/AssemblyInfo.cs index 6aa83b953..59655fe81 100644 --- a/firebase-analytics-impl/source/Properties/AssemblyInfo.cs +++ b/firebase-analytics-impl/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-analytics-impl/" + __FbConsts.Version + "/firebase-analytics-impl-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-analytics-impl/source/packages.config b/firebase-analytics-impl/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-analytics-impl/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-analytics/component/component.template.yaml b/firebase-analytics/component/component.template.yaml index ef1eefc8d..2e004a6ad 100644 --- a/firebase-analytics/component/component.template.yaml +++ b/firebase-analytics/component/component.template.yaml @@ -34,5 +34,6 @@ samples: - Xamarin.Firebase.Analytics.Impl removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-analytics/nuget/Xamarin.Firebase.Analytics.template.nuspec b/firebase-analytics/nuget/Xamarin.Firebase.Analytics.template.nuspec index b7050296d..4bbb0e6b2 100644 --- a/firebase-analytics/nuget/Xamarin.Firebase.Analytics.template.nuspec +++ b/firebase-analytics/nuget/Xamarin.Firebase.Analytics.template.nuspec @@ -16,12 +16,16 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-analytics_128x128.png - - - + + + + + + + diff --git a/firebase-analytics/samples/FirebaseAnalyticsQuickstart/FirebaseAnalyticsQuickstart.csproj b/firebase-analytics/samples/FirebaseAnalyticsQuickstart/FirebaseAnalyticsQuickstart.csproj index 7512d7fb2..3bf19b53a 100644 --- a/firebase-analytics/samples/FirebaseAnalyticsQuickstart/FirebaseAnalyticsQuickstart.csproj +++ b/firebase-analytics/samples/FirebaseAnalyticsQuickstart/FirebaseAnalyticsQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -43,31 +44,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -135,11 +136,29 @@ {865652D3-8D1A-4779-92FC-4C54719286B7} Firebase-Common + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + + {3F6BAE25-ADEB-468C-8384-AD655623C341} + Base + + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-analytics/samples/FirebaseAnalyticsQuickstart/packages.config b/firebase-analytics/samples/FirebaseAnalyticsQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-analytics/samples/FirebaseAnalyticsQuickstart/packages.config +++ b/firebase-analytics/samples/FirebaseAnalyticsQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-analytics/source/Additions/Manifest.cs b/firebase-analytics/source/Additions/Manifest.cs deleted file mode 100644 index a6c7a4674..000000000 --- a/firebase-analytics/source/Additions/Manifest.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Android.App; -using Android.Content; - -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] -[assembly: UsesPermission (Android.Manifest.Permission.WakeLock)] - -namespace Android.Gms.Measurement -{ - // - // - // - // - // - [BroadcastReceiver (Name="com.google.android.gms.measurement.AppMeasurementReceiver", Enabled=true)] - [IntentFilter (new [] { "com.google.android.gms.measurement.UPLOAD" })] - public partial class AppMeasurementReceiver - { - } - - // - [Service (Name="com.google.android.gms.measurement.AppMeasurementService", Enabled=true, Exported=false)] - public partial class AppMeasurementService - { - } -} - diff --git a/firebase-analytics/source/Firebase-Analytics.csproj b/firebase-analytics/source/Firebase-Analytics.csproj index 63f180ea9..38832fdbe 100644 --- a/firebase-analytics/source/Firebase-Analytics.csproj +++ b/firebase-analytics/source/Firebase-Analytics.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,14 +47,11 @@ - - Properties\GpsConsts.cs - - + @@ -75,9 +74,11 @@ + Jars\firebase-analytics.jar + diff --git a/firebase-analytics/source/Properties/AssemblyInfo.cs b/firebase-analytics/source/Properties/AssemblyInfo.cs index 3193c01af..68c73c6b3 100644 --- a/firebase-analytics/source/Properties/AssemblyInfo.cs +++ b/firebase-analytics/source/Properties/AssemblyInfo.cs @@ -26,23 +26,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-analytics/" + __FbConsts.Version + "/firebase-analytics-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-analytics/source/packages.config b/firebase-analytics/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-analytics/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/appindexing/component/Details.template.md b/firebase-appindexing/component/Details.template.md similarity index 89% rename from appindexing/component/Details.template.md rename to firebase-appindexing/component/Details.template.md index f1dd95ca9..5d9720d68 100644 --- a/appindexing/component/Details.template.md +++ b/firebase-appindexing/component/Details.template.md @@ -1,4 +1,4 @@ -Google Play Services - App Indexing +Firebase - App Indexing =================================== App Indexing helps you get your app found in Google Search. Once your app is indexed, mobile users who search for content related to your app can see an install button to your Android app in Search results. This helps you increase your install base. diff --git a/appindexing/component/GettingStarted.template.md b/firebase-appindexing/component/GettingStarted.template.md similarity index 100% rename from appindexing/component/GettingStarted.template.md rename to firebase-appindexing/component/GettingStarted.template.md diff --git a/appindexing/component/component.template.yaml b/firebase-appindexing/component/component.template.yaml similarity index 70% rename from appindexing/component/component.template.yaml rename to firebase-appindexing/component/component.template.yaml index 492707f0e..34582be01 100644 --- a/appindexing/component/component.template.yaml +++ b/firebase-appindexing/component/component.template.yaml @@ -1,5 +1,5 @@ version: $version$ -name: Google Play Services - App Indexing +name: Firebase - App Indexing id: googleplayservices-appindexing publisher: Xamarin Inc. publisher-url: http://xamarin.com @@ -11,16 +11,16 @@ icons: is_shell: true packages: android: - - Xamarin.GooglePlayServices.AppIndexing, Version=$nuget-version$ + - Xamarin.Firebase.AppIndexing, Version=$nuget-version$ samples: - name: "AppIndexing Sample" - path: ../../appindexing/samples/AppIndexingSample.sln + path: ../../firebase-appindexing/samples/AppIndexingSample.sln removeProjects: - Base - Basement - Tasks - Firebase-Common - - AppIndexing + - Firebase-AppIndexing installNuGets: - project: AppIndexingSample packages: @@ -28,6 +28,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.Firebase.Common - - Xamarin.GooglePlayServices.AppIndexing + - Xamarin.Firebase.AppIndexing + removeNodes: + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-auth-common/nuget/Xamarin.Firebase.Auth.Common.template.nuspec b/firebase-appindexing/nuget/Xamarin.Firebase.AppIndexing.template.nuspec similarity index 51% rename from firebase-auth-common/nuget/Xamarin.Firebase.Auth.Common.template.nuspec rename to firebase-appindexing/nuget/Xamarin.Firebase.AppIndexing.template.nuspec index 82b5e8d0d..d093dcd7d 100644 --- a/firebase-auth-common/nuget/Xamarin.Firebase.Auth.Common.template.nuspec +++ b/firebase-appindexing/nuget/Xamarin.Firebase.AppIndexing.template.nuspec @@ -1,28 +1,30 @@ - Xamarin.Firebase.Auth.Common - Xamarin Firebase - Auth Common + Xamarin.Firebase.AppIndexing + Xamarin Firebase - AppIndexing $version$ Xamarin Inc. Xamarin Inc. true - Xamarin.Android Bindings for Firebase - Auth Common $aar-version$ + Xamarin.Android Bindings for Firebase - AppIndexing $aar-version$ - Xamarin.Android Bindings for Firebase - Auth Common $aar-version$ + Xamarin.Android Bindings for Firebase - AppIndexing $aar-version$ Copyright © Microsoft Corporation https://github.com/xamarin/GooglePlayServicesComponents/ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md - https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-auth-common_128x128.png + https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-appindexing_128x128.png - - - - + + + + - + + + diff --git a/appindexing/samples/AppIndexingSample.UITests/AppIndexingSample.UITests.csproj b/firebase-appindexing/samples/AppIndexingSample.UITests/AppIndexingSample.UITests.csproj similarity index 100% rename from appindexing/samples/AppIndexingSample.UITests/AppIndexingSample.UITests.csproj rename to firebase-appindexing/samples/AppIndexingSample.UITests/AppIndexingSample.UITests.csproj diff --git a/appindexing/samples/AppIndexingSample.UITests/Tests.cs b/firebase-appindexing/samples/AppIndexingSample.UITests/Tests.cs similarity index 100% rename from appindexing/samples/AppIndexingSample.UITests/Tests.cs rename to firebase-appindexing/samples/AppIndexingSample.UITests/Tests.cs diff --git a/appindexing/samples/AppIndexingSample.UITests/packages.config b/firebase-appindexing/samples/AppIndexingSample.UITests/packages.config similarity index 100% rename from appindexing/samples/AppIndexingSample.UITests/packages.config rename to firebase-appindexing/samples/AppIndexingSample.UITests/packages.config diff --git a/appindexing/samples/AppIndexingSample.sln b/firebase-appindexing/samples/AppIndexingSample.sln similarity index 87% rename from appindexing/samples/AppIndexingSample.sln rename to firebase-appindexing/samples/AppIndexingSample.sln index 0ce4fd24e..f36809594 100644 --- a/appindexing/samples/AppIndexingSample.sln +++ b/firebase-appindexing/samples/AppIndexingSample.sln @@ -7,14 +7,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppIndexingSample.UITests", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basement", "..\..\basement\source\Basement.csproj", "{6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppIndexing", "..\source\AppIndexing.csproj", "{A069B942-EE12-4283-8C4C-F46549D3978A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Base", "..\..\base\source\Base.csproj", "{3F6BAE25-ADEB-468C-8384-AD655623C341}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Common", "..\..\firebase-common\source\Firebase-Common.csproj", "{865652D3-8D1A-4779-92FC-4C54719286B7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tasks", "..\..\tasks\source\Tasks.csproj", "{53F87D88-8871-41A2-9F81-B79AB02FEC24}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-AppIndexing", "..\source\Firebase-AppIndexing.csproj", "{8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,10 +29,6 @@ Global {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}.Release|Any CPU.Build.0 = Release|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A069B942-EE12-4283-8C4C-F46549D3978A}.Release|Any CPU.Build.0 = Release|Any CPU {AC99F948-17A9-464E-8033-429D6C1D23F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC99F948-17A9-464E-8033-429D6C1D23F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {AC99F948-17A9-464E-8033-429D6C1D23F2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -49,5 +45,9 @@ Global {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Debug|Any CPU.Build.0 = Debug|Any CPU {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Release|Any CPU.ActiveCfg = Release|Any CPU {53F87D88-8871-41A2-9F81-B79AB02FEC24}.Release|Any CPU.Build.0 = Release|Any CPU + {8D01CC30-64F5-4AD3-B9C8-0970B0F1D562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {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 EndGlobalSection EndGlobal diff --git a/appindexing/samples/AppIndexingSample/AppIndexingSample.csproj b/firebase-appindexing/samples/AppIndexingSample/AppIndexingSample.csproj similarity index 63% rename from appindexing/samples/AppIndexingSample/AppIndexingSample.csproj rename to firebase-appindexing/samples/AppIndexingSample/AppIndexingSample.csproj index ad85f84bd..368ba9340 100644 --- a/appindexing/samples/AppIndexingSample/AppIndexingSample.csproj +++ b/firebase-appindexing/samples/AppIndexingSample/AppIndexingSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -93,10 +94,6 @@ {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} Basement - - {A069B942-EE12-4283-8C4C-F46549D3978A} - AppIndexing - {3F6BAE25-ADEB-468C-8384-AD655623C341} Base @@ -109,5 +106,17 @@ {53F87D88-8871-41A2-9F81-B79AB02FEC24} Tasks + + {8D01CC30-64F5-4AD3-B9C8-0970B0F1D562} + Firebase-AppIndexing + + + + + + + + + \ No newline at end of file diff --git a/appindexing/samples/AppIndexingSample/Assets/AboutAssets.txt b/firebase-appindexing/samples/AppIndexingSample/Assets/AboutAssets.txt similarity index 100% rename from appindexing/samples/AppIndexingSample/Assets/AboutAssets.txt rename to firebase-appindexing/samples/AppIndexingSample/Assets/AboutAssets.txt diff --git a/appindexing/samples/AppIndexingSample/ExampleHosting.html b/firebase-appindexing/samples/AppIndexingSample/ExampleHosting.html similarity index 100% rename from appindexing/samples/AppIndexingSample/ExampleHosting.html rename to firebase-appindexing/samples/AppIndexingSample/ExampleHosting.html diff --git a/appindexing/samples/AppIndexingSample/MainActivity.cs b/firebase-appindexing/samples/AppIndexingSample/MainActivity.cs similarity index 100% rename from appindexing/samples/AppIndexingSample/MainActivity.cs rename to firebase-appindexing/samples/AppIndexingSample/MainActivity.cs diff --git a/appindexing/samples/AppIndexingSample/Properties/AndroidManifest.xml b/firebase-appindexing/samples/AppIndexingSample/Properties/AndroidManifest.xml similarity index 100% rename from appindexing/samples/AppIndexingSample/Properties/AndroidManifest.xml rename to firebase-appindexing/samples/AppIndexingSample/Properties/AndroidManifest.xml diff --git a/appindexing/samples/AppIndexingSample/Properties/AssemblyInfo.cs b/firebase-appindexing/samples/AppIndexingSample/Properties/AssemblyInfo.cs similarity index 100% rename from appindexing/samples/AppIndexingSample/Properties/AssemblyInfo.cs rename to firebase-appindexing/samples/AppIndexingSample/Properties/AssemblyInfo.cs diff --git a/appindexing/samples/AppIndexingSample/Resources/AboutResources.txt b/firebase-appindexing/samples/AppIndexingSample/Resources/AboutResources.txt similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/AboutResources.txt rename to firebase-appindexing/samples/AppIndexingSample/Resources/AboutResources.txt diff --git a/appindexing/samples/AppIndexingSample/Resources/drawable-hdpi/Icon.png b/firebase-appindexing/samples/AppIndexingSample/Resources/drawable-hdpi/Icon.png similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/drawable-hdpi/Icon.png rename to firebase-appindexing/samples/AppIndexingSample/Resources/drawable-hdpi/Icon.png diff --git a/appindexing/samples/AppIndexingSample/Resources/drawable-mdpi/Icon.png b/firebase-appindexing/samples/AppIndexingSample/Resources/drawable-mdpi/Icon.png similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/drawable-mdpi/Icon.png rename to firebase-appindexing/samples/AppIndexingSample/Resources/drawable-mdpi/Icon.png diff --git a/appindexing/samples/AppIndexingSample/Resources/drawable-xhdpi/Icon.png b/firebase-appindexing/samples/AppIndexingSample/Resources/drawable-xhdpi/Icon.png similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/drawable-xhdpi/Icon.png rename to firebase-appindexing/samples/AppIndexingSample/Resources/drawable-xhdpi/Icon.png diff --git a/appindexing/samples/AppIndexingSample/Resources/drawable-xxhdpi/Icon.png b/firebase-appindexing/samples/AppIndexingSample/Resources/drawable-xxhdpi/Icon.png similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/drawable-xxhdpi/Icon.png rename to firebase-appindexing/samples/AppIndexingSample/Resources/drawable-xxhdpi/Icon.png diff --git a/appindexing/samples/AppIndexingSample/Resources/drawable-xxxhdpi/Icon.png b/firebase-appindexing/samples/AppIndexingSample/Resources/drawable-xxxhdpi/Icon.png similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/drawable-xxxhdpi/Icon.png rename to firebase-appindexing/samples/AppIndexingSample/Resources/drawable-xxxhdpi/Icon.png diff --git a/appindexing/samples/AppIndexingSample/Resources/layout/Main.axml b/firebase-appindexing/samples/AppIndexingSample/Resources/layout/Main.axml similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/layout/Main.axml rename to firebase-appindexing/samples/AppIndexingSample/Resources/layout/Main.axml diff --git a/appindexing/samples/AppIndexingSample/Resources/values/Strings.xml b/firebase-appindexing/samples/AppIndexingSample/Resources/values/Strings.xml similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/values/Strings.xml rename to firebase-appindexing/samples/AppIndexingSample/Resources/values/Strings.xml diff --git a/appindexing/samples/AppIndexingSample/Resources/xml/noindex.xml b/firebase-appindexing/samples/AppIndexingSample/Resources/xml/noindex.xml similarity index 100% rename from appindexing/samples/AppIndexingSample/Resources/xml/noindex.xml rename to firebase-appindexing/samples/AppIndexingSample/Resources/xml/noindex.xml diff --git a/firebase-appindexing/samples/AppIndexingSample/packages.config b/firebase-appindexing/samples/AppIndexingSample/packages.config new file mode 100644 index 000000000..247b0876a --- /dev/null +++ b/firebase-appindexing/samples/AppIndexingSample/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ads-lite/source/Additions/AboutAdditions.txt b/firebase-appindexing/source/Additions/AboutAdditions.txt similarity index 100% rename from ads-lite/source/Additions/AboutAdditions.txt rename to firebase-appindexing/source/Additions/AboutAdditions.txt diff --git a/appindexing/source/Additions/Additions.cs b/firebase-appindexing/source/Additions/Additions.cs similarity index 100% rename from appindexing/source/Additions/Additions.cs rename to firebase-appindexing/source/Additions/Additions.cs diff --git a/appindexing/source/Additions/IPendingResultExtensions.cs b/firebase-appindexing/source/Additions/IPendingResultExtensions.cs similarity index 100% rename from appindexing/source/Additions/IPendingResultExtensions.cs rename to firebase-appindexing/source/Additions/IPendingResultExtensions.cs diff --git a/firebase-auth-common/source/Firebase-Auth-Common.csproj b/firebase-appindexing/source/Firebase-AppIndexing.csproj similarity index 74% rename from firebase-auth-common/source/Firebase-Auth-Common.csproj rename to firebase-appindexing/source/Firebase-AppIndexing.csproj index 6362cf95f..924ac2f25 100644 --- a/firebase-auth-common/source/Firebase-Auth-Common.csproj +++ b/firebase-appindexing/source/Firebase-AppIndexing.csproj @@ -1,21 +1,23 @@ + Debug AnyCPU {10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F} + {8D01CC30-64F5-4AD3-B9C8-0970B0F1D562} Library - Xamarin.Firebase.Auth.Common + Xamarin.Firebase.AppIndexing Resources Assets False - Xamarin.Firebase.Auth.Common + Xamarin.Firebase.AppIndexing v7.0 class-parse ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,13 +47,13 @@ - - Properties\GpsConsts.cs - + + + @@ -64,23 +66,25 @@ {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} Basement - - {3F6BAE25-ADEB-468C-8384-AD655623C341} - Base - {865652D3-8D1A-4779-92FC-4C54719286B7} Firebase-Common - - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} - Firebase-Auth-Module + + {3F6BAE25-ADEB-468C-8384-AD655623C341} + Base + + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + - - Jars\firebase-auth-common.jar + + Jars\firebase-appindexing.jar + diff --git a/appindexing/source/Jars/AboutJars.txt b/firebase-appindexing/source/Jars/AboutJars.txt similarity index 100% rename from appindexing/source/Jars/AboutJars.txt rename to firebase-appindexing/source/Jars/AboutJars.txt diff --git a/firebase-appindexing/source/Properties/AssemblyInfo.cs b/firebase-appindexing/source/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..7d2c7aa4e --- /dev/null +++ b/firebase-appindexing/source/Properties/AssemblyInfo.cs @@ -0,0 +1,24 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using Android.App; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. + +[assembly: AssemblyTitle ("Xamarin.Firebase.AppIndexing")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("Microsoft Corporation")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] + +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. + +[assembly: AssemblyVersion ("1.0.0")] + +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. diff --git a/appindexing/source/Transforms/EnumFields.xml b/firebase-appindexing/source/Transforms/EnumFields.xml similarity index 100% rename from appindexing/source/Transforms/EnumFields.xml rename to firebase-appindexing/source/Transforms/EnumFields.xml diff --git a/appindexing/source/Transforms/EnumMethods.xml b/firebase-appindexing/source/Transforms/EnumMethods.xml similarity index 100% rename from appindexing/source/Transforms/EnumMethods.xml rename to firebase-appindexing/source/Transforms/EnumMethods.xml diff --git a/appindexing/source/Transforms/Metadata.generated.xml b/firebase-appindexing/source/Transforms/Metadata.generated.xml similarity index 100% rename from appindexing/source/Transforms/Metadata.generated.xml rename to firebase-appindexing/source/Transforms/Metadata.generated.xml diff --git a/appindexing/source/Transforms/Metadata.xml b/firebase-appindexing/source/Transforms/Metadata.xml similarity index 99% rename from appindexing/source/Transforms/Metadata.xml rename to firebase-appindexing/source/Transforms/Metadata.xml index 02f42076a..ed9b58831 100644 --- a/appindexing/source/Transforms/Metadata.xml +++ b/firebase-appindexing/source/Transforms/Metadata.xml @@ -29,5 +29,4 @@ API API - diff --git a/firebase-appindexing/source/packages.config b/firebase-appindexing/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-appindexing/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-auth-common/source/Additions/AboutAdditions.txt b/firebase-auth-common/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/firebase-auth-common/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/firebase-auth-common/source/Jars/AboutJars.txt b/firebase-auth-common/source/Jars/AboutJars.txt deleted file mode 100644 index 320a154be..000000000 --- a/firebase-auth-common/source/Jars/AboutJars.txt +++ /dev/null @@ -1,37 +0,0 @@ -This directory is for Android .jars. - -There are 4 types of jars that are supported: - -== Input Jar and Embedded Jar == - -This is the jar that bindings should be generated for. - -For example, if you were binding the Google Maps library, this would -be Google's "maps.jar". - -The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be -embedded in the resulting dll as EmbeddedResource, while InputJar is not. -There are couple of reasons you wouldn't like to embed the target jar -in your dll (the ones that could be internally loaded by -feature e.g. maps.jar, or you cannot embed jars that are under some -proprietary license). - -Set the build action for these jars in the properties page to "InputJar". - - -== Reference Jar and Embedded Reference Jar == - -These are jars that are referenced by the input jar. C# bindings will -not be created for these jars. These jars will be used to resolve -types used by the input jar. - -NOTE: Do not add "android.jar" as a reference jar. It will be added automatically -based on the Target Framework selected. - -Set the build action for these jars in the properties page to "ReferenceJar". - -"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is -embedded in your dll. But at application build time, they are not included -in the final apk, like ReferenceJar files. - - diff --git a/firebase-auth-common/source/Properties/AssemblyInfo.cs b/firebase-auth-common/source/Properties/AssemblyInfo.cs deleted file mode 100644 index a18954283..000000000 --- a/firebase-auth-common/source/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using Android.App; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("Xamarin.Firebase.Auth.Common")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("Microsoft Corporation")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-auth-common/" + __FbConsts.Version + "/firebase-auth-common-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-auth-module/nuget/Xamarin.Firebase.Auth.Module.template.nuspec b/firebase-auth-module/nuget/Xamarin.Firebase.Auth.Module.template.nuspec deleted file mode 100644 index 0f9a8ee27..000000000 --- a/firebase-auth-module/nuget/Xamarin.Firebase.Auth.Module.template.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - Xamarin.Firebase.Auth.Module - Xamarin Firebase - Auth Module - $version$ - Xamarin Inc. - Xamarin Inc. - true - Xamarin.Android Bindings for Firebase - Auth Module $aar-version$ - - Xamarin.Android Bindings for Firebase - Auth Module $aar-version$ - - Copyright © Microsoft Corporation - https://github.com/xamarin/GooglePlayServicesComponents/ - https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md - https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-auth-module_128x128.png - - - - - - - - - diff --git a/firebase-auth-module/source/Additions/AboutAdditions.txt b/firebase-auth-module/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/firebase-auth-module/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/firebase-auth-module/source/Firebase-Auth-Module.csproj b/firebase-auth-module/source/Firebase-Auth-Module.csproj deleted file mode 100644 index 538dff7dd..000000000 --- a/firebase-auth-module/source/Firebase-Auth-Module.csproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - Debug - AnyCPU - {10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} - Library - Xamarin.Firebase.Auth.Module - Resources - Assets - False - Xamarin.Firebase.Auth.Module - v7.0 - class-parse - ..\..\externals\docs\reference - 8.0.30703 - 2.0 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - None - false - - - full - true - bin\Release - prompt - 4 - false - false - - - - - - - - - - - Properties\GpsConsts.cs - - - - - - - - - - - - - - - - Jars\firebase-auth-module.jar - - - diff --git a/firebase-auth-module/source/Jars/AboutJars.txt b/firebase-auth-module/source/Jars/AboutJars.txt deleted file mode 100644 index 320a154be..000000000 --- a/firebase-auth-module/source/Jars/AboutJars.txt +++ /dev/null @@ -1,37 +0,0 @@ -This directory is for Android .jars. - -There are 4 types of jars that are supported: - -== Input Jar and Embedded Jar == - -This is the jar that bindings should be generated for. - -For example, if you were binding the Google Maps library, this would -be Google's "maps.jar". - -The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be -embedded in the resulting dll as EmbeddedResource, while InputJar is not. -There are couple of reasons you wouldn't like to embed the target jar -in your dll (the ones that could be internally loaded by -feature e.g. maps.jar, or you cannot embed jars that are under some -proprietary license). - -Set the build action for these jars in the properties page to "InputJar". - - -== Reference Jar and Embedded Reference Jar == - -These are jars that are referenced by the input jar. C# bindings will -not be created for these jars. These jars will be used to resolve -types used by the input jar. - -NOTE: Do not add "android.jar" as a reference jar. It will be added automatically -based on the Target Framework selected. - -Set the build action for these jars in the properties page to "ReferenceJar". - -"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is -embedded in your dll. But at application build time, they are not included -in the final apk, like ReferenceJar files. - - diff --git a/firebase-auth-module/source/Transforms/EnumFields.xml b/firebase-auth-module/source/Transforms/EnumFields.xml deleted file mode 100644 index e9af0eeb3..000000000 --- a/firebase-auth-module/source/Transforms/EnumFields.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/firebase-auth-module/source/Transforms/EnumMethods.xml b/firebase-auth-module/source/Transforms/EnumMethods.xml deleted file mode 100644 index 2efa81467..000000000 --- a/firebase-auth-module/source/Transforms/EnumMethods.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/firebase-auth-module/source/Transforms/Metadata.generated.xml b/firebase-auth-module/source/Transforms/Metadata.generated.xml deleted file mode 100644 index 26c2f6238..000000000 --- a/firebase-auth-module/source/Transforms/Metadata.generated.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/firebase-auth-module/source/Transforms/Metadata.xml b/firebase-auth-module/source/Transforms/Metadata.xml deleted file mode 100644 index e8d043d99..000000000 --- a/firebase-auth-module/source/Transforms/Metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Firebase.Auth.Api.Model - - - - - - - - - source - size - dest - flags - - diff --git a/firebase-auth/component/component.template.yaml b/firebase-auth/component/component.template.yaml index 81287e937..9ae746eda 100644 --- a/firebase-auth/component/component.template.yaml +++ b/firebase-auth/component/component.template.yaml @@ -24,8 +24,6 @@ samples: - Tasks - Firebase-Common - Firebase-Auth - - Firebase-Auth-Common - - Firebase-Auth-Module installNuGets: - project: FirebaseAuthQuickstart packages: @@ -36,9 +34,8 @@ samples: - Xamarin.GooglePlayServices.Tasks - Xamarin.Firebase.Common - Xamarin.Firebase.Auth - - Xamarin.Firebase.Auth.Common - - Xamarin.Firebase.Auth.Module removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-auth/nuget/Xamarin.Firebase.Auth.template.nuspec b/firebase-auth/nuget/Xamarin.Firebase.Auth.template.nuspec index d58311887..78f28be52 100644 --- a/firebase-auth/nuget/Xamarin.Firebase.Auth.template.nuspec +++ b/firebase-auth/nuget/Xamarin.Firebase.Auth.template.nuspec @@ -16,15 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-auth_128x128.png - - - - - - + + + + + + + + diff --git a/firebase-auth/samples/FirebaseAuthQuickstart.sln b/firebase-auth/samples/FirebaseAuthQuickstart.sln index 1166ff6a3..0dfb523d2 100644 --- a/firebase-auth/samples/FirebaseAuthQuickstart.sln +++ b/firebase-auth/samples/FirebaseAuthQuickstart.sln @@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tasks", "..\..\tasks\source EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Common", "..\..\firebase-common\source\Firebase-Common.csproj", "{865652D3-8D1A-4779-92FC-4C54719286B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth-Module", "..\..\firebase-auth-module\source\Firebase-Auth-Module.csproj", "{7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth-Common", "..\..\firebase-auth-common\source\Firebase-Auth-Common.csproj", "{F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth", "..\source\Firebase-Auth.csproj", "{62946D89-B6B1-4A38-A04D-C20912087EFD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basement-BuildTasks", "..\..\basement\buildtasks\Basement-BuildTasks.csproj", "{21D99A15-AB98-4691-A45B-D236B2A91DEB}" @@ -51,14 +47,6 @@ Global {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 - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Release|Any CPU.Build.0 = Release|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Release|Any CPU.Build.0 = Release|Any CPU {62946D89-B6B1-4A38-A04D-C20912087EFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {62946D89-B6B1-4A38-A04D-C20912087EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU {62946D89-B6B1-4A38-A04D-C20912087EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/firebase-auth/samples/FirebaseAuthQuickstart/FirebaseAuthQuickstart.csproj b/firebase-auth/samples/FirebaseAuthQuickstart/FirebaseAuthQuickstart.csproj index f7093f617..8dc44b0d6 100644 --- a/firebase-auth/samples/FirebaseAuthQuickstart/FirebaseAuthQuickstart.csproj +++ b/firebase-auth/samples/FirebaseAuthQuickstart/FirebaseAuthQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -42,31 +43,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -133,14 +134,6 @@ {62946D89-B6B1-4A38-A04D-C20912087EFD} Firebase-Auth - - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F} - Firebase-Auth-Common - - - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} - Firebase-Auth-Module - {865652D3-8D1A-4779-92FC-4C54719286B7} Firebase-Common @@ -162,6 +155,16 @@ + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-auth/samples/FirebaseAuthQuickstart/packages.config b/firebase-auth/samples/FirebaseAuthQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-auth/samples/FirebaseAuthQuickstart/packages.config +++ b/firebase-auth/samples/FirebaseAuthQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-auth/source/Additions/Additions.cs b/firebase-auth/source/Additions/Additions.cs index 466b594cf..85b852565 100644 --- a/firebase-auth/source/Additions/Additions.cs +++ b/firebase-auth/source/Additions/Additions.cs @@ -39,6 +39,26 @@ public System.Threading.Tasks.Task SendPasswordResetEmailAsync (string email) { return SendPasswordResetEmail (email).AsAsync (); } + + public System.Threading.Tasks.Task ApplyActionCodeAsync(string code) + { + return ApplyActionCode(code).AsAsync(); + } + + public System.Threading.Tasks.Task CheckActionCodeAsync(string code) + { + return CheckActionCode(code).AsAsync(); + } + + public System.Threading.Tasks.Task ConfirmPasswordResetAsync(string code, string newPassword) + { + return ConfirmPasswordReset(code, newPassword).AsAsync(); + } + + public System.Threading.Tasks.Task VerifyPasswordResetCodeAsync(string code) + { + return VerifyPasswordResetCode(code).AsAsync(); + } } } diff --git a/firebase-auth/source/Firebase-Auth.csproj b/firebase-auth/source/Firebase-Auth.csproj index 02d524e21..4a6b13bd6 100644 --- a/firebase-auth/source/Firebase-Auth.csproj +++ b/firebase-auth/source/Firebase-Auth.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -12,10 +13,11 @@ False Xamarin.Firebase.Auth v7.0 - class-parse + jar2xml ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -43,29 +45,26 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - @@ -91,23 +90,23 @@ {865652D3-8D1A-4779-92FC-4C54719286B7} Firebase-Common - - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F} - Firebase-Auth-Common - {53F87D88-8871-41A2-9F81-B79AB02FEC24} Tasks - - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} - Firebase-Auth-Module - + Jars\firebase-auth.jar + + + + + + + diff --git a/firebase-auth/source/Properties/AssemblyInfo.cs b/firebase-auth/source/Properties/AssemblyInfo.cs index 370ecd652..8f73f5fc9 100644 --- a/firebase-auth/source/Properties/AssemblyInfo.cs +++ b/firebase-auth/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-auth/" + __FbConsts.Version + "/firebase-auth-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-auth/source/Transforms/Metadata.xml b/firebase-auth/source/Transforms/Metadata.xml index 2f846896f..158e05d2a 100644 --- a/firebase-auth/source/Transforms/Metadata.xml +++ b/firebase-auth/source/Transforms/Metadata.xml @@ -2,7 +2,8 @@ Firebase.Auth - + Firebase.Auth.Api.Model + @@ -15,7 +16,7 @@ dest flags - + 8.0.30703 2.0 + true @@ -46,31 +48,27 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - @@ -95,9 +93,17 @@ + Jars\firebase-common.jar + + + + + + + diff --git a/firebase-common/source/Properties/AssemblyInfo.cs b/firebase-common/source/Properties/AssemblyInfo.cs index 70beb6cbc..036fb46c5 100644 --- a/firebase-common/source/Properties/AssemblyInfo.cs +++ b/firebase-common/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-common/" + __FbConsts.Version + "/firebase-common-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-common/source/packages.config b/firebase-common/source/packages.config index 71e0c9953..247b0876a 100644 --- a/firebase-common/source/packages.config +++ b/firebase-common/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/firebase-config/component/component.template.yaml b/firebase-config/component/component.template.yaml index 1d3b51b3e..3d17fcf51 100644 --- a/firebase-config/component/component.template.yaml +++ b/firebase-config/component/component.template.yaml @@ -34,5 +34,6 @@ samples: - Xamarin.Firebase.Iid removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-config/nuget/Xamarin.Firebase.Config.template.nuspec b/firebase-config/nuget/Xamarin.Firebase.Config.template.nuspec index b3020e17d..c23ced2a3 100644 --- a/firebase-config/nuget/Xamarin.Firebase.Config.template.nuspec +++ b/firebase-config/nuget/Xamarin.Firebase.Config.template.nuspec @@ -16,14 +16,18 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-config_128x128.png - - - - - + + + + + + + + + diff --git a/firebase-config/samples/FirebaseConfigQuickstart/FirebaseConfigQuickstart.csproj b/firebase-config/samples/FirebaseConfigQuickstart/FirebaseConfigQuickstart.csproj index dd1b7d35f..c9ed59016 100644 --- a/firebase-config/samples/FirebaseConfigQuickstart/FirebaseConfigQuickstart.csproj +++ b/firebase-config/samples/FirebaseConfigQuickstart/FirebaseConfigQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -45,31 +46,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -136,6 +137,16 @@ + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-config/samples/FirebaseConfigQuickstart/packages.config b/firebase-config/samples/FirebaseConfigQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-config/samples/FirebaseConfigQuickstart/packages.config +++ b/firebase-config/samples/FirebaseConfigQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-config/source/Firebase-Config.csproj b/firebase-config/source/Firebase-Config.csproj index 2bae3ba64..af3fcb02b 100644 --- a/firebase-config/source/Firebase-Config.csproj +++ b/firebase-config/source/Firebase-Config.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,14 +47,12 @@ - - Properties\GpsConsts.cs - + @@ -83,9 +83,11 @@ + Jars\firebase-config.jar + diff --git a/firebase-config/source/Properties/AssemblyInfo.cs b/firebase-config/source/Properties/AssemblyInfo.cs index aefd4daf4..990b292b7 100644 --- a/firebase-config/source/Properties/AssemblyInfo.cs +++ b/firebase-config/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-config/" + __FbConsts.Version + "/firebase-config-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-config/source/packages.config b/firebase-config/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-config/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-core/nuget/Xamarin.Firebase.Core.template.nuspec b/firebase-core/nuget/Xamarin.Firebase.Core.template.nuspec index 6ea1dec2b..2e04e82d0 100644 --- a/firebase-core/nuget/Xamarin.Firebase.Core.template.nuspec +++ b/firebase-core/nuget/Xamarin.Firebase.Core.template.nuspec @@ -16,7 +16,9 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-core_128x128.png - + + + diff --git a/firebase-crash/component/component.template.yaml b/firebase-crash/component/component.template.yaml index 16e686e0f..52a563e7e 100644 --- a/firebase-crash/component/component.template.yaml +++ b/firebase-crash/component/component.template.yaml @@ -34,5 +34,6 @@ samples: - Xamarin.Firebase.Crash removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-crash/nuget/Xamarin.Firebase.Crash.template.nuspec b/firebase-crash/nuget/Xamarin.Firebase.Crash.template.nuspec index 72ec785e0..731da2af3 100644 --- a/firebase-crash/nuget/Xamarin.Firebase.Crash.template.nuspec +++ b/firebase-crash/nuget/Xamarin.Firebase.Crash.template.nuspec @@ -16,13 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-crash_128x128.png - - - - + + + + + + + + diff --git a/firebase-crash/samples/FirebaseCrashReportingQuickstart/FirebaseCrashReportingQuickstart.csproj b/firebase-crash/samples/FirebaseCrashReportingQuickstart/FirebaseCrashReportingQuickstart.csproj index 58be8451f..22a37fa54 100644 --- a/firebase-crash/samples/FirebaseCrashReportingQuickstart/FirebaseCrashReportingQuickstart.csproj +++ b/firebase-crash/samples/FirebaseCrashReportingQuickstart/FirebaseCrashReportingQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -42,31 +43,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -131,6 +132,16 @@ + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-crash/samples/FirebaseCrashReportingQuickstart/packages.config b/firebase-crash/samples/FirebaseCrashReportingQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-crash/samples/FirebaseCrashReportingQuickstart/packages.config +++ b/firebase-crash/samples/FirebaseCrashReportingQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-crash/source/Additions/Manifest.cs b/firebase-crash/source/Additions/Manifest.cs deleted file mode 100644 index 9288034a0..000000000 --- a/firebase-crash/source/Additions/Manifest.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] - -namespace Firebase.Crash.Internal.Service -{ - // - [Service (Name="com.google.firebase.crash.internal.service.FirebaseCrashReceiverService", - Process=":background_crash")] - public partial class FirebaseCrashReceiverService - { - } - - // - [Service (Name="com.google.firebase.crash.internal.service.FirebaseCrashSenderService", - Process=":background_crash")] - public partial class FirebaseCrashSenderService - { - } -} - diff --git a/firebase-crash/source/Firebase-Crash.csproj b/firebase-crash/source/Firebase-Crash.csproj index 4553bf354..69e44128a 100644 --- a/firebase-crash/source/Firebase-Crash.csproj +++ b/firebase-crash/source/Firebase-Crash.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,15 +47,12 @@ - - Properties\GpsConsts.cs - - + @@ -84,9 +83,11 @@ + Jars\firebase-crash.jar + diff --git a/firebase-crash/source/Properties/AssemblyInfo.cs b/firebase-crash/source/Properties/AssemblyInfo.cs index 2b3527750..23a525349 100644 --- a/firebase-crash/source/Properties/AssemblyInfo.cs +++ b/firebase-crash/source/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle ("Xamarin.Firebase.Config")] +[assembly: AssemblyTitle ("Xamarin.Firebase.Crash")] [assembly: AssemblyDescription ("")] [assembly: AssemblyConfiguration ("")] [assembly: AssemblyCompany ("Microsoft Corporation")] @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-crash/" + __FbConsts.Version + "/firebase-crash-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-crash/source/packages.config b/firebase-crash/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-crash/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-database-connection/nuget/Xamarin.Firebase.Database.Connection.template.nuspec b/firebase-database-connection/nuget/Xamarin.Firebase.Database.Connection.template.nuspec index 44703d399..4df184310 100644 --- a/firebase-database-connection/nuget/Xamarin.Firebase.Database.Connection.template.nuspec +++ b/firebase-database-connection/nuget/Xamarin.Firebase.Database.Connection.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-database-connection_128x128.png - - + + + + + + diff --git a/firebase-database-connection/source/Firebase-Database-Connection.csproj b/firebase-database-connection/source/Firebase-Database-Connection.csproj index 0ff53d2f4..c05c7aad7 100644 --- a/firebase-database-connection/source/Firebase-Database-Connection.csproj +++ b/firebase-database-connection/source/Firebase-Database-Connection.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,13 +47,11 @@ - - Properties\GpsConsts.cs - + @@ -70,9 +70,11 @@ + Jars\firebase-database-connection.jar + diff --git a/firebase-database-connection/source/Properties/AssemblyInfo.cs b/firebase-database-connection/source/Properties/AssemblyInfo.cs index 8d541bfef..8f5958b47 100644 --- a/firebase-database-connection/source/Properties/AssemblyInfo.cs +++ b/firebase-database-connection/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-database-connection/" + __FbConsts.Version + "/firebase-database-connection-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-database-connection/source/packages.config b/firebase-database-connection/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-database-connection/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-database/nuget/Xamarin.Firebase.Database.template.nuspec b/firebase-database/nuget/Xamarin.Firebase.Database.template.nuspec index a11bc1c81..daac94ba8 100644 --- a/firebase-database/nuget/Xamarin.Firebase.Database.template.nuspec +++ b/firebase-database/nuget/Xamarin.Firebase.Database.template.nuspec @@ -16,13 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-database_128x128.png - - - - + + + + + + + + diff --git a/firebase-database/source/Firebase-Database.csproj b/firebase-database/source/Firebase-Database.csproj index 5911fe1fc..6372d465b 100644 --- a/firebase-database/source/Firebase-Database.csproj +++ b/firebase-database/source/Firebase-Database.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,14 +47,12 @@ - - Properties\GpsConsts.cs - + @@ -79,9 +79,11 @@ + Jars\firebase-database.jar + diff --git a/firebase-database/source/Properties/AssemblyInfo.cs b/firebase-database/source/Properties/AssemblyInfo.cs index 9e9aa4d40..260f32031 100644 --- a/firebase-database/source/Properties/AssemblyInfo.cs +++ b/firebase-database/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-database/" + __FbConsts.Version + "/firebase-database-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-database/source/packages.config b/firebase-database/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-database/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-iid/nuget/Xamarin.Firebase.Iid.template.nuspec b/firebase-iid/nuget/Xamarin.Firebase.Iid.template.nuspec index 6b7e47ea6..f40a55844 100644 --- a/firebase-iid/nuget/Xamarin.Firebase.Iid.template.nuspec +++ b/firebase-iid/nuget/Xamarin.Firebase.Iid.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-iid_128x128.png - - + + + + + + diff --git a/firebase-iid/source/Additions/Manifest.cs b/firebase-iid/source/Additions/Manifest.cs deleted file mode 100644 index 43393a55a..000000000 --- a/firebase-iid/source/Additions/Manifest.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; -using Android.App; -using Android.Content; - -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] -[assembly: UsesPermission (Android.Manifest.Permission.WakeLock)] -[assembly: UsesPermission ("com.google.android.c2dm.permission.RECEIVE")] - -// -// -[assembly: Permission (Name="${applicationId}.permission.C2D_MESSAGE", ProtectionLevel=Android.Content.PM.Protection.Signature)] -[assembly: UsesPermission ("${applicationId}.permission.C2D_MESSAGE")] - -namespace Firebase.Iid -{ - // - // - // - // - // - // - // - [BroadcastReceiver (Name="com.google.firebase.iid.FirebaseInstanceIdReceiver", - Exported=true, - Permission="com.google.android.c2dm.permission.SEND")] - [IntentFilter (new [] { "com.google.android.c2dm.intent.RECEIVE", "com.google.android.c2dm.intent.REGISTRATION" }, - Categories = new [] { "${applicationId}" })] - public partial class FirebaseInstanceIdReceiver - { - } - - // - // - [BroadcastReceiver (Name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver", - Exported=false)] - public partial class FirebaseInstanceIdInternalReceiver - { - } - - // - // - // - // - // - // - [Service (Name="com.google.firebase.iid.FirebaseInstanceIdService", - Exported=true)] - [IntentFilter (new [] { "com.google.firebase.INSTANCE_ID_EVENT" }, Priority=-500)] - public partial class FirebaseInstanceIdService - { - } -} - diff --git a/firebase-iid/source/Firebase-Iid.csproj b/firebase-iid/source/Firebase-Iid.csproj index 23747e09d..95be8298a 100644 --- a/firebase-iid/source/Firebase-Iid.csproj +++ b/firebase-iid/source/Firebase-Iid.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,14 +47,11 @@ - - Properties\GpsConsts.cs - - + @@ -71,9 +70,11 @@ + Jars\firebase-iid.jar + diff --git a/firebase-iid/source/Properties/AssemblyInfo.cs b/firebase-iid/source/Properties/AssemblyInfo.cs index 3f6976fa6..53aa2ef34 100644 --- a/firebase-iid/source/Properties/AssemblyInfo.cs +++ b/firebase-iid/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-iid/" + __FbConsts.Version + "/firebase-iid-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-iid/source/Transforms/Metadata.xml b/firebase-iid/source/Transforms/Metadata.xml index 4301fb79c..45cee885d 100644 --- a/firebase-iid/source/Transforms/Metadata.xml +++ b/firebase-iid/source/Transforms/Metadata.xml @@ -16,4 +16,5 @@ dest flags + false diff --git a/firebase-iid/source/packages.config b/firebase-iid/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-iid/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-invites/component/component.template.yaml b/firebase-invites/component/component.template.yaml index eab727436..f9a0bf05b 100644 --- a/firebase-invites/component/component.template.yaml +++ b/firebase-invites/component/component.template.yaml @@ -34,5 +34,6 @@ samples: - Xamarin.Firebase.Analytics.Impl removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-invites/nuget/Xamarin.Firebase.Invites.template.nuspec b/firebase-invites/nuget/Xamarin.Firebase.Invites.template.nuspec index ea57ef809..7cfd94396 100644 --- a/firebase-invites/nuget/Xamarin.Firebase.Invites.template.nuspec +++ b/firebase-invites/nuget/Xamarin.Firebase.Invites.template.nuspec @@ -16,8 +16,10 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-invites_128x128.png - - + + + + diff --git a/firebase-invites/samples/FirebaseInvitesQuickstart/FirebaseInvitesQuickstart.csproj b/firebase-invites/samples/FirebaseInvitesQuickstart/FirebaseInvitesQuickstart.csproj index 06e54c3b8..5f7ce1c32 100644 --- a/firebase-invites/samples/FirebaseInvitesQuickstart/FirebaseInvitesQuickstart.csproj +++ b/firebase-invites/samples/FirebaseInvitesQuickstart/FirebaseInvitesQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -43,37 +44,37 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.RecyclerView.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll + ..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.Design.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll + ..\packages\Xamarin.Android.Support.Design.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll False @@ -146,6 +147,18 @@ + - + + + + + + + + + + + + \ No newline at end of file diff --git a/firebase-invites/samples/FirebaseInvitesQuickstart/packages.config b/firebase-invites/samples/FirebaseInvitesQuickstart/packages.config index 2b50d99c1..48ed573c6 100644 --- a/firebase-invites/samples/FirebaseInvitesQuickstart/packages.config +++ b/firebase-invites/samples/FirebaseInvitesQuickstart/packages.config @@ -1,14 +1,15 @@  - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/firebase-messaging/component/component.template.yaml b/firebase-messaging/component/component.template.yaml index 337341b59..9f104024d 100644 --- a/firebase-messaging/component/component.template.yaml +++ b/firebase-messaging/component/component.template.yaml @@ -32,5 +32,6 @@ samples: - Xamarin.Firebase.Messaging removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-messaging/nuget/Xamarin.Firebase.Messaging.template.nuspec b/firebase-messaging/nuget/Xamarin.Firebase.Messaging.template.nuspec index 4307ff7b6..63da63124 100644 --- a/firebase-messaging/nuget/Xamarin.Firebase.Messaging.template.nuspec +++ b/firebase-messaging/nuget/Xamarin.Firebase.Messaging.template.nuspec @@ -16,12 +16,16 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-messaging_128x128.png - - - + + + + + + + diff --git a/firebase-messaging/samples/FirebaseMessagingQuickstart/FirebaseMessagingQuickstart.csproj b/firebase-messaging/samples/FirebaseMessagingQuickstart/FirebaseMessagingQuickstart.csproj index 5f3eb0de7..b73f24ff9 100644 --- a/firebase-messaging/samples/FirebaseMessagingQuickstart/FirebaseMessagingQuickstart.csproj +++ b/firebase-messaging/samples/FirebaseMessagingQuickstart/FirebaseMessagingQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -42,31 +43,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -139,6 +140,16 @@ + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-messaging/samples/FirebaseMessagingQuickstart/packages.config b/firebase-messaging/samples/FirebaseMessagingQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-messaging/samples/FirebaseMessagingQuickstart/packages.config +++ b/firebase-messaging/samples/FirebaseMessagingQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-messaging/source/Additions/Manifest.cs b/firebase-messaging/source/Additions/Manifest.cs deleted file mode 100644 index 944ed6412..000000000 --- a/firebase-messaging/source/Additions/Manifest.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Android.App; - -namespace Firebase.Messaging -{ - // - // - // - // - // - // - [Service (Name="com.google.firebase.messaging.FirebaseMessagingService", - Exported=true)] - [IntentFilter (new [] { "com.google.firebase.MESSAGING_EVENT" }, Priority=-500)] - public partial class FirebaseMessagingService - { - } -} diff --git a/firebase-messaging/source/Firebase-Messaging.csproj b/firebase-messaging/source/Firebase-Messaging.csproj index 4957e52fe..591c6aca8 100644 --- a/firebase-messaging/source/Firebase-Messaging.csproj +++ b/firebase-messaging/source/Firebase-Messaging.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,14 +47,11 @@ - - Properties\GpsConsts.cs - - + @@ -75,9 +74,11 @@ + Jars\firebase-messaging.jar + diff --git a/firebase-messaging/source/Properties/AssemblyInfo.cs b/firebase-messaging/source/Properties/AssemblyInfo.cs index cdae2e9ca..27fc66152 100644 --- a/firebase-messaging/source/Properties/AssemblyInfo.cs +++ b/firebase-messaging/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-messaging/" + __FbConsts.Version + "/firebase-messaging-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-messaging/source/packages.config b/firebase-messaging/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-messaging/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-storage-common/nuget/Xamarin.Firebase.Storage.Common.template.nuspec b/firebase-storage-common/nuget/Xamarin.Firebase.Storage.Common.template.nuspec index 466a71a65..866a31aeb 100644 --- a/firebase-storage-common/nuget/Xamarin.Firebase.Storage.Common.template.nuspec +++ b/firebase-storage-common/nuget/Xamarin.Firebase.Storage.Common.template.nuspec @@ -16,10 +16,14 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-storage-common_128x128.png - + + + + + diff --git a/firebase-storage-common/source/Firebase-Storage-Common.csproj b/firebase-storage-common/source/Firebase-Storage-Common.csproj index e9b548055..36c300851 100644 --- a/firebase-storage-common/source/Firebase-Storage-Common.csproj +++ b/firebase-storage-common/source/Firebase-Storage-Common.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,13 +47,11 @@ - - Properties\GpsConsts.cs - + @@ -66,9 +66,11 @@ + Jars\firebase-storage-common.jar + diff --git a/firebase-storage-common/source/Properties/AssemblyInfo.cs b/firebase-storage-common/source/Properties/AssemblyInfo.cs index bee7aeb50..2f85721be 100644 --- a/firebase-storage-common/source/Properties/AssemblyInfo.cs +++ b/firebase-storage-common/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-storage-common/" + __FbConsts.Version + "/firebase-storage-common-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-storage-common/source/packages.config b/firebase-storage-common/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-storage-common/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/firebase-storage/component/component.template.yaml b/firebase-storage/component/component.template.yaml index 250adc76d..2463efbb5 100644 --- a/firebase-storage/component/component.template.yaml +++ b/firebase-storage/component/component.template.yaml @@ -21,8 +21,6 @@ samples: - Basement-BuildTasks - Tasks - Firebase-Auth - - Firebase-Auth-Common - - Firebase-Auth-Module - Firebase-Common - Firebase-Storage - Firebase-Storage-Common @@ -33,12 +31,11 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.Firebase.Auth - - Xamarin.Firebase.Auth.Common - - Xamarin.Firebase.Auth.Module - Xamarin.Firebase.Common - Xamarin.Firebase.Storage - Xamarin.Firebase.Storage.Common removeNodes: - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/firebase-storage/nuget/Xamarin.Firebase.Storage.template.nuspec b/firebase-storage/nuget/Xamarin.Firebase.Storage.template.nuspec index 3a4ce51af..fdfc8ca30 100644 --- a/firebase-storage/nuget/Xamarin.Firebase.Storage.template.nuspec +++ b/firebase-storage/nuget/Xamarin.Firebase.Storage.template.nuspec @@ -16,13 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/firebase-storage_128x128.png - - - - + + + + + + + + diff --git a/firebase-storage/samples/FirebaseStorageQuickstart.sln b/firebase-storage/samples/FirebaseStorageQuickstart.sln index 06a832c98..c7b4149da 100644 --- a/firebase-storage/samples/FirebaseStorageQuickstart.sln +++ b/firebase-storage/samples/FirebaseStorageQuickstart.sln @@ -13,10 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Base", "..\..\base\source\B EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basement", "..\..\basement\source\Basement.csproj", "{6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth-Common", "..\..\firebase-auth-common\source\Firebase-Auth-Common.csproj", "{F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Auth-Module", "..\..\firebase-auth-module\source\Firebase-Auth-Module.csproj", "{7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Common", "..\..\firebase-common\source\Firebase-Common.csproj", "{865652D3-8D1A-4779-92FC-4C54719286B7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebase-Storage-Common", "..\..\firebase-storage-common\source\Firebase-Storage-Common.csproj", "{C360116C-0ED5-4E59-A974-E95F874B4398}" @@ -55,14 +51,6 @@ Global {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}.Release|Any CPU.Build.0 = Release|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F}.Release|Any CPU.Build.0 = Release|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B}.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 diff --git a/firebase-storage/samples/FirebaseStorageQuickstart/FirebaseStorageQuickstart.csproj b/firebase-storage/samples/FirebaseStorageQuickstart/FirebaseStorageQuickstart.csproj index 04de5ad99..9122e9593 100644 --- a/firebase-storage/samples/FirebaseStorageQuickstart/FirebaseStorageQuickstart.csproj +++ b/firebase-storage/samples/FirebaseStorageQuickstart/FirebaseStorageQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,31 +45,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.v7.AppCompat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll @@ -101,14 +102,6 @@ {865652D3-8D1A-4779-92FC-4C54719286B7} Firebase-Common - - {F53B34FB-4BBC-4314-8D8A-1F0CD959E83F} - Firebase-Auth-Common - - - {7DA24DFC-EF53-4C06-AB7A-FF6BEF513A1B} - Firebase-Auth-Module - {C360116C-0ED5-4E59-A974-E95F874B4398} Firebase-Storage-Common @@ -145,6 +138,16 @@ + - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-storage/samples/FirebaseStorageQuickstart/packages.config b/firebase-storage/samples/FirebaseStorageQuickstart/packages.config index 55bb22259..3f96dfaed 100644 --- a/firebase-storage/samples/FirebaseStorageQuickstart/packages.config +++ b/firebase-storage/samples/FirebaseStorageQuickstart/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/firebase-storage/source/Firebase-Storage.csproj b/firebase-storage/source/Firebase-Storage.csproj index f5d08a9b3..c8899d063 100644 --- a/firebase-storage/source/Firebase-Storage.csproj +++ b/firebase-storage/source/Firebase-Storage.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ ..\..\externals\docs\reference 8.0.30703 2.0 + true @@ -45,14 +47,12 @@ - - Properties\GpsConsts.cs - + @@ -78,9 +78,11 @@ + Jars\firebase-storage.jar + diff --git a/firebase-storage/source/Properties/AssemblyInfo.cs b/firebase-storage/source/Properties/AssemblyInfo.cs index f5cd5b124..4a4de3c25 100644 --- a/firebase-storage/source/Properties/AssemblyInfo.cs +++ b/firebase-storage/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-storage/" + __FbConsts.Version + "/firebase-storage-" + __FbConsts.Version + ".aar"; -} diff --git a/firebase-storage/source/packages.config b/firebase-storage/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/firebase-storage/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/fitness/component/component.template.yaml b/fitness/component/component.template.yaml index 85cc231f6..62d50289e 100644 --- a/fitness/component/component.template.yaml +++ b/fitness/component/component.template.yaml @@ -29,5 +29,8 @@ samples: - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Location - Xamarin.GooglePlayServices.Fitness + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/fitness/nuget/Xamarin.GooglePlayServices.Fitness.template.nuspec b/fitness/nuget/Xamarin.GooglePlayServices.Fitness.template.nuspec index 6b2299741..8166a59b0 100644 --- a/fitness/nuget/Xamarin.GooglePlayServices.Fitness.template.nuspec +++ b/fitness/nuget/Xamarin.GooglePlayServices.Fitness.template.nuspec @@ -18,12 +18,16 @@ http://components.xamarin.com/license/googleplayservices-fitness/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-fitness_128x128.png - - - + + + + + + + diff --git a/fitness/samples/BasicSensorsApi/BasicSensorsApi.csproj b/fitness/samples/BasicSensorsApi/BasicSensorsApi.csproj index 4b0517c7a..1511f7972 100644 --- a/fitness/samples/BasicSensorsApi/BasicSensorsApi.csproj +++ b/fitness/samples/BasicSensorsApi/BasicSensorsApi.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,31 +45,31 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - ..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + ..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Animated.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.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + ..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll @@ -124,5 +125,15 @@ Tasks - + + + + + + + + + + + \ No newline at end of file diff --git a/fitness/samples/BasicSensorsApi/packages.config b/fitness/samples/BasicSensorsApi/packages.config index 55bb22259..3f96dfaed 100644 --- a/fitness/samples/BasicSensorsApi/packages.config +++ b/fitness/samples/BasicSensorsApi/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/fitness/source/Additions/AboutAdditions.txt b/fitness/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/fitness/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/fitness/source/Additions/IPendingResultExtensions.cs b/fitness/source/Additions/IPendingResultExtensions.cs index de6ad5cd8..b4b22f074 100644 --- a/fitness/source/Additions/IPendingResultExtensions.cs +++ b/fitness/source/Additions/IPendingResultExtensions.cs @@ -173,5 +173,13 @@ public static async Task UnregisterForSessionsAsync (this ISessionsApi return (await api.UnregisterForSessions (client, intent)).JavaCast (); } } + + public static partial class IGoalsApiExtensions + { + public static async Task ReadCurrentGoals(this IGoalsApi api, Android.Gms.Common.Apis.GoogleApiClient client, Request.GoalsReadRequest request) + { + return (await api.ReadCurrentGoals(client, request)).JavaCast (); + } + } } diff --git a/fitness/source/Fitness.csproj b/fitness/source/Fitness.csproj index 8fcde6623..a9463e3ed 100644 --- a/fitness/source/Fitness.csproj +++ b/fitness/source/Fitness.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,20 +48,17 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -87,4 +86,6 @@ + + diff --git a/fitness/source/Properties/AssemblyInfo.cs b/fitness/source/Properties/AssemblyInfo.cs index 8c4ade8c1..3e9b3d733 100644 --- a/fitness/source/Properties/AssemblyInfo.cs +++ b/fitness/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-fitness/" + __GpsConsts.Version + "/play-services-fitness-" + __GpsConsts.Version + ".aar"; -} diff --git a/fitness/source/packages.config b/fitness/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/fitness/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/games/component/component.template.yaml b/games/component/component.template.yaml index 073b5c785..c0f6770ec 100644 --- a/games/component/component.template.yaml +++ b/games/component/component.template.yaml @@ -31,5 +31,8 @@ samples: - Xamarin.GooglePlayServices.Games - Xamarin.GooglePlayServices.Drive - Xamarin.GooglePlayServices.Plus + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/games/nuget/Xamarin.GooglePlayServices.Games.template.nuspec b/games/nuget/Xamarin.GooglePlayServices.Games.template.nuspec index 0a3f67989..74d231f9c 100644 --- a/games/nuget/Xamarin.GooglePlayServices.Games.template.nuspec +++ b/games/nuget/Xamarin.GooglePlayServices.Games.template.nuspec @@ -18,12 +18,16 @@ http://components.xamarin.com/license/googleplayservices-games/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-games_128x128.png - - - + + + + + + + diff --git a/games/samples/BeGenerous/BeGenerous.csproj b/games/samples/BeGenerous/BeGenerous.csproj index 301a5e071..902998b42 100644 --- a/games/samples/BeGenerous/BeGenerous.csproj +++ b/games/samples/BeGenerous/BeGenerous.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -136,4 +137,12 @@ + + + + + + + + \ No newline at end of file diff --git a/games/samples/BeGenerous/packages.config b/games/samples/BeGenerous/packages.config index 71e0c9953..247b0876a 100644 --- a/games/samples/BeGenerous/packages.config +++ b/games/samples/BeGenerous/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/games/source/Additions/AboutAdditions.txt b/games/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/games/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/games/source/Additions/BugWorkarounds.cs b/games/source/Additions/BugWorkarounds.cs index 0fc3c0b2f..76726dbb4 100644 --- a/games/source/Additions/BugWorkarounds.cs +++ b/games/source/Additions/BugWorkarounds.cs @@ -447,8 +447,28 @@ public override Java.Lang.Object Get (int position) // } //} // -//namespace Android.Gms.Games.MultiPlayer -//{ +namespace Android.Gms.Games.MultiPlayer +{ + //public sealed partial class ParticipantBuffer + //{ + // IntPtr id_get; + + // internal static IntPtr this_java_class_handle; + // internal static IntPtr this_class_ref + // { + // get + // { + // return JNIEnv.FindClass("com/google/android/gms/games/multiplayer/ParticipantBuffer", ref this_java_class_handle); + // } + // } + + // public override Java.Lang.Object Get(int position) + // { + // if (id_get == IntPtr.Zero) + // id_get = JNIEnv.GetMethodID(this_class_ref, "get", "(I)Ljava/lang/Object;"); + // return (Java.Lang.Object)global::Java.Lang.Object.GetObject(JNIEnv.CallObjectMethod(Handle, id_get, new JValue(position)), JniHandleOwnership.TransferLocalRef); + // } + //} // public partial class InvitationEntity // { // static IntPtr id_describeContents; @@ -494,7 +514,7 @@ public override Java.Lang.Object Get (int position) // JNIEnv.CallVoidMethod (Handle, id_writeToParcel_Landroid_os_Parcel_I, new JValue (p0), new JValue ((int) p1)); // } // } -//} +} // //namespace Android.Gms.Games.MultiPlayer.RealTime //{ diff --git a/games/source/Additions/DataBufferAdditions.cs b/games/source/Additions/DataBufferAdditions.cs index f5d0c8d05..751a4ddf6 100644 --- a/games/source/Additions/DataBufferAdditions.cs +++ b/games/source/Additions/DataBufferAdditions.cs @@ -49,18 +49,18 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() namespace Android.Gms.Games.AppContent { - //public partial class AppContentSectionBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class AppContentSectionBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } } namespace Android.Gms.Games.Event @@ -81,18 +81,18 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() namespace Android.Gms.Games.LeaderBoard { - //public partial class LeaderboardBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class LeaderboardBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } public partial class LeaderboardScoreBuffer : IEnumerable { @@ -123,50 +123,50 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() } } - //public partial class InvitationBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class InvitationBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } } namespace Android.Gms.Games.MultiPlayer.RealTime { - //public partial class RoomBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class RoomBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } } namespace Android.Gms.Games.MultiPlayer.TurnBased { - //public partial class TurnBasedMatchBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class TurnBasedMatchBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } } namespace Android.Gms.Games.Request @@ -184,18 +184,18 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() } } - //public partial class GameRequestBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class GameRequestBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } } namespace Android.Gms.Games.Snapshot @@ -245,18 +245,18 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() } } - //public partial class QuestBuffer : IEnumerable - //{ - // public IEnumerator GetEnumerator() - // { - // return this.ToEnumerable ().GetEnumerator(); - // } - - // System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - // { - // return this.GetEnumerator(); - // } - //} + public partial class QuestBuffer : IEnumerable + { + public IEnumerator GetEnumerator() + { + return this.ToEnumerable ().GetEnumerator(); + } + + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + } } namespace Android.Gms.Games.Video diff --git a/games/source/Games.csproj b/games/source/Games.csproj index 8f29bfc9c..f3dcf9c81 100644 --- a/games/source/Games.csproj +++ b/games/source/Games.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,7 +48,7 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -54,13 +56,10 @@ - - Properties\GpsConsts.cs - - + @@ -88,4 +87,6 @@ + + diff --git a/games/source/Properties/AssemblyInfo.cs b/games/source/Properties/AssemblyInfo.cs index 2d1af951b..61b25e613 100644 --- a/games/source/Properties/AssemblyInfo.cs +++ b/games/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-games/" + __GpsConsts.Version + "/play-services-games-" + __GpsConsts.Version + ".aar"; -} diff --git a/games/source/Transforms/Metadata.xml b/games/source/Transforms/Metadata.xml index 9e52689ee..bdac82fc2 100644 --- a/games/source/Transforms/Metadata.xml +++ b/games/source/Transforms/Metadata.xml @@ -20,7 +20,11 @@ Android.Gms.Games.Internal.Game Android.Gms.Games.Internal.Notification Android.Gms.Games.Internal.Player - + Android.Gms.Games.Internal.Api + Android.Gms.Games.Internal.Data + Android.Gms.Games.Internal.Events + Android.Gms.Games.Internal.Request + GamesClass GamesClass.BaseGamesApiMethodImpl GamesClass.GamesOptions @@ -68,7 +72,7 @@ API - + @@ -212,4 +216,32 @@ private + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/games/source/packages.config b/games/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/games/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/gass/nuget/Xamarin.GooglePlayServices.Gass.template.nuspec b/gass/nuget/Xamarin.GooglePlayServices.Gass.template.nuspec index 1587aa418..20702d059 100644 --- a/gass/nuget/Xamarin.GooglePlayServices.Gass.template.nuspec +++ b/gass/nuget/Xamarin.GooglePlayServices.Gass.template.nuspec @@ -16,10 +16,14 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-gass_128x128.png - + + + + + diff --git a/gass/source/Additions/AboutAdditions.txt b/gass/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/gass/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/gass/source/Gass.csproj b/gass/source/Gass.csproj index e4c387608..626d90c85 100644 --- a/gass/source/Gass.csproj +++ b/gass/source/Gass.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,18 +48,15 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -72,9 +71,14 @@ + Jars\play-services-gass.jar + + + + diff --git a/gass/source/Properties/AssemblyInfo.cs b/gass/source/Properties/AssemblyInfo.cs index 07763ad5b..03dec2e57 100644 --- a/gass/source/Properties/AssemblyInfo.cs +++ b/gass/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-gass/" + __GpsConsts.Version + "/play-services-gass-" + __GpsConsts.Version + ".aar"; -} diff --git a/gass/source/packages.config b/gass/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/gass/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/gcm/component/component.template.yaml b/gcm/component/component.template.yaml index df2314160..24ec9e72c 100644 --- a/gcm/component/component.template.yaml +++ b/gcm/component/component.template.yaml @@ -29,5 +29,8 @@ samples: - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Gcm - Xamarin.GooglePlayServices.Iid + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/gcm/nuget/Xamarin.GooglePlayServices.Gcm.template.nuspec b/gcm/nuget/Xamarin.GooglePlayServices.Gcm.template.nuspec index a860c935c..1e5ae17c6 100644 --- a/gcm/nuget/Xamarin.GooglePlayServices.Gcm.template.nuspec +++ b/gcm/nuget/Xamarin.GooglePlayServices.Gcm.template.nuspec @@ -20,12 +20,16 @@ http://components.xamarin.com/license/googleplayservices-gcm/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-gcm_128x128.png - - - + + + + + + + diff --git a/gcm/samples/GCMSample/GCMSample.csproj b/gcm/samples/GCMSample/GCMSample.csproj index ac81825e2..0ac08232e 100644 --- a/gcm/samples/GCMSample/GCMSample.csproj +++ b/gcm/samples/GCMSample/GCMSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -105,4 +106,12 @@ + + + + + + + + \ No newline at end of file diff --git a/gcm/samples/GCMSample/packages.config b/gcm/samples/GCMSample/packages.config index 71e0c9953..247b0876a 100644 --- a/gcm/samples/GCMSample/packages.config +++ b/gcm/samples/GCMSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/gcm/source/Additions/AboutAdditions.txt b/gcm/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/gcm/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/gcm/source/Additions/Manifest.cs b/gcm/source/Additions/Manifest.cs deleted file mode 100644 index d8607749e..000000000 --- a/gcm/source/Additions/Manifest.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission ("com.google.android.c2dm.permission.RECEIVE")] -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] - -// [assembly: Permission (Name="@PACKAGE_NAME@.permission.C2D_MESSAGE")] -// [assembly: UsesPermission ("@PACKAGE_NAME@.permission.C2D_MESSAGE")] - -// namespace Android.Gms.Gcm -// { -// [Register ("com/google/android/gms/gcm/GcmReceiver", DoNotGenerateAcw=true)] -// [BroadcastReceiver ( -// Name="com.google.android.gms.gcm.GcmReceiver", -// Exported=true, -// Permission="com.google.android.c2dm.permission.SEND")] -// [IntentFilter (new [] { "com.google.android.c2dm.intent.RECEIVE", "com.google.android.c2dm.intent.REGISTRATION" }, -// Categories = new [] { "@PACKAGE_NAME@" })] -// internal class _InternalGcmReceiver : BroadcastReceiver -// { -// public override void OnReceive (Context context, Intent intent) -// { // stub -// } -// } -// } \ No newline at end of file diff --git a/gcm/source/Gcm.csproj b/gcm/source/Gcm.csproj index b0cf8723d..3573a16e3 100644 --- a/gcm/source/Gcm.csproj +++ b/gcm/source/Gcm.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,35 +48,30 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - - @@ -104,4 +101,12 @@ + + + + + + + + diff --git a/gcm/source/Properties/AssemblyInfo.cs b/gcm/source/Properties/AssemblyInfo.cs index e6733fec0..02fb27478 100644 --- a/gcm/source/Properties/AssemblyInfo.cs +++ b/gcm/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-gcm/" + __GpsConsts.Version + "/play-services-gcm-" + __GpsConsts.Version + ".aar"; -} diff --git a/gcm/source/packages.config b/gcm/source/packages.config index 71e0c9953..247b0876a 100644 --- a/gcm/source/packages.config +++ b/gcm/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/identity/nuget/Xamarin.GooglePlayServices.Identity.template.nuspec b/identity/nuget/Xamarin.GooglePlayServices.Identity.template.nuspec index 373c9b76e..23de77fe7 100644 --- a/identity/nuget/Xamarin.GooglePlayServices.Identity.template.nuspec +++ b/identity/nuget/Xamarin.GooglePlayServices.Identity.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-identity_128x128.png - - + + + + + + diff --git a/identity/source/Additions/AboutAdditions.txt b/identity/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/identity/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/identity/source/Identity.csproj b/identity/source/Identity.csproj index d297c43f5..bd5720ceb 100644 --- a/identity/source/Identity.csproj +++ b/identity/source/Identity.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,18 +48,15 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -80,5 +79,10 @@ Basement + + + + + diff --git a/identity/source/Properties/AssemblyInfo.cs b/identity/source/Properties/AssemblyInfo.cs index 7a9498e2a..1b746d007 100644 --- a/identity/source/Properties/AssemblyInfo.cs +++ b/identity/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-identity/" + __GpsConsts.Version + "/play-services-identity-" + __GpsConsts.Version + ".aar"; -} diff --git a/identity/source/packages.config b/identity/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/identity/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/iid/nuget/Xamarin.GooglePlayServices.Iid.template.nuspec b/iid/nuget/Xamarin.GooglePlayServices.Iid.template.nuspec index addc798ff..595fa1965 100644 --- a/iid/nuget/Xamarin.GooglePlayServices.Iid.template.nuspec +++ b/iid/nuget/Xamarin.GooglePlayServices.Iid.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-iid_128x128.png - - + + + + + + diff --git a/iid/source/Additions/AboutAdditions.txt b/iid/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/iid/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/iid/source/Additions/Manifest.cs b/iid/source/Additions/Manifest.cs deleted file mode 100644 index dc9623c32..000000000 --- a/iid/source/Additions/Manifest.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission ("com.google.android.c2dm.permission.RECEIVE")] -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] diff --git a/iid/source/Iid.csproj b/iid/source/Iid.csproj index 6c7c1f6f0..95634ecbc 100644 --- a/iid/source/Iid.csproj +++ b/iid/source/Iid.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,20 +48,16 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - - + @@ -78,9 +76,11 @@ + Jars\play-services-iid.jar + diff --git a/iid/source/Properties/AssemblyInfo.cs b/iid/source/Properties/AssemblyInfo.cs index a8aba0046..78506eb35 100644 --- a/iid/source/Properties/AssemblyInfo.cs +++ b/iid/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-iid/" + __GpsConsts.Version + "/play-services-iid-" + __GpsConsts.Version + ".aar"; -} diff --git a/iid/source/packages.config b/iid/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/iid/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/instantapps/nuget/Xamarin.GooglePlayServices.InstantApps.template.nuspec b/instantapps/nuget/Xamarin.GooglePlayServices.InstantApps.template.nuspec index 01a535160..c91129047 100644 --- a/instantapps/nuget/Xamarin.GooglePlayServices.InstantApps.template.nuspec +++ b/instantapps/nuget/Xamarin.GooglePlayServices.InstantApps.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-instantapps_128x128.png - - + + + + + + diff --git a/instantapps/source/Additions/PendingResultExtensions.cs b/instantapps/source/Additions/PendingResultExtensions.cs new file mode 100644 index 000000000..dd7a106e4 --- /dev/null +++ b/instantapps/source/Additions/PendingResultExtensions.cs @@ -0,0 +1,15 @@ +using System; +using System.Threading.Tasks; +using Java.Interop; +using Android.Gms.Common.Apis; + +namespace Android.Gms.InstantApp +{ + public static class IInstantAppsApiExtensions + { + public static async Task GetInstantAppLaunchDataAsync (this IInstantAppsApi api, GoogleApiClient client, string url) + { + return (await api.GetInstantAppLaunchData (client, url)).JavaCast (); + } + } +} diff --git a/instantapps/source/InstantApps.csproj b/instantapps/source/InstantApps.csproj index 2a4a11ca0..e96cac0e3 100644 --- a/instantapps/source/InstantApps.csproj +++ b/instantapps/source/InstantApps.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -16,6 +17,7 @@ v7.0 class-parse ..\..\externals\docs\reference + true @@ -45,9 +47,7 @@ - - Properties\GpsConsts.cs - + @@ -55,6 +55,7 @@ + {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} @@ -73,4 +74,8 @@ + + + + \ No newline at end of file diff --git a/instantapps/source/Properties/AssemblyInfo.cs b/instantapps/source/Properties/AssemblyInfo.cs index 1dd6372c2..9b6c5da5a 100644 --- a/instantapps/source/Properties/AssemblyInfo.cs +++ b/instantapps/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-instantapps/" + __GpsConsts.Version + "/play-services-instantapps-" + __GpsConsts.Version + ".aar"; -} diff --git a/instantapps/source/Transforms/Metadata.xml b/instantapps/source/Transforms/Metadata.xml index 6043a9d45..9db8247c6 100644 --- a/instantapps/source/Transforms/Metadata.xml +++ b/instantapps/source/Transforms/Metadata.xml @@ -3,4 +3,24 @@ Android.Gms.InstantApp Android.Gms.Internal + + API + + + + + + + + + + + + + + + + + + diff --git a/instantapps/source/packages.config b/instantapps/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/instantapps/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/location/component/component.template.yaml b/location/component/component.template.yaml index 735b7a0ac..27ed06f55 100644 --- a/location/component/component.template.yaml +++ b/location/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Location + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/location/nuget/Xamarin.GooglePlayServices.Location.template.nuspec b/location/nuget/Xamarin.GooglePlayServices.Location.template.nuspec index 45510d980..f629842e1 100644 --- a/location/nuget/Xamarin.GooglePlayServices.Location.template.nuspec +++ b/location/nuget/Xamarin.GooglePlayServices.Location.template.nuspec @@ -18,11 +18,16 @@ http://components.xamarin.com/license/googleplayservices-location/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-location_128x128.png - - + + + + + + + diff --git a/location/samples/LocationSample/LocationSample.csproj b/location/samples/LocationSample/LocationSample.csproj index 8af9b209a..ad0d57044 100644 --- a/location/samples/LocationSample/LocationSample.csproj +++ b/location/samples/LocationSample/LocationSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -101,4 +102,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/location/samples/LocationSample/packages.config b/location/samples/LocationSample/packages.config index 71e0c9953..247b0876a 100644 --- a/location/samples/LocationSample/packages.config +++ b/location/samples/LocationSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/location/source/Additions/AboutAdditions.txt b/location/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/location/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/location/source/Location.csproj b/location/source/Location.csproj index dcd92a39c..c217f5894 100644 --- a/location/source/Location.csproj +++ b/location/source/Location.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,7 +48,7 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -54,13 +56,10 @@ - - Properties\GpsConsts.cs - - + @@ -82,6 +81,12 @@ {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} Basement + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + + diff --git a/location/source/Properties/AssemblyInfo.cs b/location/source/Properties/AssemblyInfo.cs index e54629141..3420e1a17 100644 --- a/location/source/Properties/AssemblyInfo.cs +++ b/location/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-location/" + __GpsConsts.Version + "/play-services-location-" + __GpsConsts.Version + ".aar"; -} diff --git a/location/source/packages.config b/location/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/location/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/maps/component/component.template.yaml b/maps/component/component.template.yaml index f53418ac2..676380f78 100644 --- a/maps/component/component.template.yaml +++ b/maps/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Maps + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/maps/nuget/Xamarin.GooglePlayServices.Maps.template.nuspec b/maps/nuget/Xamarin.GooglePlayServices.Maps.template.nuspec index 3c76560aa..f1040e779 100644 --- a/maps/nuget/Xamarin.GooglePlayServices.Maps.template.nuspec +++ b/maps/nuget/Xamarin.GooglePlayServices.Maps.template.nuspec @@ -18,11 +18,15 @@ http://components.xamarin.com/license/googleplayservices-maps/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-maps_128x128.png - - + + + + + + diff --git a/maps/samples/MapsSample.UITests/Tests.cs b/maps/samples/MapsSample.UITests/Tests.cs index b26fd4211..d75dd5c08 100644 --- a/maps/samples/MapsSample.UITests/Tests.cs +++ b/maps/samples/MapsSample.UITests/Tests.cs @@ -85,39 +85,39 @@ public void CameraControls () app.Screenshot ("Go to Bondi"); } - [Test] - public void IndoorDemo () - { - app.Screenshot ("Launch"); - app.ScrollDownAndTap (q => q.Text ("Indoor")); - app.WaitForElement (q => q.Id ("map")); - app.Screenshot ("Map"); - - app.Tap (q => q.Id ("focused_bulding_info_button")); - app.WaitForElement (q => q.Text ("3 2 1 ")); - app.Screenshot ("Focused Building"); - - app.Tap (q => q.Id ("focused_level_info_button")); - app.WaitForElement (q => q.Text ("2")); - app.Screenshot ("Focused Level"); - - // Tap level 1 - app.Tap (q => q.Text ("1")); - app.Tap (q => q.Id ("focused_level_info_button")); - app.WaitForElement (q => q.Text ("1")); - app.Screenshot ("Level 1"); - - app.Tap (q => q.Id ("toggle_level_picker_button")); - app.WaitForNoElement (q => q.Text ("3")); - app.Screenshot ("Toggle Level Picker"); - app.Tap (q => q.Id ("toggle_level_picker_button")); - app.WaitForElement (q => q.Text ("3")); - app.Screenshot ("Toggle Level Picker"); - - app.Tap (q => q.Id ("higher_level_button")); - app.WaitForElement (q => q.Text ("Activating level 2")); - app.Screenshot ("Activate Higher Level"); - } + // [Test] + // public void IndoorDemo () + // { + // app.Screenshot ("Launch"); + // app.ScrollDownAndTap (q => q.Text ("Indoor")); + // app.WaitForElement (q => q.Id ("map")); + // app.Screenshot ("Map"); + + // app.Tap (q => q.Id ("focused_bulding_info_button")); + // app.WaitForElement (q => q.Text ("3 2 1 ")); + // app.Screenshot ("Focused Building"); + + // app.Tap (q => q.Id ("focused_level_info_button")); + // app.WaitForElement (q => q.Text ("2")); + // app.Screenshot ("Focused Level"); + + // // Tap level 1 + // app.Tap (q => q.Text ("1")); + // app.Tap (q => q.Id ("focused_level_info_button")); + // app.WaitForElement (q => q.Text ("1")); + // app.Screenshot ("Level 1"); + + // app.Tap (q => q.Id ("toggle_level_picker_button")); + // app.WaitForNoElement (q => q.Text ("3")); + // app.Screenshot ("Toggle Level Picker"); + // app.Tap (q => q.Id ("toggle_level_picker_button")); + // app.WaitForElement (q => q.Text ("3")); + // app.Screenshot ("Toggle Level Picker"); + + // app.Tap (q => q.Id ("higher_level_button")); + // app.WaitForElement (q => q.Text ("Activating level 2")); + // app.Screenshot ("Activate Higher Level"); + // } [Test] public void LayersDemo () diff --git a/maps/samples/MapsSample/MapsSample.csproj b/maps/samples/MapsSample/MapsSample.csproj index b7ce6fb5f..3a44b6b2d 100644 --- a/maps/samples/MapsSample/MapsSample.csproj +++ b/maps/samples/MapsSample/MapsSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -45,22 +46,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -173,4 +174,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/maps/samples/MapsSample/packages.config b/maps/samples/MapsSample/packages.config index 71e0c9953..247b0876a 100644 --- a/maps/samples/MapsSample/packages.config +++ b/maps/samples/MapsSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/maps/source/Additions/AboutAdditions.txt b/maps/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/maps/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/maps/source/Additions/Manifest.cs b/maps/source/Additions/Manifest.cs deleted file mode 100644 index 63316e80a..000000000 --- a/maps/source/Additions/Manifest.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] -[assembly: UsesPermission (Android.Manifest.Permission.Internet)] - -[assembly: UsesFeature (GLESVersion=0x00020000, Required=true)] diff --git a/maps/source/Maps.csproj b/maps/source/Maps.csproj index a8d0d46a7..8d73f9b9d 100644 --- a/maps/source/Maps.csproj +++ b/maps/source/Maps.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,36 +48,31 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - - @@ -101,4 +98,12 @@ + + + + + + + + diff --git a/maps/source/Properties/AssemblyInfo.cs b/maps/source/Properties/AssemblyInfo.cs index 4d7be9421..ea3f196d8 100644 --- a/maps/source/Properties/AssemblyInfo.cs +++ b/maps/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-maps/" + __GpsConsts.Version + "/play-services-maps-" + __GpsConsts.Version + ".aar"; -} diff --git a/maps/source/packages.config b/maps/source/packages.config index 71e0c9953..247b0876a 100644 --- a/maps/source/packages.config +++ b/maps/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/nearby/component/component.template.yaml b/nearby/component/component.template.yaml index 8e54dd132..abab2e068 100644 --- a/nearby/component/component.template.yaml +++ b/nearby/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Nearby + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/nearby/nuget/Xamarin.GooglePlayServices.Nearby.template.nuspec b/nearby/nuget/Xamarin.GooglePlayServices.Nearby.template.nuspec index aab64b2f2..946b7cd3d 100644 --- a/nearby/nuget/Xamarin.GooglePlayServices.Nearby.template.nuspec +++ b/nearby/nuget/Xamarin.GooglePlayServices.Nearby.template.nuspec @@ -18,11 +18,15 @@ http://components.xamarin.com/license/googleplayservices-nearby/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-nearby_128x128.png - - + + + + + + diff --git a/nearby/samples/NearbySample/NearbySample.csproj b/nearby/samples/NearbySample/NearbySample.csproj index 0e00977a0..d45166934 100644 --- a/nearby/samples/NearbySample/NearbySample.csproj +++ b/nearby/samples/NearbySample/NearbySample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -106,4 +107,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/nearby/samples/NearbySample/packages.config b/nearby/samples/NearbySample/packages.config index 71e0c9953..247b0876a 100644 --- a/nearby/samples/NearbySample/packages.config +++ b/nearby/samples/NearbySample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/nearby/source/Additions/Manifest.cs b/nearby/source/Additions/Manifest.cs deleted file mode 100644 index f2ac17de8..000000000 --- a/nearby/source/Additions/Manifest.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System; -using Android.App; - -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] diff --git a/nearby/source/Nearby.csproj b/nearby/source/Nearby.csproj index 4433aed73..ae0153186 100644 --- a/nearby/source/Nearby.csproj +++ b/nearby/source/Nearby.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,20 +48,17 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -83,4 +82,6 @@ + + diff --git a/nearby/source/Properties/AssemblyInfo.cs b/nearby/source/Properties/AssemblyInfo.cs index 9edb0f318..54e422bed 100644 --- a/nearby/source/Properties/AssemblyInfo.cs +++ b/nearby/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-nearby/" + __GpsConsts.Version + "/play-services-nearby-" + __GpsConsts.Version + ".aar"; -} diff --git a/nearby/source/packages.config b/nearby/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/nearby/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/panorama/component/component.template.yaml b/panorama/component/component.template.yaml index 5588c2edc..16e7752a2 100644 --- a/panorama/component/component.template.yaml +++ b/panorama/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Panorama + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/panorama/nuget/Xamarin.GooglePlayServices.Panorama.template.nuspec b/panorama/nuget/Xamarin.GooglePlayServices.Panorama.template.nuspec index 0c4dc3679..24e41d63b 100644 --- a/panorama/nuget/Xamarin.GooglePlayServices.Panorama.template.nuspec +++ b/panorama/nuget/Xamarin.GooglePlayServices.Panorama.template.nuspec @@ -18,11 +18,15 @@ http://components.xamarin.com/license/googleplayservices-panorama/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-panorama_128x128.png - - + + + + + + diff --git a/panorama/samples/PanoramaSample/PanoramaSample.csproj b/panorama/samples/PanoramaSample/PanoramaSample.csproj index 9e531ba0c..1a8957fc7 100644 --- a/panorama/samples/PanoramaSample/PanoramaSample.csproj +++ b/panorama/samples/PanoramaSample/PanoramaSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -102,4 +103,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/panorama/samples/PanoramaSample/packages.config b/panorama/samples/PanoramaSample/packages.config index 71e0c9953..247b0876a 100644 --- a/panorama/samples/PanoramaSample/packages.config +++ b/panorama/samples/PanoramaSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/panorama/source/Additions/AboutAdditions.txt b/panorama/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/panorama/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/panorama/source/Panorama.csproj b/panorama/source/Panorama.csproj index 767537b57..a35e89ec7 100644 --- a/panorama/source/Panorama.csproj +++ b/panorama/source/Panorama.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,20 +48,17 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -83,4 +82,6 @@ + + diff --git a/panorama/source/Properties/AssemblyInfo.cs b/panorama/source/Properties/AssemblyInfo.cs index b41e00e68..6ce0ab7e4 100644 --- a/panorama/source/Properties/AssemblyInfo.cs +++ b/panorama/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-panorama/" + __GpsConsts.Version + "/play-services-panorama-" + __GpsConsts.Version + ".aar"; -} diff --git a/panorama/source/packages.config b/panorama/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/panorama/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/partial-download-info.json b/partial-download-info.json new file mode 100644 index 000000000..6acb53614 --- /dev/null +++ b/partial-download-info.json @@ -0,0 +1,434 @@ +[ + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 48682, + "LocalPath": "m2repository/com/google/firebase/firebase-auth/10.0.1/firebase-auth-10.0.1.aar", + "CompressedSize": 203247, + "Md5": "516691531cdfd2ec0193133a31ef17be", + "RangeEnd": 251929 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 1239277, + "LocalPath": "m2repository/com/google/firebase/firebase-analytics-impl/10.0.1/firebase-analytics-impl-10.0.1.aar", + "CompressedSize": 211773, + "Md5": "010a6fda55c32dfd478256be89f2ce36", + "RangeEnd": 1451050 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 3323615, + "LocalPath": "m2repository/com/google/firebase/firebase-database/10.0.1/firebase-database-10.0.1.aar", + "CompressedSize": 271871, + "Md5": "aeae6405f93d82abeb52485c4614d9c7", + "RangeEnd": 3595486 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 6045966, + "LocalPath": "m2repository/com/google/firebase/firebase-appindexing/10.0.1/firebase-appindexing-10.0.1.aar", + "CompressedSize": 112379, + "Md5": "d350eafe4836cc3938654ac2b0e0c62e", + "RangeEnd": 6158345 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 6274540, + "LocalPath": "m2repository/com/google/firebase/firebase-ads/10.0.1/firebase-ads-10.0.1.aar", + "CompressedSize": 279, + "Md5": "2f7513c0636c8a3fea85137a8ce5553b", + "RangeEnd": 6274819 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 6294230, + "LocalPath": "m2repository/com/google/firebase/firebase-analytics/10.0.1/firebase-analytics-10.0.1.aar", + "CompressedSize": 4687, + "Md5": "824ae17068fd8dc4db2913bda1f6727c", + "RangeEnd": 6298917 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 6350156, + "LocalPath": "m2repository/com/google/firebase/firebase-invites/10.0.1/firebase-invites-10.0.1.aar", + "CompressedSize": 281, + "Md5": "5e7c132fae8b1a9c6cd5ec48ae336703", + "RangeEnd": 6350437 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 6461255, + "LocalPath": "m2repository/com/google/firebase/firebase-database-connection/10.0.1/firebase-database-connection-10.0.1.aar", + "CompressedSize": 95951, + "Md5": "31d2b59d925b3282eee25b149710fc91", + "RangeEnd": 6557206 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 7615646, + "LocalPath": "m2repository/com/google/firebase/firebase-storage/10.0.1/firebase-storage-10.0.1.aar", + "CompressedSize": 65670, + "Md5": "26166a900b001c00d4556715dc72992e", + "RangeEnd": 7681316 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 8270249, + "LocalPath": "m2repository/com/google/firebase/firebase-common/10.0.1/firebase-common-10.0.1.aar", + "CompressedSize": 15607, + "Md5": "3b8f0475312bf90abd8a49c871561d54", + "RangeEnd": 8285856 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 8479805, + "LocalPath": "m2repository/com/google/firebase/firebase-iid/10.0.1/firebase-iid-10.0.1.aar", + "CompressedSize": 30653, + "Md5": "29365ea1ab3c6d8051a7de929b85c5b5", + "RangeEnd": 8510458 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 8800921, + "LocalPath": "m2repository/com/google/firebase/firebase-messaging/10.0.1/firebase-messaging-10.0.1.aar", + "CompressedSize": 18886, + "Md5": "362dea089249b0681b9ce3807f5b4de3", + "RangeEnd": 8819807 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 9004117, + "LocalPath": "m2repository/com/google/firebase/firebase-storage-common/10.0.1/firebase-storage-common-10.0.1.aar", + "CompressedSize": 8331, + "Md5": "e42b725a2fe682cf4313cf3524b0308d", + "RangeEnd": 9012448 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 9122290, + "LocalPath": "m2repository/com/google/firebase/firebase-crash/10.0.1/firebase-crash-10.0.1.aar", + "CompressedSize": 13953, + "Md5": "b5c890a4cafabc295ca2fdf3d54e916f", + "RangeEnd": 9136243 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 9360814, + "LocalPath": "m2repository/com/google/firebase/firebase-config/10.0.1/firebase-config-10.0.1.aar", + "CompressedSize": 52259, + "Md5": "e040aa2a4bda0a2368d88004cbd7a25d", + "RangeEnd": 9413073 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 9883614, + "LocalPath": "m2repository/com/google/firebase/firebase-core/10.0.1/firebase-core-10.0.1.aar", + "CompressedSize": 279, + "Md5": "e1d3a6c613d40ed2787b4a0cab587d05", + "RangeEnd": 9883893 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 10632857, + "LocalPath": "m2repository/com/google/android/gms/play-services-ads/10.0.1/play-services-ads-10.0.1.aar", + "CompressedSize": 868236, + "Md5": "bcb4be87b2ef2c4cc1308964fb115df9", + "RangeEnd": 11501093 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 24138142, + "LocalPath": "m2repository/com/google/android/gms/play-services-safetynet/10.0.1/play-services-safetynet-10.0.1.aar", + "CompressedSize": 47102, + "Md5": "e8f30552f99be2f49103f4120ebee130", + "RangeEnd": 24185244 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 24618108, + "LocalPath": "m2repository/com/google/android/gms/play-services-awareness/10.0.1/play-services-awareness-10.0.1.aar", + "CompressedSize": 162777, + "Md5": "a78866e4357ca9f9355f4c27b1d3d344", + "RangeEnd": 24780885 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 25506705, + "LocalPath": "m2repository/com/google/android/gms/play-services-gcm/10.0.1/play-services-gcm-10.0.1.aar", + "CompressedSize": 36343, + "Md5": "59ff765c53ed6546199825b919bf5861", + "RangeEnd": 25543048 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 26180092, + "LocalPath": "m2repository/com/google/android/gms/play-services-instantapps/10.0.1/play-services-instantapps-10.0.1.aar", + "CompressedSize": 44738, + "Md5": "9b300f91e6c037dd53727f2c5febac31", + "RangeEnd": 26224830 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 26877020, + "LocalPath": "m2repository/com/google/android/gms/play-services-games/10.0.1/play-services-games-10.0.1.aar", + "CompressedSize": 557884, + "Md5": "fe817a580fece7fea406bc92688881b1", + "RangeEnd": 27434904 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 36574699, + "LocalPath": "m2repository/com/google/android/gms/play-services-tagmanager-v4-impl/10.0.1/play-services-tagmanager-v4-impl-10.0.1.aar", + "CompressedSize": 186928, + "Md5": "ddd21b98b7bb313f14b522857e54ffc0", + "RangeEnd": 36761627 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 37536777, + "LocalPath": "m2repository/com/google/android/gms/play-services-base/10.0.1/play-services-base-10.0.1.aar", + "CompressedSize": 434579, + "Md5": "f02be27d964d4f41c675ad6a80efb0a6", + "RangeEnd": 37971356 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 48580877, + "LocalPath": "m2repository/com/google/android/gms/play-services/10.0.1/play-services-10.0.1.aar", + "CompressedSize": 281, + "Md5": "41dcf864ffa9230ed104d5d8cab42f8d", + "RangeEnd": 48581158 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 72843266, + "LocalPath": "m2repository/com/google/android/gms/play-services-gass/10.0.1/play-services-gass-10.0.1.aar", + "CompressedSize": 9120, + "Md5": "e026c085daaa19009a7cb9e4c4b8ee0e", + "RangeEnd": 72852386 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 73082052, + "LocalPath": "m2repository/com/google/android/gms/play-services-wallet/10.0.1/play-services-wallet-10.0.1.aar", + "CompressedSize": 165163, + "Md5": "f8aeeadb3bf9b24eeceddf1c1b33af8f", + "RangeEnd": 73247215 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 75889556, + "LocalPath": "m2repository/com/google/android/gms/play-services-tasks/10.0.1/play-services-tasks-10.0.1.aar", + "CompressedSize": 20594, + "Md5": "6429a6d3675699e7caed6c45fa2ddf93", + "RangeEnd": 75910150 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 76441621, + "LocalPath": "m2repository/com/google/android/gms/play-services-ads-lite/10.0.1/play-services-ads-lite-10.0.1.aar", + "CompressedSize": 292120, + "Md5": "6ce5d84e3c020f212d543aa8030c3033", + "RangeEnd": 76733741 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 79465190, + "LocalPath": "m2repository/com/google/android/gms/play-services-auth-base/10.0.1/play-services-auth-base-10.0.1.aar", + "CompressedSize": 57328, + "Md5": "1df42455ec3ae0d3723faadd26e4b0c9", + "RangeEnd": 79522518 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 80029494, + "LocalPath": "m2repository/com/google/android/gms/play-services-auth/10.0.1/play-services-auth-10.0.1.aar", + "CompressedSize": 74820, + "Md5": "3fda7de334c420e1cfb847db2328096b", + "RangeEnd": 80104314 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 81106167, + "LocalPath": "m2repository/com/google/android/gms/play-services-appinvite/10.0.1/play-services-appinvite-10.0.1.aar", + "CompressedSize": 23204, + "Md5": "3c99c9e0ed7c4ec9cb97ff8738d309f2", + "RangeEnd": 81129371 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 81488229, + "LocalPath": "m2repository/com/google/android/gms/play-services-tagmanager-api/10.0.1/play-services-tagmanager-api-10.0.1.aar", + "CompressedSize": 25183, + "Md5": "eec2ad6dc986ff6c26fcbd9ed7d222e6", + "RangeEnd": 81513412 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 81983006, + "LocalPath": "m2repository/com/google/android/gms/play-services-cast/10.0.1/play-services-cast-10.0.1.aar", + "CompressedSize": 239779, + "Md5": "8ce0be2f3209200e445e06f6d5fd8238", + "RangeEnd": 82222785 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 85717978, + "LocalPath": "m2repository/com/google/android/gms/play-services-nearby/10.0.1/play-services-nearby-10.0.1.aar", + "CompressedSize": 159618, + "Md5": "0af01ae35dffb226de0d1efdff0b12ee", + "RangeEnd": 85877596 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 88600009, + "LocalPath": "m2repository/com/google/android/gms/play-services-analytics/10.0.1/play-services-analytics-10.0.1.aar", + "CompressedSize": 3093, + "Md5": "b8a843eff30f61a29b98fe7f3f577080", + "RangeEnd": 88603102 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 91668777, + "LocalPath": "m2repository/com/google/android/gms/play-services-clearcut/10.0.1/play-services-clearcut-10.0.1.aar", + "CompressedSize": 34381, + "Md5": "c7b135a9ba7fcfae1acfb7b0c0325d34", + "RangeEnd": 91703158 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 92460057, + "LocalPath": "m2repository/com/google/android/gms/play-services-basement/10.0.1/play-services-basement-10.0.1.aar", + "CompressedSize": 325325, + "Md5": "10df71889235a2040f67d36bc1982576", + "RangeEnd": 92785382 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 99596695, + "LocalPath": "m2repository/com/google/android/gms/play-services-plus/10.0.1/play-services-plus-10.0.1.aar", + "CompressedSize": 96720, + "Md5": "37404b8136c02355c38d85a7d05caf4d", + "RangeEnd": 99693415 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 101852276, + "LocalPath": "m2repository/com/google/android/gms/play-services-wearable/10.0.1/play-services-wearable-10.0.1.aar", + "CompressedSize": 209309, + "Md5": "c69ad12aecb7024d1aa551bb285552a4", + "RangeEnd": 102061585 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 111324309, + "LocalPath": "m2repository/com/google/android/gms/play-services-panorama/10.0.1/play-services-panorama-10.0.1.aar", + "CompressedSize": 12443, + "Md5": "4218b380bd4f5053a68ac1f5c6d1aa62", + "RangeEnd": 111336752 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 111905548, + "LocalPath": "m2repository/com/google/android/gms/play-services-analytics-impl/10.0.1/play-services-analytics-impl-10.0.1.aar", + "CompressedSize": 149207, + "Md5": "fd788ad5f638a3a5cdd56257e397b962", + "RangeEnd": 112054755 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 114819747, + "LocalPath": "m2repository/com/google/android/gms/play-services-iid/10.0.1/play-services-iid-10.0.1.aar", + "CompressedSize": 18289, + "Md5": "32797ed03cb840363f8602c33dea9378", + "RangeEnd": 114838036 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 115547865, + "LocalPath": "m2repository/com/google/android/gms/play-services-all-wear/10.0.1/play-services-all-wear-10.0.1.aar", + "CompressedSize": 287, + "Md5": "e50c2cf678c0a473f8f90b48d6db752d", + "RangeEnd": 115548152 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 117456928, + "LocalPath": "m2repository/com/google/android/gms/play-services-vision/10.0.1/play-services-vision-10.0.1.aar", + "CompressedSize": 102120, + "Md5": "e0fa6f62eb3f2e4085ca44b6350245ba", + "RangeEnd": 117559048 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 119246921, + "LocalPath": "m2repository/com/google/android/gms/play-services-cast-framework/10.0.1/play-services-cast-framework-10.0.1.aar", + "CompressedSize": 549070, + "Md5": "73edabe789c3796eb694212a32bbaead", + "RangeEnd": 119795991 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 122946888, + "LocalPath": "m2repository/com/google/android/gms/play-services-identity/10.0.1/play-services-identity-10.0.1.aar", + "CompressedSize": 19529, + "Md5": "32d15614bd76b47cbc297bccbc8b0b1a", + "RangeEnd": 122966417 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 123437759, + "LocalPath": "m2repository/com/google/android/gms/play-services-location/10.0.1/play-services-location-10.0.1.aar", + "CompressedSize": 101856, + "Md5": "3a159056dd6b678632b4640719f94ef0", + "RangeEnd": 123539615 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 127135421, + "LocalPath": "m2repository/com/google/android/gms/play-services-drive/10.0.1/play-services-drive-10.0.1.aar", + "CompressedSize": 362750, + "Md5": "2bc05f67337eef71d054f3b3aaf06753", + "RangeEnd": 127498171 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 134050410, + "LocalPath": "m2repository/com/google/android/gms/play-services-maps/10.0.1/play-services-maps-10.0.1.aar", + "CompressedSize": 248724, + "Md5": "9ea5c75fe9e2447ec0ff43c8f93e082d", + "RangeEnd": 134299134 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 138638863, + "LocalPath": "m2repository/com/google/android/gms/play-services-places/10.0.1/play-services-places-10.0.1.aar", + "CompressedSize": 186471, + "Md5": "94040e45147c4e272118513fb1b1ad3b", + "RangeEnd": 138825334 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 140263246, + "LocalPath": "m2repository/com/google/android/gms/play-services-fitness/10.0.1/play-services-fitness-10.0.1.aar", + "CompressedSize": 371734, + "Md5": "f2243e591d9a74752a222848f1f021fc", + "RangeEnd": 140634980 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 146370115, + "LocalPath": "m2repository/com/google/android/gms/play-services-tagmanager/10.0.1/play-services-tagmanager-10.0.1.aar", + "CompressedSize": 231482, + "Md5": "d7fd4e651180080b318afc8073ad8fd6", + "RangeEnd": 146601597 + }, + { + "Url": "https://dl-ssl.google.com/android/repository/google_m2repository_gms_v8_rc42_wear_2a3.zip", + "RangeStart": 150486044, + "LocalPath": "m2repository/com/google/android/support/wearable/1.4.0/wearable-1.4.0.aar", + "CompressedSize": 263999, + "Md5": "3771f05036dcc9213036909c039d2b60", + "RangeEnd": 150750043 + } +] \ No newline at end of file diff --git a/places/nuget/Xamarin.GooglePlayServices.Places.template.nuspec b/places/nuget/Xamarin.GooglePlayServices.Places.template.nuspec index e88259c36..ddd507e5d 100644 --- a/places/nuget/Xamarin.GooglePlayServices.Places.template.nuspec +++ b/places/nuget/Xamarin.GooglePlayServices.Places.template.nuspec @@ -16,12 +16,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-places_128x128.png - - - + + + + + + + + diff --git a/places/samples/PlacesAsync/PlacesAsync.csproj b/places/samples/PlacesAsync/PlacesAsync.csproj index 7be43ed6a..52c618d30 100644 --- a/places/samples/PlacesAsync/PlacesAsync.csproj +++ b/places/samples/PlacesAsync/PlacesAsync.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -108,4 +109,12 @@ Places + + + + + + + + \ No newline at end of file diff --git a/places/samples/PlacesAsync/packages.config b/places/samples/PlacesAsync/packages.config index 71e0c9953..247b0876a 100644 --- a/places/samples/PlacesAsync/packages.config +++ b/places/samples/PlacesAsync/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/places/source/Additions/AboutAdditions.txt b/places/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/places/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/places/source/Places.csproj b/places/source/Places.csproj index dc02eb54a..1cfeed4b3 100644 --- a/places/source/Places.csproj +++ b/places/source/Places.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,35 +48,31 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - @@ -97,11 +95,23 @@ {7CB92D61-E2FF-472A-9FDF-7E42D15B3EE6} Maps + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + Jars\play-services-places.jar + + + + + + + diff --git a/places/source/Properties/AssemblyInfo.cs b/places/source/Properties/AssemblyInfo.cs index 915e5ab8a..c71049285 100644 --- a/places/source/Properties/AssemblyInfo.cs +++ b/places/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-places/" + __GpsConsts.Version + "/play-services-places-" + __GpsConsts.Version + ".aar"; -} diff --git a/places/source/Transforms/Metadata.xml b/places/source/Transforms/Metadata.xml index da7d72239..a3077e6cc 100644 --- a/places/source/Transforms/Metadata.xml +++ b/places/source/Transforms/Metadata.xml @@ -25,8 +25,11 @@ - + + false + false + Java.Lang.Object Java.Lang.Object Java.Lang.Object diff --git a/places/source/packages.config b/places/source/packages.config index 71e0c9953..247b0876a 100644 --- a/places/source/packages.config +++ b/places/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/plus/component/component.template.yaml b/plus/component/component.template.yaml index e92ca7821..5ea45022b 100644 --- a/plus/component/component.template.yaml +++ b/plus/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Plus + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/plus/nuget/Xamarin.GooglePlayServices.Plus.template.nuspec b/plus/nuget/Xamarin.GooglePlayServices.Plus.template.nuspec index 707ef6adb..eec71fb3d 100644 --- a/plus/nuget/Xamarin.GooglePlayServices.Plus.template.nuspec +++ b/plus/nuget/Xamarin.GooglePlayServices.Plus.template.nuspec @@ -18,11 +18,15 @@ http://components.xamarin.com/license/googleplayservices-plus/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-plus_128x128.png - - + + + + + + diff --git a/plus/samples/PlusSample/PlusSample.csproj b/plus/samples/PlusSample/PlusSample.csproj index 2c4591971..980754327 100644 --- a/plus/samples/PlusSample/PlusSample.csproj +++ b/plus/samples/PlusSample/PlusSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -126,4 +127,12 @@ + + + + + + + + \ No newline at end of file diff --git a/plus/samples/PlusSample/packages.config b/plus/samples/PlusSample/packages.config index 71e0c9953..247b0876a 100644 --- a/plus/samples/PlusSample/packages.config +++ b/plus/samples/PlusSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/plus/source/Additions/AboutAdditions.txt b/plus/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/plus/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/plus/source/Plus.csproj b/plus/source/Plus.csproj index 1db32f4dd..a33c9f4e4 100644 --- a/plus/source/Plus.csproj +++ b/plus/source/Plus.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,7 +48,7 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -54,13 +56,10 @@ - - Properties\GpsConsts.cs - - + @@ -84,4 +83,6 @@ + + diff --git a/plus/source/Properties/AssemblyInfo.cs b/plus/source/Properties/AssemblyInfo.cs index fd8a5bca0..a71ad2665 100644 --- a/plus/source/Properties/AssemblyInfo.cs +++ b/plus/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-plus/" + __GpsConsts.Version + "/play-services-plus-" + __GpsConsts.Version + ".aar"; -} diff --git a/plus/source/packages.config b/plus/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/plus/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/safetynet/component/component.template.yaml b/safetynet/component/component.template.yaml index 3d316bea5..6b974c485 100644 --- a/safetynet/component/component.template.yaml +++ b/safetynet/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.SafetyNet + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/safetynet/nuget/Xamarin.GooglePlayServices.SafetyNet.template.nuspec b/safetynet/nuget/Xamarin.GooglePlayServices.SafetyNet.template.nuspec index 03dbeb7ad..ed25c0255 100644 --- a/safetynet/nuget/Xamarin.GooglePlayServices.SafetyNet.template.nuspec +++ b/safetynet/nuget/Xamarin.GooglePlayServices.SafetyNet.template.nuspec @@ -18,11 +18,16 @@ http://components.xamarin.com/license/googleplayservices-safetynet/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-safetynet_128x128.png - - + + + + + + + diff --git a/safetynet/samples/SafetyNetSample/SafetyNetSample.csproj b/safetynet/samples/SafetyNetSample/SafetyNetSample.csproj index 5f9fcc017..e0d8820de 100644 --- a/safetynet/samples/SafetyNetSample/SafetyNetSample.csproj +++ b/safetynet/samples/SafetyNetSample/SafetyNetSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -45,22 +46,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -102,4 +103,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/safetynet/samples/SafetyNetSample/packages.config b/safetynet/samples/SafetyNetSample/packages.config index 71e0c9953..247b0876a 100644 --- a/safetynet/samples/SafetyNetSample/packages.config +++ b/safetynet/samples/SafetyNetSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/safetynet/source/Additions/AboutAdditions.txt b/safetynet/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/safetynet/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/safetynet/source/Additions/IPendingResultExtensions.cs b/safetynet/source/Additions/IPendingResultExtensions.cs index f61f205aa..66805aae6 100644 --- a/safetynet/source/Additions/IPendingResultExtensions.cs +++ b/safetynet/source/Additions/IPendingResultExtensions.cs @@ -8,17 +8,21 @@ namespace Android.Gms.SafetyNet { public static partial class ISafetyNetApiExtensions { - public static async Task AttestAsync (this ISafetyNetApi api, GoogleApiClient googleApiClient, byte[] nonce) + public static async Task AttestAsync(this ISafetyNetApi api, GoogleApiClient googleApiClient, byte[] nonce) { - return (await api.Attest (googleApiClient, nonce)).JavaCast (); + return (await api.Attest(googleApiClient, nonce)).JavaCast(); } - public static async Task LookupUriAsync (this ISafetyNetApi api, GoogleApiClient googleApiClient, IList threatTypes, string uri) + public static async Task LookupUriAsync(this ISafetyNetApi api, GoogleApiClient googleApiClient, IList threatTypes, string uri) { - return (await api.LookupUri (googleApiClient, threatTypes, uri)).JavaCast (); + return (await api.LookupUri(googleApiClient, threatTypes, uri)).JavaCast(); } - public static async Task LookupUri (this ISafetyNetApi api, GoogleApiClient client, string uri, int [] threatTypes) + public static async Task LookupUriAsync(this ISafetyNetApi api, GoogleApiClient client, string uri, int[] threatTypes) { - return (await api.LookupUri (client, uri, threatTypes)).JavaCast (); + return (await api.LookupUri(client, uri, threatTypes)).JavaCast(); + } + public static async Task VerifyWithRecaptchaAsync(this ISafetyNetApi api, GoogleApiClient client, string recaptcha) + { + return (await api.VerifyWithRecaptcha(client, recaptcha)).JavaCast(); } } } diff --git a/safetynet/source/Properties/AssemblyInfo.cs b/safetynet/source/Properties/AssemblyInfo.cs index 9974a2827..f7590d81a 100644 --- a/safetynet/source/Properties/AssemblyInfo.cs +++ b/safetynet/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-safetynet/" + __GpsConsts.Version + "/play-services-safetynet-" + __GpsConsts.Version + ".aar"; -} diff --git a/safetynet/source/SafetyNet.csproj b/safetynet/source/SafetyNet.csproj index c16aaaa7f..c6cc3eb0d 100644 --- a/safetynet/source/SafetyNet.csproj +++ b/safetynet/source/SafetyNet.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -48,7 +50,7 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll @@ -56,13 +58,10 @@ - - Properties\GpsConsts.cs - - + @@ -84,6 +83,12 @@ {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} Basement + + {53F87D88-8871-41A2-9F81-B79AB02FEC24} + Tasks + + + diff --git a/safetynet/source/packages.config b/safetynet/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/safetynet/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/support-wearable/component/component.template.yaml b/support-wearable/component/component.template.yaml index 5ef52d732..270c9ac2e 100755 --- a/support-wearable/component/component.template.yaml +++ b/support-wearable/component/component.template.yaml @@ -21,6 +21,9 @@ samples: - project: MultiPageSample packages: - Xamarin.Android.Wear + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" - name: "Watch Face Sample" path: ../samples/WatchFaceSample.sln removeProjects: @@ -29,5 +32,8 @@ samples: - project: WatchFaceSample packages: - Xamarin.Android.Wear + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/support-wearable/nuget/Xamarin.Android.Wear.template.nuspec b/support-wearable/nuget/Xamarin.Android.Wear.template.nuspec index 9c43fc239..077246a57 100644 --- a/support-wearable/nuget/Xamarin.Android.Wear.template.nuspec +++ b/support-wearable/nuget/Xamarin.Android.Wear.template.nuspec @@ -24,11 +24,15 @@ http://components.xamarin.com/license/androidwear/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-support-wearable_128x128.png - - + + + + - + + + diff --git a/support-wearable/samples/MultiPageSample/MultiPageSample.csproj b/support-wearable/samples/MultiPageSample/MultiPageSample.csproj index 7ac30540f..8ad96496b 100644 --- a/support-wearable/samples/MultiPageSample/MultiPageSample.csproj +++ b/support-wearable/samples/MultiPageSample/MultiPageSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -18,6 +19,7 @@ MultiPageSample v5.0 Properties\AndroidManifest.xml + armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 true @@ -29,7 +31,6 @@ 4 None false - armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 full @@ -40,7 +41,6 @@ 4 false false - armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 @@ -74,7 +74,7 @@ - + {7DD8E926-9F75-4F25-95A3-920A5FF48EF8} @@ -90,4 +90,6 @@ + + diff --git a/support-wearable/samples/MultiPageSample/packages.config b/support-wearable/samples/MultiPageSample/packages.config index 479b71b81..6e46652f6 100644 --- a/support-wearable/samples/MultiPageSample/packages.config +++ b/support-wearable/samples/MultiPageSample/packages.config @@ -1,5 +1,6 @@ - - - - + + + + + \ No newline at end of file diff --git a/support-wearable/samples/WatchFaceSample/WatchFaceSample.csproj b/support-wearable/samples/WatchFaceSample/WatchFaceSample.csproj index 44b81bc65..b32c92d72 100644 --- a/support-wearable/samples/WatchFaceSample/WatchFaceSample.csproj +++ b/support-wearable/samples/WatchFaceSample/WatchFaceSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -18,6 +19,7 @@ WatchFaceSample Properties\AndroidManifest.xml v5.0 + armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 true @@ -29,7 +31,6 @@ 4 None false - armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 full @@ -39,7 +40,6 @@ 4 false false - armeabi;armeabi-v7a;x86;arm64-v8a;x86_64 @@ -80,11 +80,13 @@ - + {7DD8E926-9F75-4F25-95A3-920A5FF48EF8} SupportWearable + + \ No newline at end of file diff --git a/support-wearable/samples/WatchFaceSample/packages.config b/support-wearable/samples/WatchFaceSample/packages.config index 479b71b81..6e46652f6 100644 --- a/support-wearable/samples/WatchFaceSample/packages.config +++ b/support-wearable/samples/WatchFaceSample/packages.config @@ -1,5 +1,6 @@ - - - - + + + + + \ No newline at end of file diff --git a/support-wearable/source/Additions/Additions.cs b/support-wearable/source/Additions/Additions.cs index e2b631520..5ca4121b9 100644 --- a/support-wearable/source/Additions/Additions.cs +++ b/support-wearable/source/Additions/Additions.cs @@ -134,52 +134,57 @@ public unsafe void SetHasStableIds (bool hasStableIds) } } - + /* + * TODO: Consider removing when Cycle 9 is released + */ public partial class WearableListView { private partial class SetScrollVerticallyProperty { static Delegate cb_get_Landroid_support_wearable_view_WearableListView_; - #pragma warning disable 0169 - static Delegate GetGet_Landroid_support_wearable_view_WearableListView_Handler () +#pragma warning disable 0169 + static Delegate GetGet_Landroid_support_wearable_view_WearableListView_Handler() { if (cb_get_Landroid_support_wearable_view_WearableListView_ == null) - cb_get_Landroid_support_wearable_view_WearableListView_ = JNINativeWrapper.CreateDelegate ((Func) n_Get_Landroid_support_wearable_view_WearableListView_); + cb_get_Landroid_support_wearable_view_WearableListView_ = JNINativeWrapper.CreateDelegate((Func)n_Get_Landroid_support_wearable_view_WearableListView_); return cb_get_Landroid_support_wearable_view_WearableListView_; } - static IntPtr n_Get_Landroid_support_wearable_view_WearableListView_ (IntPtr jnienv, IntPtr native__this, IntPtr native_wearableListView) + static IntPtr n_Get_Landroid_support_wearable_view_WearableListView_(IntPtr jnienv, IntPtr native__this, IntPtr native_wearableListView) { - global::Android.Support.Wearable.Views.WearableListView.SetScrollVerticallyProperty __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - global::Android.Support.Wearable.Views.WearableListView wearableListView = global::Java.Lang.Object.GetObject (native_wearableListView, JniHandleOwnership.DoNotTransfer); - IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Get (wearableListView)); + global::Android.Support.Wearable.Views.WearableListView.SetScrollVerticallyProperty __this = global::Java.Lang.Object.GetObject(jnienv, native__this, JniHandleOwnership.DoNotTransfer); + global::Android.Support.Wearable.Views.WearableListView wearableListView = global::Java.Lang.Object.GetObject(native_wearableListView, JniHandleOwnership.DoNotTransfer); + IntPtr __ret = JNIEnv.ToLocalJniHandle(__this.Get(wearableListView)); return __ret; } - #pragma warning restore 0169 +#pragma warning restore 0169 static IntPtr id_get_Landroid_support_wearable_view_WearableListView_; // Metadata.xml XPath method reference: path="/api/package[@name='android.support.wearable.view']/class[@name='WearableListView.SetScrollVerticallyProperty']/method[@name='get' and count(parameter)=1 and parameter[1][@type='android.support.wearable.view.WearableListView']]" - [Register ("get", "(Landroid/support/wearable/view/WearableListView;)Ljava/lang/Integer;", "GetGet_Landroid_support_wearable_view_WearableListView_Handler")] - public override unsafe global::Java.Lang.Object Get (Java.Lang.Object wearableListView) + [Register("get", "(Landroid/support/wearable/view/WearableListView;)Ljava/lang/Integer;", "GetGet_Landroid_support_wearable_view_WearableListView_Handler")] + public override unsafe global::Java.Lang.Object Get(Java.Lang.Object wearableListView) { if (id_get_Landroid_support_wearable_view_WearableListView_ == IntPtr.Zero) - id_get_Landroid_support_wearable_view_WearableListView_ = JNIEnv.GetMethodID (class_ref, "get", "(Landroid/support/wearable/view/WearableListView;)Ljava/lang/Integer;"); - try { - JValue* __args = stackalloc JValue [1]; - __args [0] = new JValue (wearableListView); + id_get_Landroid_support_wearable_view_WearableListView_ = JNIEnv.GetMethodID(class_ref, "get", "(Landroid/support/wearable/view/WearableListView;)Ljava/lang/Integer;"); + try + { + JValue* __args = stackalloc JValue[1]; + __args[0] = new JValue(wearableListView); global::Java.Lang.Integer __ret; - if (GetType () == ThresholdType) - __ret = global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_get_Landroid_support_wearable_view_WearableListView_, __args), JniHandleOwnership.TransferLocalRef); + if (GetType() == ThresholdType) + __ret = global::Java.Lang.Object.GetObject(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_get_Landroid_support_wearable_view_WearableListView_, __args), JniHandleOwnership.TransferLocalRef); else - __ret = global::Java.Lang.Object.GetObject (JNIEnv.CallNonvirtualObjectMethod (((global::Java.Lang.Object) this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "get", "(Landroid/support/wearable/view/WearableListView;)Ljava/lang/Integer;"), __args), JniHandleOwnership.TransferLocalRef); + __ret = global::Java.Lang.Object.GetObject(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "get", "(Landroid/support/wearable/view/WearableListView;)Ljava/lang/Integer;"), __args), JniHandleOwnership.TransferLocalRef); return __ret; - } finally { + } + finally + { } } - - - } } + /* + * End TODO + */ } diff --git a/support-wearable/source/Properties/AssemblyInfo.cs b/support-wearable/source/Properties/AssemblyInfo.cs index 1b95e207c..c63849c52 100644 --- a/support-wearable/source/Properties/AssemblyInfo.cs +++ b/support-wearable/source/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle ("Xamarin.Android.Wearable")] +[assembly: AssemblyTitle ("Xamarin.Android.Wear")] [assembly: AssemblyDescription ("")] [assembly: AssemblyConfiguration ("")] [assembly: AssemblyCompany ("Microsoft Corporation")] @@ -20,24 +20,3 @@ // if desired. See the Mono documentation for more information about signing. //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - - -// Wearable Support lib -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __WearableConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __WearableConsts.AarPath, - Version = __GpsConsts.WearVersion, - Sha1sum = __GpsConsts.Sha1sum)] -// Wearable Support Resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __WearableConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __WearableConsts.AarPath, - Version = __GpsConsts.WearVersion, - Sha1sum = __GpsConsts.Sha1sum)] - -static class __WearableConsts { - public const string PackageName = "Xamarin.Android.Wear"; - public const string AarPath = "m2repository/com/google/android/support/wearable/" + __GpsConsts.WearVersion + "/wearable-" + __GpsConsts.WearVersion + ".aar"; -} diff --git a/support-wearable/source/SupportWearable.csproj b/support-wearable/source/SupportWearable.csproj index e8a0cb883..cc9c956cc 100644 --- a/support-wearable/source/SupportWearable.csproj +++ b/support-wearable/source/SupportWearable.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -10,7 +11,7 @@ Resources Assets False - Xamarin.Android.Wearable + Xamarin.Android.Wear v5.0 class-parse 8.0.30703 @@ -19,6 +20,7 @@ + true @@ -86,4 +88,6 @@ + + diff --git a/support-wearable/source/packages.config b/support-wearable/source/packages.config index 93c704a59..2cb1a9a8b 100644 --- a/support-wearable/source/packages.config +++ b/support-wearable/source/packages.config @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/tagmanager-api/nuget/Xamarin.GooglePlayServices.TagManager.Api.template.nuspec b/tagmanager-api/nuget/Xamarin.GooglePlayServices.TagManager.Api.template.nuspec index cdedbd5e5..47905e6c5 100644 --- a/tagmanager-api/nuget/Xamarin.GooglePlayServices.TagManager.Api.template.nuspec +++ b/tagmanager-api/nuget/Xamarin.GooglePlayServices.TagManager.Api.template.nuspec @@ -16,11 +16,15 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-tagmanager-api_128x128.png - - + + + + + + diff --git a/tagmanager-api/source/Additions/AboutAdditions.txt b/tagmanager-api/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/tagmanager-api/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/tagmanager-api/source/Additions/Manifest.cs b/tagmanager-api/source/Additions/Manifest.cs deleted file mode 100644 index 5450ca3d3..000000000 --- a/tagmanager-api/source/Additions/Manifest.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using Android.Runtime; -using Android.App; -using Android.Content; - -[assembly: UsesPermission (Android.Manifest.Permission.WakeLock)] -[assembly: UsesPermission (Android.Manifest.Permission.AccessNetworkState)] - -namespace Android.Gms.TagManager -{ - // - [Service (Name="com.google.android.gms.tagmanager.TagManagerService", Exported=false, Enabled=true)] - public partial class TagManagerService - { - } - - // - // - // - // - // - // - // - // - [Activity (Name="com.google.android.gms.tagmanager.TagManagerPreviewActivity", NoHistory=true)] - [IntentFilter (new [] { Intent.ActionView }, - DataScheme="tagmanager.c.${applicationId}", - Categories=new [] { Intent.CategoryDefault, Intent.CategoryBrowsable })] - public partial class TagManagerPreviewActivity - { - } -} - diff --git a/tagmanager-api/source/Properties/AssemblyInfo.cs b/tagmanager-api/source/Properties/AssemblyInfo.cs index bd864beb5..43ec4fc1a 100644 --- a/tagmanager-api/source/Properties/AssemblyInfo.cs +++ b/tagmanager-api/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-tagmanager-api/" + __GpsConsts.Version + "/play-services-tagmanager-api-" + __GpsConsts.Version + ".aar"; -} diff --git a/tagmanager-api/source/TagManager.Api.csproj b/tagmanager-api/source/TagManager.Api.csproj index 66a0506d1..23332012f 100644 --- a/tagmanager-api/source/TagManager.Api.csproj +++ b/tagmanager-api/source/TagManager.Api.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,19 +48,15 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - - + @@ -77,9 +75,14 @@ + Jars\play-services-tagmanager-api.jar + + + + diff --git a/tagmanager-api/source/packages.config b/tagmanager-api/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/tagmanager-api/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/tagmanager-v4-impl/nuget/Xamarin.GooglePlayServices.TagManager.V4.Impl.template.nuspec b/tagmanager-v4-impl/nuget/Xamarin.GooglePlayServices.TagManager.V4.Impl.template.nuspec new file mode 100644 index 000000000..07856bc4f --- /dev/null +++ b/tagmanager-v4-impl/nuget/Xamarin.GooglePlayServices.TagManager.V4.Impl.template.nuspec @@ -0,0 +1,30 @@ + + + + Xamarin.GooglePlayServices.TagManager.V4.Impl + Xamarin Google Play Services - TagManager API V4 Impl + $version$ + Xamarin Inc. + Xamarin Inc. + true + Xamarin.Android Bindings for Google Play Services - TagManager API V4 Impl $aar-version$ + + Xamarin.Android Bindings for Google Play Services - TagManager API V4 Impl $aar-version$ + + Copyright © Microsoft Corporation + https://github.com/xamarin/GooglePlayServicesComponents/ + https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md + https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-tagmanager-api_128x128.png + + + + + + + + + + + + + diff --git a/tagmanager-v4-impl/source/Additions/IPendingResultExtensions.cs b/tagmanager-v4-impl/source/Additions/IPendingResultExtensions.cs new file mode 100644 index 000000000..eb186f0c7 --- /dev/null +++ b/tagmanager-v4-impl/source/Additions/IPendingResultExtensions.cs @@ -0,0 +1,40 @@ +using System; +using System.Threading.Tasks; +using Android.Gms.Common.Apis; +using Android.Runtime; + +namespace Android.Gms.Tagmanager +{ + public partial class TagManagerClass + { + public async Task LoadContainerDefaultOnlyAsync(string containerId, int defaultContainerResourceId) + { + return (await LoadContainerDefaultOnly(containerId, defaultContainerResourceId)).JavaCast(); + } + + public async Task LoadContainerDefaultOnlyAsync(string containerId, int defaultContainerResourceId, Android.OS.Handler handler) + { + return (await LoadContainerDefaultOnly(containerId, defaultContainerResourceId, handler)).JavaCast(); + } + + public async Task LoadContainerPreferFreshAsync(string containerId, int defaultContainerResourceId) + { + return (await LoadContainerPreferFresh(containerId, defaultContainerResourceId)).JavaCast(); + } + + public async Task LoadContainerPreferFreshAsync(string containerId, int defaultContainerResourceId, Android.OS.Handler handler) + { + return (await LoadContainerPreferFresh(containerId, defaultContainerResourceId, handler)).JavaCast(); + } + + public async Task LoadContainerPreferNonDefaultAsync(string containerId, int defaultContainerResourceId) + { + return (await LoadContainerPreferNonDefault(containerId, defaultContainerResourceId)).JavaCast(); + } + + public async Task LoadContainerPreferNonDefaultAsync(string containerId, int defaultContainerResourceId, Android.OS.Handler handler) + { + return (await LoadContainerPreferNonDefault(containerId, defaultContainerResourceId, handler)).JavaCast(); + } + } +} \ No newline at end of file diff --git a/firebase-auth-module/source/Properties/AssemblyInfo.cs b/tagmanager-v4-impl/source/Properties/AssemblyInfo.cs similarity index 53% rename from firebase-auth-module/source/Properties/AssemblyInfo.cs rename to tagmanager-v4-impl/source/Properties/AssemblyInfo.cs index 382d69fa8..3b763381e 100644 --- a/firebase-auth-module/source/Properties/AssemblyInfo.cs +++ b/tagmanager-v4-impl/source/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle ("Xamarin.Firebase.Auth.Module")] +[assembly: AssemblyTitle ("Xamarin.GooglePlayServices.TagManager.V4.Impl")] [assembly: AssemblyDescription ("")] [assembly: AssemblyConfiguration ("")] [assembly: AssemblyCompany ("Microsoft Corporation")] @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __FbConsts.PackageName, - SourceUrl = __FbConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __FbConsts.Version, - Sha1sum = __FbConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/firebase/firebase-auth-module/" + __FbConsts.Version + "/firebase-auth-module-" + __FbConsts.Version + ".aar"; -} diff --git a/appindexing/source/AppIndexing.csproj b/tagmanager-v4-impl/source/TagManager.V4.Impl.csproj similarity index 58% rename from appindexing/source/AppIndexing.csproj rename to tagmanager-v4-impl/source/TagManager.V4.Impl.csproj index ab1935935..320dadf96 100644 --- a/appindexing/source/AppIndexing.csproj +++ b/tagmanager-v4-impl/source/TagManager.V4.Impl.csproj @@ -1,24 +1,26 @@ + Debug AnyCPU {10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {A069B942-EE12-4283-8C4C-F46549D3978A} + 8.0.30703 + 2.0 + {ED50788D-0553-48A2-A47A-6AD1C9DF41BE} Library - GooglePlayServices.AppIndexing + GooglePlayServices.TagManager.V4.Impl Resources Assets False - Xamarin.GooglePlayServices.AppIndexing + Xamarin.GooglePlayServices.TagManager.V4.Impl v7.0 - class-parse + class-parse ..\..\externals\docs\reference - 8.0.30703 - 2.0 + true @@ -45,37 +47,15 @@ - - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - - - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - False + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - - Properties\GpsConsts.cs - - - @@ -84,28 +64,26 @@ - - - Jars\play-services-appindexing.jar - - {6A38FACF-F0C5-4A49-8A8A-7CE6634207CE} Basement + + {7893F52D-09B9-4441-AC47-6F7875BD68BC} + Analytics.Impl + {3F6BAE25-ADEB-468C-8384-AD655623C341} Base - - {53F87D88-8871-41A2-9F81-B79AB02FEC24} - Tasks - - - {865652D3-8D1A-4779-92FC-4C54719286B7} - Firebase-Common - + + + + Jars\play-services-tagmanager-v4-impl.jar + + + diff --git a/firebase-auth-common/source/Transforms/EnumFields.xml b/tagmanager-v4-impl/source/Transforms/EnumFields.xml similarity index 100% rename from firebase-auth-common/source/Transforms/EnumFields.xml rename to tagmanager-v4-impl/source/Transforms/EnumFields.xml diff --git a/firebase-auth-common/source/Transforms/EnumMethods.xml b/tagmanager-v4-impl/source/Transforms/EnumMethods.xml similarity index 100% rename from firebase-auth-common/source/Transforms/EnumMethods.xml rename to tagmanager-v4-impl/source/Transforms/EnumMethods.xml diff --git a/firebase-auth-common/source/Transforms/Metadata.generated.xml b/tagmanager-v4-impl/source/Transforms/Metadata.generated.xml similarity index 100% rename from firebase-auth-common/source/Transforms/Metadata.generated.xml rename to tagmanager-v4-impl/source/Transforms/Metadata.generated.xml diff --git a/firebase-auth-common/source/Transforms/Metadata.xml b/tagmanager-v4-impl/source/Transforms/Metadata.xml similarity index 57% rename from firebase-auth-common/source/Transforms/Metadata.xml rename to tagmanager-v4-impl/source/Transforms/Metadata.xml index 5b19d048b..ca7b5340c 100644 --- a/firebase-auth-common/source/Transforms/Metadata.xml +++ b/tagmanager-v4-impl/source/Transforms/Metadata.xml @@ -1,13 +1,15 @@  - - - Firebase.Auth + + Android.Gms.Tagmanager - + + + + - + source @@ -15,4 +17,5 @@ dest flags + TagManagerClass diff --git a/tagmanager-v4-impl/source/packages.config b/tagmanager-v4-impl/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/tagmanager-v4-impl/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/tagmanager/nuget/Xamarin.GooglePlayServices.TagManager.template.nuspec b/tagmanager/nuget/Xamarin.GooglePlayServices.TagManager.template.nuspec index 9e811dda5..a6bcd0327 100644 --- a/tagmanager/nuget/Xamarin.GooglePlayServices.TagManager.template.nuspec +++ b/tagmanager/nuget/Xamarin.GooglePlayServices.TagManager.template.nuspec @@ -16,12 +16,16 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-tagmanager_128x128.png - - - + + + + + + + diff --git a/tagmanager/source/Additions/AboutAdditions.txt b/tagmanager/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/tagmanager/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/tagmanager/source/Properties/AssemblyInfo.cs b/tagmanager/source/Properties/AssemblyInfo.cs index f152e6e6c..6c75ae3e7 100644 --- a/tagmanager/source/Properties/AssemblyInfo.cs +++ b/tagmanager/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-tagmanager/" + __GpsConsts.Version + "/play-services-tagmanager-" + __GpsConsts.Version + ".aar"; -} diff --git a/tagmanager/source/TagManager.csproj b/tagmanager/source/TagManager.csproj index 6214cf7b6..0709faf9c 100644 --- a/tagmanager/source/TagManager.csproj +++ b/tagmanager/source/TagManager.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,18 +48,15 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - - Properties\GpsConsts.cs - - + @@ -80,9 +79,14 @@ + Jars\play-services-tagmanager.jar + + + + diff --git a/tagmanager/source/packages.config b/tagmanager/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/tagmanager/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/tasks/nuget/Xamarin.GooglePlayServices.Tasks.template.nuspec b/tasks/nuget/Xamarin.GooglePlayServices.Tasks.template.nuspec index 3bda8f458..1e8e36516 100644 --- a/tasks/nuget/Xamarin.GooglePlayServices.Tasks.template.nuspec +++ b/tasks/nuget/Xamarin.GooglePlayServices.Tasks.template.nuspec @@ -16,10 +16,14 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-tasks_128x128.png - + + + + + diff --git a/tasks/source/Additions/AboutAdditions.txt b/tasks/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/tasks/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/tasks/source/Properties/AssemblyInfo.cs b/tasks/source/Properties/AssemblyInfo.cs index ec1e1685e..13e193403 100644 --- a/tasks/source/Properties/AssemblyInfo.cs +++ b/tasks/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-tasks/" + __GpsConsts.Version + "/play-services-tasks-" + __GpsConsts.Version + ".aar"; -} diff --git a/tasks/source/Tasks.csproj b/tasks/source/Tasks.csproj index 6ff7ad592..ef7980bc0 100644 --- a/tasks/source/Tasks.csproj +++ b/tasks/source/Tasks.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,34 +48,30 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - @@ -90,9 +88,17 @@ + Jars\play-services-tasks.jar + + + + + + + diff --git a/tasks/source/Transforms/Metadata.xml b/tasks/source/Transforms/Metadata.xml index 7354485f9..0d92a4a11 100644 --- a/tasks/source/Transforms/Metadata.xml +++ b/tasks/source/Transforms/Metadata.xml @@ -2,20 +2,10 @@ Android.Gms.Tasks - TasksClass - - - - - source - size - dest - flags - diff --git a/tasks/source/packages.config b/tasks/source/packages.config index 71e0c9953..247b0876a 100644 --- a/tasks/source/packages.config +++ b/tasks/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/template.targets b/template.targets new file mode 100644 index 000000000..bb763a55f --- /dev/null +++ b/template.targets @@ -0,0 +1,46 @@ + + + + + <_XbdKey_>$XbdKey$ + + + <_XbdAarFile_>m2repository\com\google\$AarInnerPath$\$AarVersion$\$AarKey$-$AarVersion$.aar + + + <_XbdAarFileFullPath_>$(XamarinBuildDownloadDir)$(_XbdKey_)\$AarKey$-$AarVersion$.aar + + + <_XbdAssemblyName_>$XbdAssemblyName$ + + + + + + + + + + + + + + + $XbdUrl$ + $AarKey$-$AarVersion$.aar + $XbdRangeStart$ + $XbdRangeEnd$ + $XbdMd5$ + Please open the Android SDK Manager and install the latest version of 'Google Repository' from the 'Extras' section, and then reload your solution. + XBD404 + + + + + + __AndroidLibraryProjects__.zip + $(_XbdAssemblyName_) + + + + \ No newline at end of file diff --git a/vision/component/component.template.yaml b/vision/component/component.template.yaml index 0dc4e0534..cef0b4213 100644 --- a/vision/component/component.template.yaml +++ b/vision/component/component.template.yaml @@ -27,5 +27,8 @@ samples: - Xamarin.GooglePlayServices.Basement - Xamarin.GooglePlayServices.Tasks - Xamarin.GooglePlayServices.Vision + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/vision/nuget/Xamarin.GooglePlayServices.Vision.template.nuspec b/vision/nuget/Xamarin.GooglePlayServices.Vision.template.nuspec index b60b13ecc..74bffb9e4 100644 --- a/vision/nuget/Xamarin.GooglePlayServices.Vision.template.nuspec +++ b/vision/nuget/Xamarin.GooglePlayServices.Vision.template.nuspec @@ -22,11 +22,15 @@ http://components.xamarin.com/license/googleplayservices-vision/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-vision_128x128.png - - + + + + + + diff --git a/vision/samples/VisionSample/VisionSample.csproj b/vision/samples/VisionSample/VisionSample.csproj index d5da6135f..4be4d5bae 100644 --- a/vision/samples/VisionSample/VisionSample.csproj +++ b/vision/samples/VisionSample/VisionSample.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -108,4 +109,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/vision/samples/VisionSample/packages.config b/vision/samples/VisionSample/packages.config index 71e0c9953..247b0876a 100644 --- a/vision/samples/VisionSample/packages.config +++ b/vision/samples/VisionSample/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/vision/source/Additions/AboutAdditions.txt b/vision/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/vision/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/vision/source/Properties/AssemblyInfo.cs b/vision/source/Properties/AssemblyInfo.cs index e024a57c9..be3c2ed44 100644 --- a/vision/source/Properties/AssemblyInfo.cs +++ b/vision/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-vision/" + __GpsConsts.Version + "/play-services-vision-" + __GpsConsts.Version + ".aar"; -} diff --git a/vision/source/Vision.csproj b/vision/source/Vision.csproj index e2c447f47..88dac47c2 100644 --- a/vision/source/Vision.csproj +++ b/vision/source/Vision.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,20 +48,17 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - + @@ -73,6 +72,7 @@ + {3F6BAE25-ADEB-468C-8384-AD655623C341} @@ -83,4 +83,5 @@ Basement + diff --git a/vision/source/packages.config b/vision/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/vision/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/wallet/component/component.template.yaml b/wallet/component/component.template.yaml index 53ea60248..60162b634 100644 --- a/wallet/component/component.template.yaml +++ b/wallet/component/component.template.yaml @@ -31,5 +31,8 @@ samples: - Xamarin.GooglePlayServices.Wallet - Xamarin.GooglePlayServices.Plus - Xamarin.GooglePlayServices.Identity + removeNodes: + - "//xNS:Import[contains (@Project, 'Xamarin.GooglePlayServices.Basement.targets')]" + - "//xNS:Import[contains (@Project, 'generated.targets')]" local-nuget-repo: ../../output/ no_build: true diff --git a/wallet/nuget/Xamarin.GooglePlayServices.Wallet.template.nuspec b/wallet/nuget/Xamarin.GooglePlayServices.Wallet.template.nuspec index d7c4863de..a3fcecbcc 100644 --- a/wallet/nuget/Xamarin.GooglePlayServices.Wallet.template.nuspec +++ b/wallet/nuget/Xamarin.GooglePlayServices.Wallet.template.nuspec @@ -18,13 +18,17 @@ http://components.xamarin.com/license/googleplayservices-wallet/ https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-wallet_128x128.png - - - - + + + + + + + + diff --git a/wallet/samples/AndroidPayQuickstart/AndroidPayQuickstart.csproj b/wallet/samples/AndroidPayQuickstart/AndroidPayQuickstart.csproj index d061d5e9c..a41e02d75 100644 --- a/wallet/samples/AndroidPayQuickstart/AndroidPayQuickstart.csproj +++ b/wallet/samples/AndroidPayQuickstart/AndroidPayQuickstart.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -44,22 +45,22 @@ - ..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll @@ -196,4 +197,12 @@ Tasks + + + + + + + + \ No newline at end of file diff --git a/wallet/samples/AndroidPayQuickstart/packages.config b/wallet/samples/AndroidPayQuickstart/packages.config index 71e0c9953..247b0876a 100644 --- a/wallet/samples/AndroidPayQuickstart/packages.config +++ b/wallet/samples/AndroidPayQuickstart/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/wallet/source/Additions/AboutAdditions.txt b/wallet/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/wallet/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/wallet/source/Properties/AssemblyInfo.cs b/wallet/source/Properties/AssemblyInfo.cs index 1151ffb67..2b9aa75ad 100644 --- a/wallet/source/Properties/AssemblyInfo.cs +++ b/wallet/source/Properties/AssemblyInfo.cs @@ -25,24 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-wallet/" + __GpsConsts.Version + "/play-services-wallet-" + __GpsConsts.Version + ".aar"; -} diff --git a/wallet/source/Wallet.csproj b/wallet/source/Wallet.csproj index 2f703eb22..b65181cd0 100644 --- a/wallet/source/Wallet.csproj +++ b/wallet/source/Wallet.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ ..\..\..\key-data\Xamarin-public.snk --> 8.0.30703 2.0 + true @@ -46,35 +48,31 @@ - ..\..\packages\Xamarin.Android.Support.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - ..\..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + ..\..\packages\Xamarin.Android.Support.Core.UI.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - ..\..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + ..\..\packages\Xamarin.Android.Support.Core.Utils.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - ..\..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + ..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - ..\..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + ..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False - - Properties\GpsConsts.cs - - @@ -108,4 +106,12 @@ + + + + + + + + diff --git a/wallet/source/packages.config b/wallet/source/packages.config index 71e0c9953..247b0876a 100644 --- a/wallet/source/packages.config +++ b/wallet/source/packages.config @@ -1,9 +1,10 @@  - - - - - - + + + + + + + \ No newline at end of file diff --git a/wearable/nuget/Xamarin.GooglePlayServices.Wearable.template.nuspec b/wearable/nuget/Xamarin.GooglePlayServices.Wearable.template.nuspec index d9beba35c..21162295e 100644 --- a/wearable/nuget/Xamarin.GooglePlayServices.Wearable.template.nuspec +++ b/wearable/nuget/Xamarin.GooglePlayServices.Wearable.template.nuspec @@ -18,13 +18,17 @@ https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-wearable_128x128.png - - - - + + + + + + + + diff --git a/wearable/source/Additions/AboutAdditions.txt b/wearable/source/Additions/AboutAdditions.txt deleted file mode 100644 index c511f1d4e..000000000 --- a/wearable/source/Additions/AboutAdditions.txt +++ /dev/null @@ -1,48 +0,0 @@ -Additions allow you to add arbitrary C# to the generated classes -before they are compiled. This can be helpful for providing convenience -methods or adding pure C# classes. - -== Adding Methods to Generated Classes == - -Let's say the library being bound has a Rectangle class with a constructor -that takes an x and y position, and a width and length size. It will look like -this: - -public partial class Rectangle -{ - public Rectangle (int x, int y, int width, int height) - { - // JNI bindings - } -} - -Imagine we want to add a constructor to this class that takes a Point and -Size structure instead of 4 ints. We can add a new file called Rectangle.cs -with a partial class containing our new method: - -public partial class Rectangle -{ - public Rectangle (Point location, Size size) : - this (location.X, location.Y, size.Width, size.Height) - { - } -} - -At compile time, the additions class will be added to the generated class -and the final assembly will a Rectangle class with both constructors. - - -== Adding C# Classes == - -Another thing that can be done is adding fully C# managed classes to the -generated library. In the above example, let's assume that there isn't a -Point class available in Java or our library. The one we create doesn't need -to interact with Java, so we'll create it like a normal class in C#. - -By adding a Point.cs file with this class, it will end up in the binding library: - -public class Point -{ - public int X { get; set; } - public int Y { get; set; } -} diff --git a/wearable/source/Properties/AssemblyInfo.cs b/wearable/source/Properties/AssemblyInfo.cs index ac15f4b8d..30077803b 100644 --- a/wearable/source/Properties/AssemblyInfo.cs +++ b/wearable/source/Properties/AssemblyInfo.cs @@ -25,25 +25,3 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - - -[assembly: Java.Interop.JavaLibraryReference ("classes.jar", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] -// AppCompat-v7 resources -[assembly: Android.IncludeAndroidResourcesFromAttribute ("./", - PackageName = __GpsConsts.PackageName, - SourceUrl = __GpsConsts.Url, - EmbeddedArchive = __Consts.AarPath, - Version = __GpsConsts.Version, - Sha1sum = __GpsConsts.Sha1sum)] - -// Google Addon feed with GPS in it: -// https://dl-ssl.google.com/android/repository/addon.xml - -static class __Consts { - public const string AarPath = "m2repository/com/google/android/gms/play-services-wearable/" + __GpsConsts.Version + "/play-services-wearable-" + __GpsConsts.Version + ".aar"; -} diff --git a/wearable/source/Wearable.csproj b/wearable/source/Wearable.csproj index e11052c94..d8e637304 100644 --- a/wearable/source/Wearable.csproj +++ b/wearable/source/Wearable.csproj @@ -1,5 +1,6 @@ + Debug AnyCPU @@ -19,6 +20,7 @@ + true @@ -46,10 +48,10 @@ - ..\..\packages\Xamarin.Android.Support.v4.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll + ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll - ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.24.2.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll + ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll @@ -57,13 +59,10 @@ - - Properties\GpsConsts.cs - - + @@ -87,4 +86,6 @@ + + diff --git a/wearable/source/packages.config b/wearable/source/packages.config new file mode 100644 index 000000000..7de4d5fa3 --- /dev/null +++ b/wearable/source/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file