Skip to content

Commit f0b8001

Browse files
Updates
1 parent 7de8204 commit f0b8001

File tree

11 files changed

+29771
-70
lines changed

11 files changed

+29771
-70
lines changed

nuget/readme.txt

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,3 @@
11
Geolocator Readme
22

33
For latest changes: https://github.com/jamesmontemagno/GeolocatorPlugin/blob/master/CHANGELOG.md
4-
5-
## EXTREMELY IMPORTANT SETUP
6-
Please follow the guide to properly setup the Geolocator inside of your application:
7-
8-
https://jamesmontemagno.github.io/GeolocatorPlugin/GettingStarted.html
9-
10-
Additionally, see the permission setup below for Android to ensure everything is configured correct.
11-
12-
## Additional Android Permission Setup
13-
14-
This plugin uses the [Current Activity Plugin](https://github.com/jamesmontemagno/CurrentActivityPlugin/blob/master/README.md) to get access to the current Android Activity. Be sure to complete the full setup if a MainApplication.cs file was not automatically added to your application. Please fully read through the [Current Activity Plugin Documentation](https://github.com/jamesmontemagno/CurrentActivityPlugin/blob/master/README.md). At an absolute minimum you must set the following in your Activity's OnCreate method:
15-
16-
```csharp
17-
CrossCurrentActivity.Current.Init(this, bundle);
18-
```
19-
20-
It is highly recommended that you use a custom Application that are outlined in the Current Activity Plugin Documentation](https://github.com/jamesmontemagno/CurrentActivityPlugin/blob/master/README.md)
21-
22-
## Android specific in your BaseActivity or MainActivity (for Xamarin.Forms) add this code:
23-
24-
Add usings:
25-
26-
using Plugin.Permissions;
27-
28-
Then add to Activity:
29-
30-
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
31-
{
32-
Plugin.Permissions.PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
33-
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
34-
}

src/Geolocator.Plugin/Geolocator.Plugin.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
5050
</ItemGroup>
5151
<ItemGroup>
52-
<None Include="..\..\nuget\readme.txt" PackagePath="readme.txt" Pack="true" />
5352
<Compile Include="**\*.shared.cs" />
5453
</ItemGroup>
5554

src/Tests/GeolocatorTests.Droid/GeolocatorTests.Droid.csproj

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
1616
<AssemblyName>GeolocatorTests.Droid</AssemblyName>
1717
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
18-
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
1919
<NuGetPackageImportStamp>
2020
</NuGetPackageImportStamp>
2121
<AndroidTlsProvider>
@@ -73,7 +73,7 @@
7373
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
7474
</ItemGroup>
7575
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
76-
<ItemGroup>
76+
<ItemGroup>
7777
<ProjectReference Include="..\..\Geolocator.Plugin\Geolocator.Plugin.csproj">
7878
<Project>{36b8dd43-b679-4d13-8ba9-ded633e7b25f}</Project>
7979
<Name>Geolocator.Plugin</Name>
@@ -84,11 +84,8 @@
8484
</ProjectReference>
8585
</ItemGroup>
8686
<ItemGroup>
87-
<PackageReference Include="Plugin.Permissions">
88-
<Version>5.0.0-beta</Version>
89-
</PackageReference>
9087
<PackageReference Include="Xamarin.Forms">
91-
<Version>4.0.0.425677</Version>
88+
<Version>5.0.0.2125</Version>
9289
</PackageReference>
9390
</ItemGroup>
94-
</Project>
91+
</Project>

src/Tests/GeolocatorTests.Droid/Resources/Resource.designer.cs

Lines changed: 29764 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tests/GeolocatorTests.Mac/GeolocatorTests.Mac.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@
6060
</XamMacArch>
6161
</PropertyGroup>
6262
<ItemGroup>
63-
<Reference Include="Plugin.Permissions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Plugin.Permissions.5.0.0-beta\lib\netstandard2.0\Plugin.Permissions.dll</HintPath>
65-
</Reference>
6663
<Reference Include="System" />
6764
<Reference Include="System.Core" />
6865
<Reference Include="Xamarin.Mac" />
@@ -87,7 +84,6 @@
8784
<ItemGroup>
8885
<None Include="Info.plist" />
8986
<None Include="Entitlements.plist" />
90-
<None Include="packages.config" />
9187
</ItemGroup>
9288
<ItemGroup>
9389
<Compile Include="Main.cs" />

src/Tests/GeolocatorTests.Mac/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/Tests/GeolocatorTests.UWP/GeolocatorTests.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<Version>6.1.7</Version>
140140
</PackageReference>
141141
<PackageReference Include="Xamarin.Forms">
142-
<Version>4.0.0.425677</Version>
142+
<Version>5.0.0.2125</Version>
143143
</PackageReference>
144144
</ItemGroup>
145145
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

src/Tests/GeolocatorTests.iOS/GeolocatorTests.iOS.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,8 @@
107107
</ProjectReference>
108108
</ItemGroup>
109109
<ItemGroup>
110-
<PackageReference Include="Plugin.Permissions">
111-
<Version>5.0.0-beta</Version>
112-
</PackageReference>
113110
<PackageReference Include="Xamarin.Forms">
114-
<Version>4.0.0.425677</Version>
111+
<Version>5.0.0.2125</Version>
115112
</PackageReference>
116113
</ItemGroup>
117114
<ItemGroup>

src/Tests/GeolocatorTests.tvOS/GeolocatorTests.tvOS.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@
105105
<CodesignKey>iPhone Distribution</CodesignKey>
106106
</PropertyGroup>
107107
<ItemGroup>
108-
<Reference Include="Plugin.Permissions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
109-
<HintPath>..\..\packages\Plugin.Permissions.5.0.0-beta\lib\netstandard2.0\Plugin.Permissions.dll</HintPath>
110-
</Reference>
111108
<Reference Include="System" />
112109
<Reference Include="System.Xml" />
113110
<Reference Include="System.Core" />
@@ -170,7 +167,6 @@
170167
<None Include="GettingStarted.Xamarin" />
171168
<None Include="Info.plist" />
172169
<None Include="Entitlements.plist" />
173-
<None Include="packages.config" />
174170
</ItemGroup>
175171
<ItemGroup>
176172
<Compile Include="Main.cs" />

src/Tests/GeolocatorTests.tvOS/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)