Merge pull request xamarin#581 from SotoiGhost/fix/android/googleplaces

[Android][GooglePlaces] Fixed dependencies on NuGet
MartinPessoa · May 28, 2019 · 2ee0ec4 · 2ee0ec4
2 parents b270404 + e3dfa36
commit 2ee0ec4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/Android/GooglePlaces/build.cake b/Android/GooglePlaces/build.cake
@@ -4,7 +4,8 @@
 var TARGET = Argument ("t", Argument ("target", "Default"));
 
 var PLACES_VERSION = "1.1.0";
-var PLACES_NUGET_VERSION = PLACES_VERSION;
+var XAMARIN_FIX_VERSION = "1";
+var PLACES_NUGET_VERSION = $"{PLACES_VERSION}.{XAMARIN_FIX_VERSION}";
 var PLACES_URL = $"https://maven.google.com/com/google/android/libraries/places/places/{PLACES_VERSION}/places-{PLACES_VERSION}.aar";
 var ANDROID_SDK_BUILD_TOOLS_VERSION = "28.0.3";
 

diff --git a/Android/GooglePlaces/source/GooglePlaces/GooglePlaces.csproj b/Android/GooglePlaces/source/GooglePlaces/GooglePlaces.csproj
@@ -24,7 +24,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2087149</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2087221</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>1.1.0</PackageVersion>
+    <PackageVersion>1.1.0.1</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,20 +42,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.1" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Android.Volley" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Android.Glide" Version="4.9.0" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="71.1601.0-preview3" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="71.1610.0-preview3" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Clearcut" Version="71.1600.0-preview3" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="71.1600.0-preview3" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="71.1600.0-preview3" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="71.1601.0-preview3" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Google.AutoValue.Annotations" Version="1.6.5" PrivateAssets="All" />
-    <PackageReference Include="GoogleGson" Version="2.8.5" PrivateAssets="All" />
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Android.Volley" Version="1.1.1" />
+    <PackageReference Include="Xamarin.Android.Glide" Version="4.9.0" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="71.1601.0-preview3" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="71.1610.0-preview3" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Clearcut" Version="71.1600.0-preview3" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="71.1600.0-preview3" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="71.1600.0-preview3" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="71.1601.0-preview3" />
+    <PackageReference Include="Xamarin.Google.AutoValue.Annotations" Version="1.6.5" />
+    <PackageReference Include="GoogleGson" Version="2.8.5" />
     <PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
   </ItemGroup>