Skip to content

Commit 7e0b5d2

Browse files
amay077amay077
authored
Merge pull request amay077#6 from amay077/develop
Stable-Release 1.1.0.0
2 parents 02f0ddc + 868d291 commit 7e0b5d2

File tree

12 files changed

+37
-41
lines changed

12 files changed

+37
-41
lines changed

‎XFGoogleMapSample/Droid/XFGoogleMapSample.Droid.csproj

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -66,6 +66,14 @@
6666
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
6767
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
6868
</Reference>
69+
<Reference Include="Xamarin.Forms.GoogleMaps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
70+
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.dll</HintPath>
71+
<Private>True</Private>
72+
</Reference>
73+
<Reference Include="Xamarin.Forms.GoogleMaps.Android, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.Android.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
6977
<Reference Include="Xamarin.Forms.Platform.Android">
7078
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
7179
</Reference>
@@ -90,12 +98,6 @@
9098
<Reference Include="Xamarin.GooglePlayServices.Maps">
9199
<HintPath>..\packages\Xamarin.GooglePlayServices.Maps.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Maps.dll</HintPath>
92100
</Reference>
93-
<Reference Include="Xamarin.Forms.GoogleMaps.Android">
94-
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0-beta2\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.Android.dll</HintPath>
95-
</Reference>
96-
<Reference Include="Xamarin.Forms.GoogleMaps">
97-
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0-beta2\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.dll</HintPath>
98-
</Reference>
99101
</ItemGroup>
100102
<ItemGroup>
101103
<ProjectReference Include="..\XFGoogleMapSample\XFGoogleMapSample.csproj">

‎XFGoogleMapSample/Droid/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="MonoAndroid60" />
1010
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="MonoAndroid60" />
1111
<package id="Xamarin.Forms" version="2.3.0.49" targetFramework="MonoAndroid60" />
12-
<package id="Xamarin.Forms.GoogleMaps" version="1.1.0-beta2" targetFramework="MonoAndroid60" />
12+
<package id="Xamarin.Forms.GoogleMaps" version="1.1.0" targetFramework="monoandroid60" />
1313
<package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="MonoAndroid60" />
1414
<package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="MonoAndroid60" />
1515
<package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="MonoAndroid60" />

