From 1a3cb8b623fdfb72598d5f34d16cc1b422c3e2ca Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 30 May 2017 12:01:05 -0400 Subject: [PATCH] Revert "update ioc" This reverts commit 9ae734672b585388f8a61243aaf43be08ed425ca. --- src/Android/Android.csproj | 15 +++++++++------ src/Android/packages.config | 6 +++--- src/App/App.csproj | 10 ++++++---- src/App/packages.config | 4 ++-- src/iOS.Core/iOS.Core.csproj | 13 ++++--------- src/iOS.Core/packages.config | 4 +--- src/iOS.Extension/iOS.Extension.csproj | 14 +++++++------- src/iOS.Extension/packages.config | 6 +++--- src/iOS/iOS.csproj | 14 +++++++------- src/iOS/packages.config | 6 +++--- 10 files changed, 45 insertions(+), 47 deletions(-) diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index 6aae9c9b1..9ac8a9e81 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -114,8 +114,9 @@ ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll True - - ..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll + + ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll + True @@ -286,11 +287,13 @@ ..\..\packages\Xamarin.GooglePlayServices.Measurement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Measurement.dll True - - ..\..\packages\XLabs.IoC.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.dll + + ..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll + True - - ..\..\packages\XLabs.IoC.Unity.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.Unity.dll + + ..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll + True diff --git a/src/Android/packages.config b/src/Android/packages.config index ba7d865ad..d69ce9eca 100644 --- a/src/Android/packages.config +++ b/src/Android/packages.config @@ -23,7 +23,7 @@ - + @@ -44,6 +44,6 @@ - - + + \ No newline at end of file diff --git a/src/App/App.csproj b/src/App/App.csproj index 0ffd720ed..2cb81d816 100644 --- a/src/App/App.csproj +++ b/src/App/App.csproj @@ -367,8 +367,9 @@ ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll True - - ..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll + + ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll + True ..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v6.0\Mono.Android.dll @@ -466,8 +467,9 @@ ..\..\packages\Xamarin.Forms.2.3.4.231\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll - - ..\..\packages\XLabs.IoC.2.3.0-pre05\lib\portable-net45+win8+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.IOC.dll + + ..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\XLabs.Ioc.dll + True diff --git a/src/App/packages.config b/src/App/packages.config index 1d2c64eec..4745100e0 100644 --- a/src/App/packages.config +++ b/src/App/packages.config @@ -16,7 +16,7 @@ - + @@ -24,5 +24,5 @@ - + \ No newline at end of file diff --git a/src/iOS.Core/iOS.Core.csproj b/src/iOS.Core/iOS.Core.csproj index e690142d9..c0565521d 100644 --- a/src/iOS.Core/iOS.Core.csproj +++ b/src/iOS.Core/iOS.Core.csproj @@ -43,12 +43,6 @@ ..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll - - ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - ..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll - ..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True @@ -90,10 +84,11 @@ - - - ..\..\packages\XLabs.IoC.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.dll + + ..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll + True + diff --git a/src/iOS.Core/packages.config b/src/iOS.Core/packages.config index 104ab04cc..945116040 100644 --- a/src/iOS.Core/packages.config +++ b/src/iOS.Core/packages.config @@ -1,6 +1,5 @@  - @@ -9,9 +8,8 @@ - - + \ No newline at end of file diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj index 398441940..e9591ac52 100644 --- a/src/iOS.Extension/iOS.Extension.csproj +++ b/src/iOS.Extension/iOS.Extension.csproj @@ -277,9 +277,6 @@ ..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll - - ..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll - ..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True @@ -362,11 +359,14 @@ ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - ..\..\packages\XLabs.IoC.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.dll + + ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll - - ..\..\packages\XLabs.IoC.Unity.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.Unity.dll + + ..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll + + + ..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll diff --git a/src/iOS.Extension/packages.config b/src/iOS.Extension/packages.config index 4c452ad6b..124991dbd 100644 --- a/src/iOS.Extension/packages.config +++ b/src/iOS.Extension/packages.config @@ -16,12 +16,12 @@ - + - - + + \ No newline at end of file diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj index fc4278018..500cae639 100644 --- a/src/iOS/iOS.csproj +++ b/src/iOS/iOS.csproj @@ -291,9 +291,6 @@ ..\..\packages\HockeySDK.Xamarin.4.1.2\lib\Xamarin.iOS10\HockeySDK.iOSBindings.dll - - ..\..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll - ..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll True @@ -399,14 +396,17 @@ ..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll + + ..\..\packages\Unity.3.5.1405-prerelease\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll + ..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll - - ..\..\packages\XLabs.IoC.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.dll + + ..\..\packages\XLabs.IoC.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.dll - - ..\..\packages\XLabs.IoC.Unity.2.3.0-pre05\lib\netstandard1.0\XLabs.IOC.Unity.dll + + ..\..\packages\XLabs.IoC.Unity.2.0.5782\lib\portable-net45+netcore45+wp8+MonoAndroid1+MonoTouch1\XLabs.Ioc.Unity.dll diff --git a/src/iOS/packages.config b/src/iOS/packages.config index 0d17acbe8..53ff141b0 100644 --- a/src/iOS/packages.config +++ b/src/iOS/packages.config @@ -19,7 +19,7 @@ - + @@ -30,6 +30,6 @@ - - + + \ No newline at end of file