Skip to content

Commit b7db211

Browse files
rolfbjarnerolfbjarne
committed
[tests] Use MonoTouch.Dialog from NuGet and Touch.Client instead of MonoTouch.NUnit.
* Touch.Client references the official NUnitLite package, which means we're using a non-forked version of NUnit. * This makes it easier for our .NET 5 effort, since we won't have to port an ancient version of NUnitLite to .NET 5 (nor will we have to keep using it in our existing code, we can use more modern NUnit patterns). * Reference MonoTouch.Dialog from the NuGet package. This also eases the .NET 5 effort, since we won't have to port MonoTouch.Dialog to .NET 5 (we'll probably still do it though at some point, but it doesn't have to be done right away), nor build it ourselves / ship it.
1 parent 7df8652 commit b7db211

File tree

16 files changed

+279
-216
lines changed

16 files changed

+279
-216
lines changed

‎tests/BundledResources/BundledResources.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1616
<DefineConstants></DefineConstants>
1717
<LangVersion>latest</LangVersion>
18+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">
2021
<DebugSymbols>True</DebugSymbols>
@@ -35,7 +36,11 @@
3536
</PropertyGroup>
3637
<ItemGroup>
3738
<Reference Include="Xamarin.iOS" />
38-
<Reference Include="MonoTouch.NUnitLite" />
39+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
40+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
41+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
42+
<Name>Touch.Client-iOS</Name>
43+
</ProjectReference>
3944
</ItemGroup>
4045
<ItemGroup>
4146
<Folder Include="Resources\" />

‎tests/EmbeddedResources/EmbeddedResources.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1818
<DefineConstants></DefineConstants>
1919
<LangVersion>latest</LangVersion>
20+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
2021
</PropertyGroup>
2122
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">
2223
<DebugSymbols>True</DebugSymbols>
@@ -37,8 +38,12 @@
3738
</PropertyGroup>
3839
<ItemGroup>
3940
<Reference Include="Xamarin.iOS" />
40-
<Reference Include="MonoTouch.NUnitLite" />
4141
<Reference Include="System.Core" />
42+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
43+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
44+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
45+
<Name>Touch.Client-iOS</Name>
46+
</ProjectReference>
4247
</ItemGroup>
4348
<ItemGroup>
4449
<Folder Include="Resources\" />

‎tests/bindings-test/iOS/bindings-test.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1818
<DefineConstants></DefineConstants>
1919
<LangVersion>latest</LangVersion>
20+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
2021
</PropertyGroup>
2122
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">
2223
<DebugSymbols>True</DebugSymbols>
@@ -41,7 +42,7 @@
4142
<Reference Include="System" />
4243
<Reference Include="System.Core" />
4344
<Reference Include="Xamarin.iOS" />
44-
<Reference Include="MonoTouch.NUnitLite" />
45+
<PackageReference Include="NUnitLite" Version="3.12.0" />
4546
</ItemGroup>
4647
<ItemGroup>
4748
<Folder Include="Resources\" />

‎tests/bindings-test2/bindings-test2.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1818
<DefineConstants></DefineConstants>
1919
<LangVersion>latest</LangVersion>
20+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
2021
</PropertyGroup>
2122
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug32' Or '$(Configuration)' == 'Debug64' Or '$(Configuration)' == 'Debug64_32' ">
2223
<DebugSymbols>True</DebugSymbols>
@@ -41,7 +42,7 @@
4142
<Reference Include="System" />
4243
<Reference Include="System.Core" />
4344
<Reference Include="Xamarin.iOS" />
44-
<Reference Include="MonoTouch.NUnitLite" />
45+
<PackageReference Include="NUnitLite" Version="3.12.0" />
4546
</ItemGroup>
4647
<ItemGroup>
4748
<Folder Include="Resources\" />

‎tests/framework-test/framework-test.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1616
<DefineConstants></DefineConstants>
1717
<LangVersion>latest</LangVersion>
18+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -145,8 +146,11 @@
145146
<Reference Include="System.Xml" />
146147
<Reference Include="System.Core" />
147148
<Reference Include="Xamarin.iOS" />
148-
<Reference Include="MonoTouch.NUnitLite" />
149-
<Reference Include="MonoTouch.Dialog-1" />
149+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
150+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
151+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
152+
<Name>Touch.Client-iOS</Name>
153+
</ProjectReference>
150154
</ItemGroup>
151155
<ItemGroup>
152156
<BundleResource Include="Resources\Default-568h%402x.png" />