‎XFGoogleMapSample/UWP/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
44
"Xamarin.Forms": "2.3.0.49",
5-
"Xamarin.Forms.GoogleMaps": "0.7.6"
5+
"Xamarin.Forms.GoogleMaps": "1.1.0"
66
},
77
"frameworks": {
88
"uap10.0": {}

‎XFGoogleMapSample/XFGoogleMapSample/XFGoogleMapSample.csproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -64,15 +64,16 @@
6464
<Reference Include="Xamarin.Forms.Core">
6565
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
6666
</Reference>
67+
<Reference Include="Xamarin.Forms.GoogleMaps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Xamarin.Forms.GoogleMaps.dll</HintPath>
69+
<Private>True</Private>
70+
</Reference>
6771
<Reference Include="Xamarin.Forms.Xaml">
6872
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
6973
</Reference>
7074
<Reference Include="Xamarin.Forms.Platform">
7175
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
7276
</Reference>
73-
<Reference Include="Xamarin.Forms.GoogleMaps">
74-
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0-beta2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+UAP10\Xamarin.Forms.GoogleMaps.dll</HintPath>
75-
</Reference>
7677
</ItemGroup>
7778
<ItemGroup>
7879
<None Include="packages.config" />

‎XFGoogleMapSample/XFGoogleMapSample/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Xamarin.Forms" version="2.3.0.49" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
4-
<package id="Xamarin.Forms.GoogleMaps" version="1.1.0-beta2" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
4+
<package id="Xamarin.Forms.GoogleMaps" version="1.1.0" targetFramework="portable45-net45+win8+wp8" />
55
</packages>

‎XFGoogleMapSample/iOS/XFGoogleMapSample.iOS.csproj

+8-6
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@
9090
<Reference Include="System" />
9191
<Reference Include="System.Xml" />
9292
<Reference Include="System.Core" />
93+
<Reference Include="Xamarin.Forms.GoogleMaps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0\lib\Xamarin.iOS10\Xamarin.Forms.GoogleMaps.dll</HintPath>
95+
<Private>True</Private>
96+
</Reference>
97+
<Reference Include="Xamarin.Forms.GoogleMaps.iOS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
98+
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0\lib\Xamarin.iOS10\Xamarin.Forms.GoogleMaps.iOS.dll</HintPath>
99+
<Private>True</Private>
100+
</Reference>
93101
<Reference Include="Xamarin.iOS" />
94102
<Reference Include="Xamarin.Forms.Platform.iOS">
95103
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
@@ -106,12 +114,6 @@
106114
<Reference Include="Google.Maps">
107115
<HintPath>..\packages\Xamarin.Google.iOS.Maps.1.13.1.0\lib\Xamarin.iOS10\Google.Maps.dll</HintPath>
108116
</Reference>
109-
<Reference Include="Xamarin.Forms.GoogleMaps.iOS">
110-
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0-beta2\lib\Xamarin.iOS10\Xamarin.Forms.GoogleMaps.iOS.dll</HintPath>
111-
</Reference>
112-
<Reference Include="Xamarin.Forms.GoogleMaps">
113-
<HintPath>..\packages\Xamarin.Forms.GoogleMaps.1.1.0-beta2\lib\Xamarin.iOS10\Xamarin.Forms.GoogleMaps.dll</HintPath>
114-
</Reference>
115117
</ItemGroup>
116118
<ItemGroup>
117119
<ProjectReference Include="..\XFGoogleMapSample\XFGoogleMapSample.csproj">

‎XFGoogleMapSample/iOS/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="Xamarin.Build.Download" version="0.2.1" targetFramework="xamarinios10" />
44
<package id="Xamarin.Forms" version="2.3.0.49" targetFramework="xamarinios10" />
5-
<package id="Xamarin.Forms.GoogleMaps" version="1.1.0-beta2" targetFramework="xamarinios10" />
5+
<package id="Xamarin.Forms.GoogleMaps" version="1.1.0" targetFramework="xamarinios10" />
66
<package id="Xamarin.Google.iOS.Maps" version="1.13.1.0" targetFramework="xamarinios10" />
77
</packages>

‎Xamarin.Forms.GoogleMaps/Xamarin.Forms.GoogleMaps.Android/Properties/GobalAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
[assembly: AssemblyProduct("Xamarin.Forms.GoogleMaps")]
55
[assembly: AssemblyCopyright("Copyright © amay077. 2016")]
66
[assembly: AssemblyTrademark("")]
7-
[assembly: AssemblyVersion("1.0.0.1")]
8-
[assembly: AssemblyFileVersion("1.0.0.1")]
7+
[assembly: AssemblyVersion("1.1.0.0")]
8+
[assembly: AssemblyFileVersion("1.1.0.0")]

‎Xamarin.Forms.GoogleMaps/Xamarin.Forms.GoogleMaps.UWP/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
// by using the '*' as shown below:
2424
// [assembly: AssemblyVersion("1.0.*")]
2525

26-
[assembly: AssemblyVersion("1.0.0.0")]
27-
[assembly: AssemblyFileVersion("1.0.0.0")]
26+
[assembly: AssemblyVersion("1.1.0.0")]
27+
[assembly: AssemblyFileVersion("1.1.0.0")]
2828
[assembly: ComVisible(false)]
2929
[assembly: ExportRenderer(typeof(Map), typeof(MapRenderer))]

‎Xamarin.Forms.GoogleMaps/Xamarin.Forms.GoogleMaps.iOS/Properties/GlobalAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
[assembly: AssemblyProduct("Xamarin.Forms.GoogleMaps")]
55
[assembly: AssemblyCopyright("Copyright © amay077. 2016")]
66
[assembly: AssemblyTrademark("")]
7-
[assembly: AssemblyVersion("1.0.0.1")]
8-
[assembly: AssemblyFileVersion("1.0.0.1")]
7+
[assembly: AssemblyVersion("1.1.0.0")]
8+
[assembly: AssemblyFileVersion("1.1.0.0")]

‎Xamarin.Forms.GoogleMaps/Xamarin.Forms.GoogleMaps.nuspec

+3-12
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,18 @@
33
<metadata minClientVersion="2.8.3">
44
<id>Xamarin.Forms.GoogleMaps</id>
55
<title>Xamarin.Forms.GoogleMaps</title>
6-
<version>1.1.0-beta2</version>
6+
<version>1.1.0</version>
77
<releaseNotes>
8-
# 1.1.0-beta2
8+
# 1.1.0
99

1010
## New Features
1111

12+
* Add Polyline support (Android / iOS only)
1213
* Add Polygon support (Android / iOS only)
1314
* Add Circle support (Android / iOS only)
1415
* Add Tag property to Pin, Polyline, Polygon, Circle classses
1516
* Add MapSpan.FromPositions method
1617
* Add animate parameter to Map.MoveToRegion method
17-
18-
## Bug Fixes
19-
20-
* [Android]Fix Map.Pins.Remove does not worked
21-
22-
#1.1.0-beta1
23-
24-
## New Features
25-
26-
* Add Polyline support (Android / iOS only)
2718
</releaseNotes>
2819
<authors>amay077</authors>
2920
<copyright>amay077</copyright>

‎Xamarin.Forms.GoogleMaps/Xamarin.Forms.GoogleMaps/Properties/GlobalAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
[assembly: AssemblyProduct("Xamarin.Forms.GoogleMaps")]
55
[assembly: AssemblyCopyright("Copyright © amay077. 2016")]
66
[assembly: AssemblyTrademark("")]
7-
[assembly: AssemblyVersion("1.0.0.0")]
8-
[assembly: AssemblyFileVersion("1.0.0.0")]
7+
[assembly: AssemblyVersion("1.1.0.0")]
8+
[assembly: AssemblyFileVersion("1.1.0.0")]

0 commit comments

Comments
 (0)