Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit d412a00

Browse files
David BritchDavid Britch
authored andcommitted
Location plugins removed from test runners.
1 parent b9835a3 commit d412a00

File tree

5 files changed

+7
-30
lines changed

5 files changed

+7
-30
lines changed

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Android.App;
2+
using Android.Content;
23
using Android.OS;
34
using Android.Runtime;
4-
using Plugin.CurrentActivity;
55
using System;
66

77
namespace eShopOnContainers.TestRunner.Droid
@@ -10,8 +10,10 @@ namespace eShopOnContainers.TestRunner.Droid
1010
[Application]
1111
public class MainApplication : Application, Application.IActivityLifecycleCallbacks
1212
{
13+
internal static Context CurrentContext { get; private set; }
14+
1315
public MainApplication(IntPtr handle, JniHandleOwnership transer)
14-
:base(handle, transer)
16+
: base(handle, transer)
1517
{
1618
}
1719

@@ -30,7 +32,7 @@ public override void OnTerminate()
3032

3133
public void OnActivityCreated(Activity activity, Bundle savedInstanceState)
3234
{
33-
CrossCurrentActivity.Current.Activity = activity;
35+
CurrentContext = activity;
3436
}
3537

3638
public void OnActivityDestroyed(Activity activity)
@@ -43,7 +45,7 @@ public void OnActivityPaused(Activity activity)
4345

4446
public void OnActivityResumed(Activity activity)
4547
{
46-
CrossCurrentActivity.Current.Activity = activity;
48+
CurrentContext = activity;
4749
}
4850

4951
public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
@@ -52,7 +54,7 @@ public void OnActivitySaveInstanceState(Activity activity, Bundle outState)
5254

5355
public void OnActivityStarted(Activity activity)
5456
{
55-
CrossCurrentActivity.Current.Activity = activity;
57+
CurrentContext = activity;
5658
}
5759

5860
public void OnActivityStopped(Activity activity)

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@
5252
<ItemGroup>
5353
<Reference Include="Mono.Android" />
5454
<Reference Include="mscorlib" />
55-
<Reference Include="Plugin.Permissions, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
57-
</Reference>
58-
<Reference Include="Plugin.Permissions.Abstractions, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\..\..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
60-
</Reference>
6155
<Reference Include="System" />
6256
<Reference Include="System.Core" />
6357
<Reference Include="System.Xml.Linq" />
@@ -157,15 +151,6 @@
157151
<Reference Include="Plugin.Settings">
158152
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
159153
</Reference>
160-
<Reference Include="Plugin.CurrentActivity">
161-
<HintPath>..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
162-
</Reference>
163-
<Reference Include="Plugin.Geolocator.Abstractions">
164-
<HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
165-
</Reference>
166-
<Reference Include="Plugin.Geolocator">
167-
<HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
168-
</Reference>
169154
<Reference Include="PInvoke.Windows.Core">
170155
<HintPath>..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
171156
</Reference>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<package id="PInvoke.Kernel32" version="0.3.2" targetFramework="monoandroid80" />
1515
<package id="PInvoke.NCrypt" version="0.3.2" targetFramework="monoandroid80" />
1616
<package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="monoandroid80" />
17-
<package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid80" />
18-
<package id="Plugin.Permissions" version="2.2.1" targetFramework="monoandroid80" />
1917
<package id="SlideOverKit" version="2.1.5" targetFramework="monoandroid80" />
2018
<package id="Splat" version="2.0.0" targetFramework="monoandroid80" />
2119
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid80" />
@@ -66,7 +64,6 @@
6664
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid80" />
6765
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid80" />
6866
<package id="Validation" version="2.2.8" targetFramework="monoandroid80" />
69-
<package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid80" />
7067
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
7168
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid80" />
7269
<package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid80" />

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,6 @@
149149
<Reference Include="Newtonsoft.Json">
150150
<HintPath>..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
151151
</Reference>
152-
<Reference Include="Plugin.Geolocator.Abstractions">
153-
<HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll</HintPath>
154-
</Reference>
155-
<Reference Include="Plugin.Geolocator">
156-
<HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll</HintPath>
157-
</Reference>
158152
<Reference Include="SlideOverKit">
159153
<HintPath>..\..\..\..\packages\SlideOverKit.2.1.5\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
160154
</Reference>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
6666
<package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
6767
<package id="WebP.Touch" version="1.0.7" targetFramework="xamarinios10" />
68-
<package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="xamarinios10" />
6968
<package id="Xamarin.FFImageLoading" version="2.3.4" targetFramework="xamarinios10" />
7069
<package id="Xamarin.FFImageLoading.Forms" version="2.3.4" targetFramework="xamarinios10" />
7170
<package id="Xamarin.Forms" version="2.5.0.122203" targetFramework="xamarinios10" />

0 commit comments

Comments
 (0)