Skip to content

Commit fd48d18

Browse files
David BritchDavid Britch
David Britch
authored and
David Britch
committed
Update iOS unit test runner to use stable xUnit packages, and fixed the project.
1 parent 23c0103 commit fd48d18

3 files changed

Lines changed: 19 additions & 88 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/AppDelegate.cs.txt‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

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

100755100644
Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<WarningLevel>4</WarningLevel>
2323
<ConsolePause>false</ConsolePause>
2424
<MtouchArch>x86_64</MtouchArch>
25-
<MtouchLink>SdkOnly</MtouchLink>
25+
<MtouchLink>None</MtouchLink>
2626
<MtouchDebug>True</MtouchDebug>
27-
<MtouchSdkVersion>10.1</MtouchSdkVersion>
27+
<MtouchSdkVersion>10.2</MtouchSdkVersion>
2828
<MtouchProfiling>False</MtouchProfiling>
2929
<MtouchFastDev>False</MtouchFastDev>
3030
<MtouchUseLlvm>False</MtouchUseLlvm>
@@ -60,6 +60,8 @@
6060
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
6161
<CodesignKey>iPhone Developer</CodesignKey>
6262
<MtouchDebug>true</MtouchDebug>
63+
<MtouchSdkVersion>10.2</MtouchSdkVersion>
64+
<MtouchLink>None</MtouchLink>
6365
</PropertyGroup>
6466
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
6567
<DebugType>none</DebugType>
@@ -123,39 +125,23 @@
123125
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
124126
</Reference>
125127
<Reference Include="Xamarin.iOS" />
126-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
127-
<HintPath>..\..\..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath>
128-
<Private>True</Private>
128+
<Reference Include="xunit.abstractions">
129+
<HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
129130
</Reference>
130-
<Reference Include="xunit.assert, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
131-
<HintPath>..\..\..\..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll</HintPath>
132-
<Private>True</Private>
131+
<Reference Include="xunit.core">
132+
<HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
133133
</Reference>
134-
<Reference Include="xunit.core, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
135-
<HintPath>..\..\..\..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.core.dll</HintPath>
136-
<Private>True</Private>
134+
<Reference Include="xunit.execution.dotnet">
135+
<HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\xamarinios\xunit.execution.dotnet.dll</HintPath>
137136
</Reference>
138-
<Reference Include="xunit.execution.dotnet, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
139-
<HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.execution.dotnet.dll</HintPath>
140-
<Private>True</Private>
137+
<Reference Include="xunit.runner.utility.dotnet">
138+
<HintPath>..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll</HintPath>
141139
</Reference>
142-
<Reference Include="xunit.runner.devices, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
140+
<Reference Include="xunit.runner.devices">
143141
<HintPath>..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath>
144-
<Private>True</Private>
145-
</Reference>
146-
<Reference Include="xunit.runner.utility.dotnet, Version=2.2.0.3444, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
147-
<HintPath>..\..\..\..\packages\xunit.runner.utility.2.2.0-beta4-build3444\lib\netstandard1.1\xunit.runner.utility.dotnet.dll</HintPath>
148-
<Private>True</Private>
149-
</Reference>
150-
<Reference Include="Plugin.Settings.Abstractions">
151-
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
152-
</Reference>
153-
<Reference Include="Plugin.Settings">
154-
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
155142
</Reference>
156143
</ItemGroup>
157144
<ItemGroup>
158-
<Content Include="AppDelegate.cs.txt" />
159145
<Content Include="Entitlements.plist" />
160146
</ItemGroup>
161147
<ItemGroup>
@@ -169,9 +155,8 @@
169155
<PropertyGroup>
170156
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
171157
</PropertyGroup>
172-
<Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets'))" />
173158
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
174159
</Target>
175-
<Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
176160
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
161+
<Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
177162
</Project>

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

100755100644
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
43
<package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
5-
<package id="xunit" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
6-
<package id="xunit.abstractions" version="2.0.1" targetFramework="xamarinios10" />
7-
<package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
8-
<package id="xunit.core" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
9-
<package id="xunit.extensibility.core" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
10-
<package id="xunit.extensibility.execution" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
4+
<package id="xunit.abstractions" version="2.0.0" targetFramework="xamarinios10" />
5+
<package id="xunit.core" version="2.1.0" targetFramework="xamarinios10" />
6+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="xamarinios10" />
7+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="xamarinios10" />
118
<package id="xunit.runner.devices" version="2.1.0" targetFramework="xamarinios10" />
12-
<package id="xunit.runner.utility" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
9+
<package id="xunit.runner.utility" version="2.1.0" targetFramework="xamarinios10" />
1310
</packages>

0 commit comments

Comments
 (0)