Skip to content

Commit

Permalink
Merge pull request #11 from sushihangover/nuget.tester.updates
Browse files Browse the repository at this point in the history
Update Nuget.Test
  • Loading branch information
sushihangover authored Dec 14, 2016
2 parents 27b4ab0 + e6b9e24 commit 220d817
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 42 deletions.
18 changes: 9 additions & 9 deletions src/Nuget.Test/Droid/Nuget.Test.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,25 @@
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<Reference Include="FormsViewGroup">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<Reference Include="RealmJson.Extensions">
<HintPath>..\..\packages\RealmJson.Extensions.1.1.0\lib\RealmJson.Extensions.dll</HintPath>
<HintPath>..\..\packages\RealmJson.Extensions.1.1.1\lib\RealmJson.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -151,5 +151,5 @@
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
<Import Project="..\..\packages\Realm.0.80.0\build\Realm.targets" Condition="Exists('..\..\packages\Realm.0.80.0\build\Realm.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.4.171-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.171-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
</Project>
4 changes: 2 additions & 2 deletions src/Nuget.Test/Droid/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid70" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid70" />
<package id="Realm" version="0.80.0" targetFramework="monoandroid70" developmentDependency="true" />
<package id="RealmJson.Extensions" version="1.1.0" targetFramework="monoandroid70" />
<package id="RealmJson.Extensions" version="1.1.1" targetFramework="monoandroid71" />
<package id="Remotion.Linq" version="2.1.1" targetFramework="monoandroid70" />
<package id="System.AppContext" version="4.1.0" targetFramework="monoandroid70" />
<package id="System.Collections" version="4.0.11" targetFramework="monoandroid70" />
Expand Down Expand Up @@ -65,5 +65,5 @@
<package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
<package id="Xamarin.Forms" version="2.3.3.166-pre4" targetFramework="monoandroid70" />
<package id="Xamarin.Forms" version="2.3.4.171-pre1" targetFramework="monoandroid71" />
</packages>
22 changes: 11 additions & 11 deletions src/Nuget.Test/Nuget.Test/Nuget.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@
<Compile Include="State.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="AutoMapper">
<HintPath>..\..\packages\AutoMapper.5.1.1\lib\portable-net45+win8+wpa81\AutoMapper.dll</HintPath>
</Reference>
Expand All @@ -57,8 +48,17 @@
<Reference Include="Realm">
<HintPath>..\..\packages\Realm.0.80.0\lib\portable-net45+sl5+wp8+wpa81+win8+monoandroid+Xamarin.iOS10+monotouch+Xamarin.Mac\Realm.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="RealmJson.Extensions">
<HintPath>..\..\packages\RealmJson.Extensions.1.1.0\lib\RealmJson.Extensions.dll</HintPath>
<HintPath>..\..\packages\RealmJson.Extensions.1.1.1\lib\RealmJson.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -72,7 +72,7 @@
<Import Project="..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
<Import Project="..\packages\Realm.0.80.0\build\Realm.targets" Condition="Exists('..\packages\Realm.0.80.0\build\Realm.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
<Import Project="..\..\packages\Realm.0.80.0\build\Realm.targets" Condition="Exists('..\..\packages\Realm.0.80.0\build\Realm.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.4.171-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.171-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
</Project>
4 changes: 2 additions & 2 deletions src/Nuget.Test/Nuget.Test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Fody" version="1.29.4" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
<package id="Realm" version="0.80.0" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
<package id="RealmJson.Extensions" version="1.1.0" targetFramework="portable45-net45+win8+wpa81" />
<package id="RealmJson.Extensions" version="1.1.1" targetFramework="portable45-net45+win8+wpa81" />
<package id="Remotion.Linq" version="2.1.1" targetFramework="portable45-net45+win8+wpa81" />
<package id="System.Collections" version="4.0.11" targetFramework="portable45-net45+win8+wpa81" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="portable45-net45+win8+wpa81" />
Expand All @@ -18,5 +18,5 @@
<package id="System.Runtime" version="4.1.0" targetFramework="portable45-net45+win8+wpa81" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="portable45-net45+win8+wpa81" />
<package id="System.Threading" version="4.0.11" targetFramework="portable45-net45+win8+wpa81" />
<package id="Xamarin.Forms" version="2.3.3.166-pre4" targetFramework="portable45-net45+win8+wpa81" />
<package id="Xamarin.Forms" version="2.3.4.171-pre1" targetFramework="portable45-net45+win8+wpa81" />
</packages>
30 changes: 15 additions & 15 deletions src/Nuget.Test/iOS/Nuget.Test.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,6 @@
<Compile Include="AppDelegate.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.166-pre4\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="DotNetCross.Memory.Unsafe">
<HintPath>..\..\packages\DotNetCross.Memory.Unsafe.0.2.2\lib\dotnet\DotNetCross.Memory.Unsafe.dll</HintPath>
</Reference>
Expand All @@ -135,10 +123,22 @@
<Reference Include="AutoMapper">
<HintPath>..\..\packages\AutoMapper.5.1.1\lib\netstandard1.3\AutoMapper.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.171-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="RealmJson.Extensions">
<HintPath>..\..\packages\RealmJson.Extensions.1.1.0\lib\RealmJson.Extensions.dll</HintPath>
<HintPath>..\..\packages\RealmJson.Extensions.1.1.1\lib\RealmJson.Extensions.dll</HintPath>
</Reference>
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nuget.Test\Nuget.Test.csproj">
Expand All @@ -151,7 +151,7 @@
<Import Project="..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
<Import Project="..\packages\Realm.0.80.0\build\Realm.targets" Condition="Exists('..\packages\Realm.0.80.0\build\Realm.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.166-pre4\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
<Import Project="..\..\packages\Realm.0.80.0\build\Realm.targets" Condition="Exists('..\..\packages\Realm.0.80.0\build\Realm.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.4.171-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.171-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
</Project>
4 changes: 2 additions & 2 deletions src/Nuget.Test/iOS/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
<package id="Realm" version="0.80.0" targetFramework="xamarinios10" developmentDependency="true" />
<package id="RealmJson.Extensions" version="1.1.0" targetFramework="xamarinios10" />
<package id="RealmJson.Extensions" version="1.1.1" targetFramework="xamarinios10" />
<package id="Remotion.Linq" version="2.1.1" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.1.0" targetFramework="xamarinios10" />
<package id="System.Collections" version="4.0.11" targetFramework="xamarinios10" />
Expand Down Expand Up @@ -57,5 +57,5 @@
<package id="System.Threading.Timer" version="4.0.1" targetFramework="xamarinios10" />
<package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="xamarinios10" />
<package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.3.166-pre4" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.4.171-pre1" targetFramework="xamarinios10" />
</packages>
4 changes: 3 additions & 1 deletion src/RealmJson.Test.iOS/UnitTestAppDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l

// register every tests included in the main application/assembly
runner.Add(System.Reflection.Assembly.GetExecutingAssembly());

#if UNITTEST
// start running the test suites as soon as the application is loaded
runner.AutoStart = true;
// crash the application (to ensure it's ended) and return to springboard
runner.TerminateAfterExecution = true;

#endif
window.RootViewController = new UINavigationController(runner.GetViewController());

// make the window visible
Expand Down

0 comments on commit 220d817

Please sign in to comment.