‎tests/fsharp/fsharp.fsproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
1515
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1616
<DefineConstants></DefineConstants>
17+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1920
<DebugSymbols>true</DebugSymbols>
@@ -150,18 +151,20 @@
150151
<Reference Include="mscorlib" />
151152
<Reference Include="FSharp.Core" />
152153
<Reference Include="Xamarin.iOS" />
153-
<Reference Include="MonoTouch.NUnitLite" />
154154
</ItemGroup>
155155
<ItemGroup>
156156
<None Include="Info.plist">
157157
<LogicalName>Info.plist</LogicalName>
158158
</None>
159159
<None Include="Entitlements.plist" />
160-
</ItemGroup>
161-
<ItemGroup>
162160
<Compile Include="AppDelegate.fs" />
163161
<Compile Include="FSharpTests.fs" />
164162
<Compile Include="Main.fs" />
163+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
164+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
165+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
166+
<Name>Touch.Client-iOS</Name>
167+
</ProjectReference>
165168
</ItemGroup>
166169
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.FSharp.targets" />
167170
</Project>

‎tests/interdependent-binding-projects/interdependent-binding-projects.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
1515
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1616
<DefineConstants></DefineConstants>
17+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1920
<DebugSymbols>True</DebugSymbols>
@@ -129,7 +130,11 @@
129130
<Reference Include="System" />
130131
<Reference Include="System.Core" />
131132
<Reference Include="Xamarin.iOS" />
132-
<Reference Include="MonoTouch.NUnitLite" />
133+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
134+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
135+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
136+
<Name>Touch.Client-iOS</Name>
137+
</ProjectReference>
133138
</ItemGroup>
134139
<ItemGroup>
135140
<None Include="Info.plist" />

‎tests/introspection/iOS/introspection-ios.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1515
<DefineConstants></DefineConstants>
1616
<LangVersion>latest</LangVersion>
17+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1920
<DebugSymbols>True</DebugSymbols>
@@ -145,8 +146,12 @@
145146
<Reference Include="System.Core" />
146147
<Reference Include="System.Data" />
147148
<Reference Include="Xamarin.iOS" />
148-
<Reference Include="MonoTouch.NUnitLite" />
149149
<Reference Include="System.Core" />
150+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
151+
<ProjectReference Include="..\..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
152+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
153+
<Name>Touch.Client-iOS</Name>
154+
</ProjectReference>
150155
</ItemGroup>
151156
<ItemGroup>
152157
<Compile Include="Main.cs" />

‎tests/linker/ios/dont link/dont link.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
1414
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1515
<DefineConstants></DefineConstants>
16+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1819
<DebugSymbols>True</DebugSymbols>
@@ -137,7 +138,11 @@
137138
<Reference Include="System.Xml" />
138139
<Reference Include="System.Core" />
139140
<Reference Include="Xamarin.iOS" />
140-
<Reference Include="MonoTouch.NUnitLite" />
141+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
142+
<ProjectReference Include="..\..\..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
143+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
144+
<Name>Touch.Client-iOS</Name>
145+
</ProjectReference>
141146
</ItemGroup>
142147
<ItemGroup>
143148
<None Include="Info.plist">

‎tests/linker/ios/link all/link all.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1515
<DefineConstants></DefineConstants>
1616
<LangVersion>latest</LangVersion>
17+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1920
<DebugSymbols>True</DebugSymbols>
@@ -156,12 +157,16 @@
156157
<Reference Include="System" />
157158
<Reference Include="System.Core" />
158159
<Reference Include="Xamarin.iOS" />
159-
<Reference Include="MonoTouch.NUnitLite" />
160160
<Reference Include="System.Xml" />
161161
<Reference Include="System.Data" />
162162
<Reference Include="System.Runtime.Serialization" />
163163
<Reference Include="OpenTK-1.0" />
164164
<Reference Include="System.ComponentModel.Composition" />
165+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
166+
<ProjectReference Include="..\..\..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
167+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
168+
<Name>Touch.Client-iOS</Name>
169+
</ProjectReference>
165170
</ItemGroup>
166171
<ItemGroup>
167172
<None Include="Info.plist">

‎tests/linker/ios/link sdk/link sdk.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
1414
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1515
<DefineConstants></DefineConstants>
16+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1819
<DebugSymbols>True</DebugSymbols>
@@ -142,7 +143,6 @@
142143
<Reference Include="System.Xml" />
143144
<Reference Include="System.Core" />
144145
<Reference Include="Xamarin.iOS" />
145-
<Reference Include="MonoTouch.NUnitLite" />
146146
<Reference Include="Mono.Data.Sqlite" />
147147
<Reference Include="Mono.Security" />
148148
<Reference Include="System.Runtime.Serialization" />
@@ -156,6 +156,11 @@
156156
<Reference Include="System.Data" />
157157
<Reference Include="System.ServiceModel.Web" />
158158
<Reference Include="System.Net.Http" />
159+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
160+
<ProjectReference Include="..\..\..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
161+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
162+
<Name>Touch.Client-iOS</Name>
163+
</ProjectReference>
159164
</ItemGroup>
160165
<ItemGroup>
161166
<None Include="Info.plist">

