From 4873a55af5d655646ee8a73029385361b7f5114e Mon Sep 17 00:00:00 2001 From: Robin-Manuel Thiel Date: Tue, 7 Aug 2018 16:37:17 +0200 Subject: [PATCH] Fix merge issues --- .../ContosoMaintenance.WebAPI.csproj | 1 + Mobile/ContosoFieldService.Core/App.xaml.cs | 2 +- .../ContosoFieldService.Core.csproj | 10 +- .../Services/JobsAPIService.cs | 2 + .../Services/PartsAPIService.cs | 2 + .../ViewModels/Jobs/JobDetailsViewModel.cs | 7 +- Mobile/Droid/ContosoFieldService.Droid.csproj | 1060 +++++++++-------- Mobile/Droid/Properties/AndroidManifest.xml | 74 +- Mobile/Droid/packages.config | 340 +++--- Mobile/iOS/ContosoFieldService.iOS.csproj | 64 +- Mobile/iOS/packages.config | 316 ++--- 11 files changed, 945 insertions(+), 933 deletions(-) diff --git a/Backend/Monolithic/ContosoMaintenance.WebAPI.csproj b/Backend/Monolithic/ContosoMaintenance.WebAPI.csproj index 7a2cd9c..8b0900d 100644 --- a/Backend/Monolithic/ContosoMaintenance.WebAPI.csproj +++ b/Backend/Monolithic/ContosoMaintenance.WebAPI.csproj @@ -7,6 +7,7 @@ bin\Debug\netcoreapp2.1\ContosoMaintenance.WebAPI.xml + 1701;1702;1591 bin\Release\netcoreapp2.1\ContosoMaintenance.WebAPI.xml diff --git a/Mobile/ContosoFieldService.Core/App.xaml.cs b/Mobile/ContosoFieldService.Core/App.xaml.cs index 37c338c..5195a30 100644 --- a/Mobile/ContosoFieldService.Core/App.xaml.cs +++ b/Mobile/ContosoFieldService.Core/App.xaml.cs @@ -36,7 +36,7 @@ namespace ContosoFieldService // Stop the keyboard overlaying the chatbot webview on Android (it isn't a problem on iOS). - AndroidSpecific.Application.SetWindowSoftInputModeAdjust(this, AndroidSpecific.WindowSoftInputModeAdjust.Resize); + Xamarin.Forms.PlatformConfiguration.AndroidSpecific.Application.SetWindowSoftInputModeAdjust(this, Xamarin.Forms.PlatformConfiguration.AndroidSpecific.WindowSoftInputModeAdjust.Resize); // As iOS and Android follow fundamenntally different navigation patterns, we split up the // navigation style between iOS and Android here. iOS is using a Tabbed Navigation, diff --git a/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj b/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj index 9f487eb..2a3edfe 100644 --- a/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj +++ b/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj @@ -27,10 +27,7 @@ - - - - + @@ -42,11 +39,14 @@ - + + + + diff --git a/Mobile/ContosoFieldService.Core/Services/JobsAPIService.cs b/Mobile/ContosoFieldService.Core/Services/JobsAPIService.cs index c563a90..c8daca8 100644 --- a/Mobile/ContosoFieldService.Core/Services/JobsAPIService.cs +++ b/Mobile/ContosoFieldService.Core/Services/JobsAPIService.cs @@ -10,6 +10,8 @@ using Refit; using ContosoFieldService.Helpers; using MonkeyCache.FileStore; using Xamarin.Essentials; +using Microsoft.AppCenter.Crashes; + namespace ContosoFieldService.Services { public interface IJobServiceAPI diff --git a/Mobile/ContosoFieldService.Core/Services/PartsAPIService.cs b/Mobile/ContosoFieldService.Core/Services/PartsAPIService.cs index d167ae5..3c3bc35 100644 --- a/Mobile/ContosoFieldService.Core/Services/PartsAPIService.cs +++ b/Mobile/ContosoFieldService.Core/Services/PartsAPIService.cs @@ -7,6 +7,8 @@ using MonkeyCache.FileStore; using System.Linq; using System; using Xamarin.Essentials; +using Microsoft.AppCenter.Crashes; + namespace ContosoFieldService.Services { public interface IPartsServiceAPI diff --git a/Mobile/ContosoFieldService.Core/ViewModels/Jobs/JobDetailsViewModel.cs b/Mobile/ContosoFieldService.Core/ViewModels/Jobs/JobDetailsViewModel.cs index f47c396..23ab1b8 100644 --- a/Mobile/ContosoFieldService.Core/ViewModels/Jobs/JobDetailsViewModel.cs +++ b/Mobile/ContosoFieldService.Core/ViewModels/Jobs/JobDetailsViewModel.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Windows.Input; +using System.Collections.Generic; using ContosoFieldService.Models; -using FreshMvvm; using Humanizer; using Xamarin.Forms; -using System.Windows.Input; -using ContosoFieldService.ViewModels.Jobs; using Xamarin.Essentials; namespace ContosoFieldService.ViewModels diff --git a/Mobile/Droid/ContosoFieldService.Droid.csproj b/Mobile/Droid/ContosoFieldService.Droid.csproj index 13ca56c..ee5c207 100644 --- a/Mobile/Droid/ContosoFieldService.Droid.csproj +++ b/Mobile/Droid/ContosoFieldService.Droid.csproj @@ -1,527 +1,535 @@ - - - - - - Debug - AnyCPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C} - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - ContosoFieldService.Droid - ContosoFieldService.Droid - v8.1 - True - Resources\Resource.designer.cs - Resource - Properties\AndroidManifest.xml - Resources - Assets - false - - - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - None - arm64-v8a;armeabi;armeabi-v7a;x86 - - - true - pdbonly - true - bin\Release - prompt - 4 - true - false - armeabi-v7a;x86 - - - true - full - false - bin\DebugBackend - DEBUG; - prompt - 4 - None - arm64-v8a;armeabi;armeabi-v7a;x86 - - - true - pdbonly - true - bin\ReleaseBackend - prompt - 4 - true - false - true - armeabi-v7a - - - - ..\..\packages\Microsoft.Identity.Client.1.1.4-preview0002\lib\monoandroid81\Microsoft.Identity.Client.dll - - - ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\netstandard1.4\Microsoft.IdentityModel.JsonWebTokens.dll - - - ..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\netstandard1.4\Microsoft.IdentityModel.Logging.dll - - - ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\netstandard1.4\Microsoft.IdentityModel.Tokens.dll - - - ..\..\packages\Plugin.CurrentActivity.2.1.0.4\lib\monoandroid44\Plugin.CurrentActivity.dll - - - ..\..\packages\Xam.Plugin.Media.4.0.1.1\lib\monoandroid71\Plugin.Media.dll - - - ..\..\packages\Plugin.Permissions.3.0.0.12\lib\monoandroid71\Plugin.Permissions.dll - - - - - - ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\netstandard1.4\System.IdentityModel.Tokens.Jwt.dll - - - - - ..\..\packages\Xam.Plugin.Geolocator.4.2.0\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll - - - ..\..\packages\Xam.Plugin.Geolocator.4.2.0\lib\MonoAndroid10\Plugin.Geolocator.dll - - - ..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll - - - ..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.dll - - - ..\..\packages\Xam.Plugins.Forms.ImageCircle.2.0.2\lib\MonoAndroid10\ImageCircle.Forms.Plugin.Abstractions.dll - - - ..\..\packages\Xam.Plugin.Media.3.1.3\lib\MonoAndroid10\Plugin.Media.Abstractions.dll - - - ..\..\packages\Xam.Plugin.Connectivity.3.1.1\lib\MonoAndroid10\Plugin.Connectivity.Abstractions.dll - - - ..\..\packages\Xam.Plugin.Connectivity.3.1.1\lib\MonoAndroid10\Plugin.Connectivity.dll - - - ..\..\packages\Microsoft.Azure.DocumentDB.Core.1.9.1\lib\netstandard1.6\Microsoft.Azure.DocumentDB.Core.dll - - - - - - - - - - - - ..\..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\netstandard1.3\SuperSocket.ClientEngine.dll - - - ..\..\packages\Xamarin.Android.Support.Exif.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Exif.dll - - - ..\..\packages\Xamarin.Android.CirclePageIndicator.1.0.2\lib\MonoAndroid\Com.ViewPagerIndicator.dll - - - ..\..\packages\Xamarin.Android.VerticalViewPager.1.0.1\lib\MonoAndroid\Com.Android.DeskClock.dll - - - ..\..\packages\CarouselView.FormsPlugin.5.2.0\lib\MonoAndroid\CarouselView.FormsPlugin.Abstractions.dll - - - ..\..\packages\CarouselView.FormsPlugin.5.2.0\lib\MonoAndroid\CarouselView.FormsPlugin.Android.dll - - - ..\..\packages\Corcav.Behaviors.2.3.7\lib\dotnet\Corcav.Behaviors.dll - - - ..\..\packages\FreshMvvm.2.2.4\lib\netstandard1.0\FreshIOC.dll - - - ..\..\packages\FreshMvvm.2.2.4\lib\netstandard1.0\FreshMvvm.dll - - - ..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll - - - ..\..\packages\Refractored.MvvmHelpers.1.3.0\lib\netstandard1.0\MvvmHelpers.dll - - - ..\..\packages\FormsToolkit.2.0.1\lib\MonoAndroid10\FormsToolkit.Android.dll - - - ..\..\packages\FormsToolkit.2.0.1\lib\MonoAndroid10\FormsToolkit.dll - - - ..\..\packages\Xamarin.Essentials.0.8.0-preview\lib\monoandroid81\Xamarin.Essentials.dll - - - ..\..\packages\Xamarin.GooglePlayServices.Basement.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Basement.dll - - - ..\..\packages\Xamarin.GooglePlayServices.Tasks.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.dll - - - ..\..\packages\Xamarin.GooglePlayServices.Base.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Base.dll - - - ..\..\packages\Xamarin.GooglePlayServices.Maps.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Maps.dll - - - ..\..\packages\Xamarin.Firebase.Common.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Common.dll - - - ..\..\packages\Xamarin.Firebase.AppIndexing.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.AppIndexing.dll - - - ..\..\packages\Xamarin.GooglePlayServices.AppIndexing.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.AppIndexing.dll - - - ..\..\packages\Humanizer.Core.2.4.2\lib\netstandard2.0\Humanizer.dll - - - ..\..\packages\Microsoft.AppCenter.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll - - - ..\..\packages\Microsoft.AppCenter.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.dll - - - ..\..\packages\Microsoft.AppCenter.Analytics.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll - - - ..\..\packages\Microsoft.AppCenter.Analytics.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll - - - ..\..\packages\Microsoft.AppCenter.Crashes.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll - - - ..\..\packages\Microsoft.AppCenter.Crashes.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll - - - ..\..\packages\Microsoft.AppCenter.Distribute.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Distribute.Android.Bindings.dll - - - ..\..\packages\Microsoft.AppCenter.Distribute.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Distribute.dll - - - ..\..\packages\MonkeyCache.0.1.0.10-beta\lib\monoandroid50\MonkeyCache.dll - - - ..\..\packages\MonkeyCache.FileStore.0.1.0.10-beta\lib\monoandroid50\MonkeyCache.FileStore.dll - - - ..\..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll - - - ..\..\packages\Refit.4.6.16\lib\netstandard2.0\Refit.dll - - - ..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll - - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll - - - ..\..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - - ..\..\packages\Microsoft.Net.Http.Headers.2.1.1\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll - - - ..\..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll - - - ..\..\packages\Microsoft.AspNetCore.WebUtilities.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll - - - ..\..\packages\Xamarin.Android.Support.Annotations.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Annotations.dll - - - ..\..\packages\Xamarin.Android.Arch.Core.Common.1.0.0.1\lib\MonoAndroid80\Xamarin.Android.Arch.Core.Common.dll - - - ..\..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.3.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.dll - - - ..\..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.3.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.dll - - - ..\..\packages\Xamarin.Android.Support.Compat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Core.UI.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Core.UI.dll - - - ..\..\packages\Xamarin.Android.Support.Core.Utils.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\packages\Xamarin.Android.Support.CustomTabs.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.CustomTabs.dll - - - ..\..\packages\Xamarin.Android.Support.Fragment.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Fragment.dll - - - ..\..\packages\Xamarin.Android.Support.Media.Compat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Media.Compat.dll - - - ..\..\packages\Xamarin.Android.Support.Transition.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Transition.dll - - - ..\..\packages\Xamarin.Android.Support.v4.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v4.dll - - - ..\..\packages\Xamarin.Android.Support.v7.CardView.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.CardView.dll - - - ..\..\packages\Xamarin.Android.Support.v7.Palette.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.Palette.dll - - - ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\..\packages\Xamarin.Android.Support.Vector.Drawable.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\..\packages\Xamarin.Android.Support.Design.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Design.dll - - - ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\..\packages\Xamarin.FFImageLoading.2.4.3.840\lib\MonoAndroid10\FFImageLoading.dll - - - ..\..\packages\Xamarin.FFImageLoading.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Platform.dll - - - ..\..\packages\Xamarin.FFImageLoading.Transformations.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Transformations.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - - ..\..\packages\DLToolkit.Forms.Controls.FlowListView.2.0.11\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+netstandard1.0\DLToolkit.Forms.Controls.FlowListView.dll - - - ..\..\packages\Xamarin.FFImageLoading.Forms.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Forms.dll - - - ..\..\packages\Xamarin.FFImageLoading.Forms.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Forms.Platform.dll - - - ..\..\packages\Xamarin.Firebase.Iid.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Iid.dll - - - ..\..\packages\Xamarin.Firebase.Messaging.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Messaging.dll - - - ..\..\packages\Microsoft.AppCenter.Push.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Push.Android.Bindings.dll - - - ..\..\packages\Microsoft.AppCenter.Push.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Push.dll - - - ..\..\packages\Xamarin.Forms.AppLinks.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.AppLinks.dll - - - ..\..\packages\Xamarin.Forms.Maps.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll - - - ..\..\packages\Xamarin.Forms.Maps.3.1.0.637273\lib\MonoAndroid10\Xamarin.Forms.Maps.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8D50D622-6D39-4894-B679-BB60C5D60648} - ContosoFieldService.Core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Debug + AnyCPU + {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C} + {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + ContosoFieldService.Droid + ContosoFieldService.Droid + v8.1 + True + Resources\Resource.designer.cs + Resource + Properties\AndroidManifest.xml + Resources + Assets + false + + + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + None + arm64-v8a;armeabi;armeabi-v7a;x86 + + + true + pdbonly + true + bin\Release + prompt + 4 + true + false + armeabi-v7a;x86 + true + 1024m + + + true + full + false + bin\DebugBackend + DEBUG; + prompt + 4 + None + arm64-v8a;armeabi;armeabi-v7a;x86 + + + true + pdbonly + true + bin\ReleaseBackend + prompt + 4 + true + false + true + armeabi-v7a + + + + ..\..\packages\Microsoft.Identity.Client.1.1.4-preview0002\lib\monoandroid81\Microsoft.Identity.Client.dll + + + ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\netstandard1.4\Microsoft.IdentityModel.JsonWebTokens.dll + + + ..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\netstandard1.4\Microsoft.IdentityModel.Logging.dll + + + ..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\netstandard1.4\Microsoft.IdentityModel.Tokens.dll + + + ..\..\packages\Plugin.CurrentActivity.2.1.0.4\lib\monoandroid44\Plugin.CurrentActivity.dll + False + + + + + + ..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\netstandard1.4\System.IdentityModel.Tokens.Jwt.dll + + + + + ..\..\packages\Xam.Plugin.Geolocator.4.2.0\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll + + + ..\..\packages\Xam.Plugin.Geolocator.4.2.0\lib\MonoAndroid10\Plugin.Geolocator.dll + + + ..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll + + + ..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.dll + + + ..\..\packages\Xam.Plugins.Forms.ImageCircle.2.0.2\lib\MonoAndroid10\ImageCircle.Forms.Plugin.Abstractions.dll + + + ..\..\packages\Xam.Plugin.Connectivity.3.1.1\lib\MonoAndroid10\Plugin.Connectivity.Abstractions.dll + + + ..\..\packages\Xam.Plugin.Connectivity.3.1.1\lib\MonoAndroid10\Plugin.Connectivity.dll + + + ..\..\packages\Microsoft.Azure.DocumentDB.Core.1.9.1\lib\netstandard1.6\Microsoft.Azure.DocumentDB.Core.dll + + + + + + + + + + + + ..\..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\netstandard1.3\SuperSocket.ClientEngine.dll + + + ..\..\packages\Xamarin.Android.Support.Exif.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Exif.dll + + + ..\..\packages\Xamarin.Android.CirclePageIndicator.1.0.2\lib\MonoAndroid\Com.ViewPagerIndicator.dll + + + ..\..\packages\Xamarin.Android.VerticalViewPager.1.0.1\lib\MonoAndroid\Com.Android.DeskClock.dll + + + ..\..\packages\CarouselView.FormsPlugin.5.2.0\lib\MonoAndroid\CarouselView.FormsPlugin.Abstractions.dll + + + ..\..\packages\CarouselView.FormsPlugin.5.2.0\lib\MonoAndroid\CarouselView.FormsPlugin.Android.dll + + + ..\..\packages\Corcav.Behaviors.2.3.7\lib\dotnet\Corcav.Behaviors.dll + + + ..\..\packages\FreshMvvm.2.2.4\lib\netstandard1.0\FreshIOC.dll + + + ..\..\packages\FreshMvvm.2.2.4\lib\netstandard1.0\FreshMvvm.dll + + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll + + + ..\..\packages\Refractored.MvvmHelpers.1.3.0\lib\netstandard1.0\MvvmHelpers.dll + + + ..\..\packages\FormsToolkit.2.0.1\lib\MonoAndroid10\FormsToolkit.Android.dll + + + ..\..\packages\FormsToolkit.2.0.1\lib\MonoAndroid10\FormsToolkit.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Basement.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Basement.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Tasks.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Base.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Base.dll + + + ..\..\packages\Xamarin.GooglePlayServices.Maps.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Maps.dll + + + ..\..\packages\Xamarin.Firebase.Common.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Common.dll + + + ..\..\packages\Xamarin.Firebase.AppIndexing.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.AppIndexing.dll + + + ..\..\packages\Xamarin.GooglePlayServices.AppIndexing.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.AppIndexing.dll + + + ..\..\packages\Humanizer.Core.2.4.2\lib\netstandard2.0\Humanizer.dll + + + ..\..\packages\Microsoft.AppCenter.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Android.Bindings.dll + + + ..\..\packages\Microsoft.AppCenter.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.dll + + + ..\..\packages\Microsoft.AppCenter.Analytics.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + ..\..\packages\Microsoft.AppCenter.Analytics.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll + + + ..\..\packages\Microsoft.AppCenter.Crashes.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + ..\..\packages\Microsoft.AppCenter.Crashes.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Crashes.dll + + + ..\..\packages\Microsoft.AppCenter.Distribute.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Distribute.Android.Bindings.dll + + + ..\..\packages\Microsoft.AppCenter.Distribute.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Distribute.dll + + + ..\..\packages\MonkeyCache.0.1.0.10-beta\lib\monoandroid50\MonkeyCache.dll + + + ..\..\packages\MonkeyCache.FileStore.0.1.0.10-beta\lib\monoandroid50\MonkeyCache.FileStore.dll + + + ..\..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll + + + ..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + + ..\..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + + ..\..\packages\Microsoft.Net.Http.Headers.2.1.1\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll + + + ..\..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\..\packages\Microsoft.AspNetCore.WebUtilities.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll + + + ..\..\packages\Xamarin.Android.Support.Annotations.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Annotations.dll + + + ..\..\packages\Xamarin.Android.Arch.Core.Common.1.0.0.1\lib\MonoAndroid80\Xamarin.Android.Arch.Core.Common.dll + + + ..\..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.3.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.dll + + + ..\..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.3.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + ..\..\packages\Xamarin.Android.Support.Compat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Compat.dll + + + ..\..\packages\Xamarin.Android.Support.Core.UI.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Core.UI.dll + + + ..\..\packages\Xamarin.Android.Support.Core.Utils.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Core.Utils.dll + + + ..\..\packages\Xamarin.Android.Support.CustomTabs.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.CustomTabs.dll + + + ..\..\packages\Xamarin.Android.Support.Fragment.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Fragment.dll + + + ..\..\packages\Xamarin.Android.Support.Media.Compat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Media.Compat.dll + + + ..\..\packages\Xamarin.Android.Support.Transition.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Transition.dll + + + ..\..\packages\Xamarin.Android.Support.v4.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v4.dll + + + ..\..\packages\Xamarin.Android.Support.v7.CardView.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.CardView.dll + + + ..\..\packages\Xamarin.Android.Support.v7.Palette.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.Palette.dll + + + ..\..\packages\Xamarin.Android.Support.v7.RecyclerView.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.RecyclerView.dll + + + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Animated.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.AppCompat.dll + + + ..\..\packages\Xamarin.Android.Support.Design.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Design.dll + + + ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.MediaRouter.dll + + + ..\..\packages\Xamarin.FFImageLoading.2.4.3.840\lib\MonoAndroid10\FFImageLoading.dll + + + ..\..\packages\Xamarin.FFImageLoading.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Platform.dll + + + ..\..\packages\Xamarin.FFImageLoading.Transformations.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Transformations.dll + + + ..\..\packages\DLToolkit.Forms.Controls.FlowListView.2.0.11\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+netstandard1.0\DLToolkit.Forms.Controls.FlowListView.dll + + + ..\..\packages\Xamarin.FFImageLoading.Forms.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Forms.dll + + + ..\..\packages\Xamarin.FFImageLoading.Forms.2.4.3.840\lib\MonoAndroid10\FFImageLoading.Forms.Platform.dll + + + ..\..\packages\Xamarin.Firebase.Iid.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Iid.dll + + + ..\..\packages\Xamarin.Firebase.Messaging.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Messaging.dll + + + ..\..\packages\Microsoft.AppCenter.Push.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Push.Android.Bindings.dll + + + ..\..\packages\Microsoft.AppCenter.Push.1.8.0\lib\MonoAndroid403\Microsoft.AppCenter.Push.dll + + + ..\..\packages\Refit.4.6.30\lib\netstandard2.0\Refit.dll + + + ..\..\packages\Xamarin.Essentials.0.9.1-preview\lib\monoandroid81\Xamarin.Essentials.dll + + + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\MonoAndroid10\FormsViewGroup.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + + + ..\..\packages\Xamarin.Forms.AppLinks.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.AppLinks.dll + + + ..\..\packages\Xamarin.Forms.Maps.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll + + + ..\..\packages\Xamarin.Forms.Maps.3.1.0.697729\lib\MonoAndroid10\Xamarin.Forms.Maps.dll + + + ..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll + + + ..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.dll + + + ..\..\packages\Xam.Plugin.Media.3.1.3\lib\MonoAndroid10\Plugin.Media.Abstractions.dll + + + ..\..\packages\Xam.Plugin.Media.3.1.3\lib\MonoAndroid10\Plugin.Media.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {8D50D622-6D39-4894-B679-BB60C5D60648} + ContosoFieldService.Core + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mobile/Droid/Properties/AndroidManifest.xml b/Mobile/Droid/Properties/AndroidManifest.xml index 24f9b88..9572645 100644 --- a/Mobile/Droid/Properties/AndroidManifest.xml +++ b/Mobile/Droid/Properties/AndroidManifest.xml @@ -1,41 +1,39 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mobile/Droid/packages.config b/Mobile/Droid/packages.config index 2c5e493..c1a88d9 100644 --- a/Mobile/Droid/packages.config +++ b/Mobile/Droid/packages.config @@ -1,171 +1,171 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mobile/iOS/ContosoFieldService.iOS.csproj b/Mobile/iOS/ContosoFieldService.iOS.csproj index ca958f6..a412ecf 100644 --- a/Mobile/iOS/ContosoFieldService.iOS.csproj +++ b/Mobile/iOS/ContosoFieldService.iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -116,18 +116,9 @@ ..\..\packages\Microsoft.Identity.Client.1.1.4-preview0002\lib\xamarinios10\Microsoft.Identity.Client.dll - - ..\..\packages\Xam.Plugin.Media.4.0.1.1\lib\xamarinios10\Plugin.Media.dll - - - ..\..\packages\Plugin.Permissions.3.0.0.12\lib\xamarinios10\Plugin.Permissions.dll - - - ..\..\packages\Xamarin.Essentials.0.8.0-preview\lib\xamarinios10\Xamarin.Essentials.dll - @@ -180,18 +171,6 @@ ..\..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - - ..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\..\packages\Xamarin.TestCloud.Agent.0.21.5\lib\Xamarin.iOS\Calabash.dll @@ -264,9 +243,6 @@ ..\..\packages\Polly.6.1.0\lib\netstandard2.0\Polly.dll - - ..\..\packages\Refit.4.6.16\lib\netstandard2.0\Refit.dll - ..\..\packages\SkiaSharp.1.60.2\lib\Xamarin.iOS\SkiaSharp.dll @@ -300,11 +276,41 @@ ..\..\packages\Xamarin.FFImageLoading.Forms.2.4.3.840\lib\Xamarin.iOS10\FFImageLoading.Forms.Platform.dll + + ..\..\packages\Refit.4.6.30\lib\netstandard2.0\Refit.dll + + + ..\..\packages\Xamarin.Essentials.0.9.1-preview\lib\xamarinios10\Xamarin.Essentials.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + + ..\..\packages\Xamarin.Forms.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + - ..\..\packages\Xamarin.Forms.Maps.3.1.0.637273\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll + ..\..\packages\Xamarin.Forms.Maps.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll - ..\..\packages\Xamarin.Forms.Maps.3.1.0.637273\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll + ..\..\packages\Xamarin.Forms.Maps.3.1.0.697729\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll + + + ..\..\packages\Plugin.Permissions.2.2.1\lib\Xamarin.iOS10\Plugin.Permissions.Abstractions.dll + + + ..\..\packages\Plugin.Permissions.2.2.1\lib\Xamarin.iOS10\Plugin.Permissions.dll + + + ..\..\packages\Xam.Plugin.Media.3.1.3\lib\Xamarin.iOS10\Plugin.Media.Abstractions.dll + + + ..\..\packages\Xam.Plugin.Media.3.1.3\lib\Xamarin.iOS10\Plugin.Media.dll @@ -437,7 +443,7 @@ - - + + \ No newline at end of file diff --git a/Mobile/iOS/packages.config b/Mobile/iOS/packages.config index 7a7608e..729440c 100644 --- a/Mobile/iOS/packages.config +++ b/Mobile/iOS/packages.config @@ -1,159 +1,159 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file