Updates

jamesmontemagno · Oct 4, 2021 · f0b8001 · f0b8001
1 parent 7de8204
commit f0b8001
Show file tree

Hide file tree

Showing 11 changed files with 29,771 additions and 70 deletions.
diff --git a/nuget/readme.txt b/nuget/readme.txt
@@ -1,34 +1,3 @@
 Geolocator Readme
 
 For latest changes: https://github.com/jamesmontemagno/GeolocatorPlugin/blob/master/CHANGELOG.md
-
-## EXTREMELY IMPORTANT SETUP
-Please follow the guide to properly setup the Geolocator inside of your application: 
-
-https://jamesmontemagno.github.io/GeolocatorPlugin/GettingStarted.html
-
-Additionally, see the permission setup below for Android to ensure everything is configured correct.
-
-## Additional Android Permission Setup
-
-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:
-
-```csharp
-CrossCurrentActivity.Current.Init(this, bundle);
-```
-
-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)
-
-## Android specific in your BaseActivity or MainActivity (for Xamarin.Forms) add this code:
-
-Add usings:
-
-using Plugin.Permissions;
-
-Then add to Activity:
-
-public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults)
-{
-    Plugin.Permissions.PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-    base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-}
diff --git a/src/Geolocator.Plugin/Geolocator.Plugin.csproj b/src/Geolocator.Plugin/Geolocator.Plugin.csproj
@@ -49,7 +49,6 @@
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 	</ItemGroup>
 	<ItemGroup>
-		<None Include="..\..\nuget\readme.txt" PackagePath="readme.txt" Pack="true" />
 		<Compile Include="**\*.shared.cs" />
 	</ItemGroup>
 

diff --git a/src/Tests/GeolocatorTests.Droid/GeolocatorTests.Droid.csproj b/src/Tests/GeolocatorTests.Droid/GeolocatorTests.Droid.csproj
@@ -15,7 +15,7 @@
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <AssemblyName>GeolocatorTests.Droid</AssemblyName>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <AndroidTlsProvider>
@@ -73,7 +73,7 @@
     <AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
- <ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\..\Geolocator.Plugin\Geolocator.Plugin.csproj">
       <Project>{36b8dd43-b679-4d13-8ba9-ded633e7b25f}</Project>
       <Name>Geolocator.Plugin</Name>
@@ -84,11 +84,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Plugin.Permissions">
-      <Version>5.0.0-beta</Version>
-    </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.0.0.425677</Version>
+      <Version>5.0.0.2125</Version>
     </PackageReference>
   </ItemGroup>
- </Project>
+</Project>
diff --git a/src/Tests/GeolocatorTests.Droid/Resources/Resource.designer.cs b/src/Tests/GeolocatorTests.Droid/Resources/Resource.designer.cs
diff --git a/src/Tests/GeolocatorTests.Mac/GeolocatorTests.Mac.csproj b/src/Tests/GeolocatorTests.Mac/GeolocatorTests.Mac.csproj
@@ -60,9 +60,6 @@
     </XamMacArch>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Plugin.Permissions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Plugin.Permissions.5.0.0-beta\lib\netstandard2.0\Plugin.Permissions.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Mac" />
@@ -87,7 +84,6 @@
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

diff --git a/src/Tests/GeolocatorTests.Mac/packages.config b/src/Tests/GeolocatorTests.Mac/packages.config
diff --git a/src/Tests/GeolocatorTests.UWP/GeolocatorTests.UWP.csproj b/src/Tests/GeolocatorTests.UWP/GeolocatorTests.UWP.csproj
@@ -139,7 +139,7 @@
       <Version>6.1.7</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.0.0.425677</Version>
+      <Version>5.0.0.2125</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

diff --git a/src/Tests/GeolocatorTests.iOS/GeolocatorTests.iOS.csproj b/src/Tests/GeolocatorTests.iOS/GeolocatorTests.iOS.csproj
@@ -107,11 +107,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Plugin.Permissions">
-      <Version>5.0.0-beta</Version>
-    </PackageReference>
     <PackageReference Include="Xamarin.Forms">
-      <Version>4.0.0.425677</Version>
+      <Version>5.0.0.2125</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Tests/GeolocatorTests.tvOS/GeolocatorTests.tvOS.csproj b/src/Tests/GeolocatorTests.tvOS/GeolocatorTests.tvOS.csproj
@@ -105,9 +105,6 @@
     <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Plugin.Permissions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Plugin.Permissions.5.0.0-beta\lib\netstandard2.0\Plugin.Permissions.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -170,7 +167,6 @@
     <None Include="GettingStarted.Xamarin" />
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

diff --git a/src/Tests/GeolocatorTests.tvOS/packages.config b/src/Tests/GeolocatorTests.tvOS/packages.config
diff --git a/src/Tests/GeolocatorTests/GeolocatorTests.csproj b/src/Tests/GeolocatorTests/GeolocatorTests.csproj
@@ -3,8 +3,7 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="Plugin.Permissions" Version="5.0.0-beta" />
-	  <PackageReference Include="Xamarin.Forms" Version="4.0.0.425677" />
+	  <PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\Geolocator.Plugin\Geolocator.Plugin.csproj" />