‎tests/mono-native/iOS/mono-native.csproj.template

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<NoWarn>168,169,219,414,612,618,649,672</NoWarn>
1515
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
1616
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
17+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1718
</PropertyGroup>
1819
<PropertyGroup>
1920
<MonoNativeMode Condition="'$(TargetFrameworkIdentifier)|$(Configuration)|$(Platform)' == 'Xamarin.iOS|Debug|iPhoneSimulator'">MONO_NATIVE_SYMLINK</MonoNativeMode>
@@ -162,7 +163,10 @@
162163
<Reference Include="System.Xml" />
163164
<Reference Include="System.Core" />
164165
<Reference Include="Xamarin.iOS" />
165-
<Reference Include="MonoTouch.NUnitLite" />
166+
<ProjectReference Include="..\..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
167+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
168+
<Name>Touch.Client-iOS</Name>
169+
</ProjectReference>
166170
</ItemGroup>
167171
<ItemGroup>
168172
<Folder Include="Resources\" />

‎tests/monotouch-test/monotouch-test.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)-unified</IntermediateOutputPath>
1717
<DefineConstants></DefineConstants>
1818
<LangVersion>latest</LangVersion>
19+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
2122
<DebugSymbols>True</DebugSymbols>
@@ -154,10 +155,14 @@
154155
<Reference Include="System.Xml" />
155156
<Reference Include="System.Core" />
156157
<Reference Include="Xamarin.iOS" />
157-
<Reference Include="MonoTouch.NUnitLite" />
158158
<Reference Include="System.Net.Http" />
159159
<Reference Include="OpenTK-1.0" />
160160
<Reference Include="System.Net" />
161+
<PackageReference Include="MonoTouch.Dialog" Version="2.0.0-pre1" />
162+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
163+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
164+
<Name>Touch.Client-iOS</Name>
165+
</ProjectReference>
161166
</ItemGroup>
162167
<ItemGroup>
163168
<None Include="Info.plist">

‎tests/templates/iOSApp/iOSApp.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<MtouchProfiling>%MTOUCH_PROFILING%</MtouchProfiling>
2020
<MtouchUseLlvm>%MTOUCH_USELLVM%</MtouchUseLlvm>
2121
<MtouchEnableBitcode>%MTOUCH_ENABLEBITCODE%</MtouchEnableBitcode>
22+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
2223
</PropertyGroup>
2324
<PropertyGroup Condition=" '$(Platform)' == 'iPhoneSimulator' ">
2425
<MtouchArch>%SIMULATOR_ARCH%</MtouchArch>
@@ -31,7 +32,10 @@
3132
<Reference Include="System" />
3233
<Reference Include="System.Xml" />
3334
<Reference Include="System.Core" />
34-
<Reference Include="MonoTouch.NUnitLite" />
35+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\iOS\Touch.Client-iOS.csproj">
36+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
37+
<Name>Touch.Client-iOS</Name>
38+
</ProjectReference>
3539
</ItemGroup>
3640
<ItemGroup>
3741
<None Include="Info.plist">

‎tests/templates/tvOSApp/tvOSApp.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<MtouchProfiling>%MTOUCH_PROFILING%</MtouchProfiling>
2020
<MtouchUseLlvm>%MTOUCH_USELLVM%</MtouchUseLlvm>
2121
<MtouchEnableBitcode>%MTOUCH_ENABLEBITCODE%</MtouchEnableBitcode>
22+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
2223
</PropertyGroup>
2324
<PropertyGroup Condition=" '$(Platform)' == 'iPhoneSimulator' ">
2425
<MtouchArch>%SIMULATOR_ARCH%</MtouchArch>
@@ -31,7 +32,10 @@
3132
<Reference Include="System" />
3233
<Reference Include="System.Xml" />
3334
<Reference Include="System.Core" />
34-
<Reference Include="MonoTouch.NUnitLite" />
35+
<ProjectReference Include="..\..\external\Touch.Unit\Touch.Client\tvOS\Touch.Client-tvOS.csproj">
36+
<Project>{F611ED96-54B5-4975-99BB-12F50AF95936}</Project>
37+
<Name>Touch.Client-tvOS</Name>
38+
</ProjectReference>
3539
</ItemGroup>
3640
<ItemGroup>
3741
<None Include="Info.plist">

0 commit comments

Comments
 (0)