Skip to content

Commit 94bdd7d

Browse files
joelmartinezjoelmartinez
committed
Updating to the latest 3x NUnit.
Relating to #308. Closes #284
1 parent 82ef0d0 commit 94bdd7d

File tree

6 files changed

+37
-20
lines changed

6 files changed

+37
-20
lines changed

‎mdoc/mdoc.Test/CppCxFormatterMembersTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void NoSupport_DefaultParameters()
133133
TestMethodSignature(CSharpTestLib, "Mono.DocTest.Widget", "Default", null);
134134
}
135135

136-
[TestFixtureTearDown]
136+
[TearDown]
137137
public void TearDown()
138138
{
139139
moduleCash.Clear();

‎mdoc/mdoc.Test/CppCxFormatterTypesTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void NoSupport_Exception_ArgumentNullExceptionField()
187187

188188
#endregion
189189

190-
[TestFixtureTearDown]
190+
[TearDown]
191191
public void TearDown()
192192
{
193193
moduleCash.Clear();

‎mdoc/mdoc.Test/mdoc.Test.csproj

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
67
<ProjectGuid>{5ADDEFB6-930C-46BC-8B2B-FDE5C7E3B5AD}</ProjectGuid>
78
<OutputType>Library</OutputType>
89
<RootNamespace>mdoc.Test</RootNamespace>
910
<AssemblyName>mdoc.Test</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
12+
<TargetFrameworkProfile />
13+
<NuGetPackageImportStamp>
14+
</NuGetPackageImportStamp>
1115
</PropertyGroup>
1216
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1317
<DebugSymbols>true</DebugSymbols>
@@ -36,10 +40,10 @@
3640
<SpecificVersion>False</SpecificVersion>
3741
<HintPath>..\..\external\Test\mdoc.Test.Cplusplus.dll</HintPath>
3842
</Reference>
39-
<Reference Include="System" />
40-
<Reference Include="nunit.framework">
41-
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
43+
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
4245
</Reference>
46+
<Reference Include="System" />
4347
<Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
4448
<HintPath>..\..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.dll</HintPath>
4549
</Reference>
@@ -118,14 +122,14 @@
118122
</None>
119123
</ItemGroup>
120124
<ItemGroup>
121-
<ProjectReference Include="..\mdoc.csproj">
122-
<Project>{7DA7CD97-614F-4BCD-A2FA-B379590CEA48}</Project>
123-
<Name>mdoc</Name>
124-
</ProjectReference>
125125
<ProjectReference Include="..\..\monodoc\monodoc.csproj">
126126
<Project>{6E644802-B579-4037-9809-9CF4C7172C9D}</Project>
127127
<Name>monodoc</Name>
128128
</ProjectReference>
129+
<ProjectReference Include="..\mdoc.csproj">
130+
<Project>{7da7cd97-614f-4bcd-a2fa-b379590cea48}</Project>
131+
<Name>mdoc</Name>
132+
</ProjectReference>
129133
<ProjectReference Include="mdoc.Test.FSharp\mdoc.Test.FSharp.fsproj">
130134
<Project>{979f9f80-12fe-4236-9e93-6d554ab13701}</Project>
131135
<Name>mdoc.Test.FSharp</Name>
@@ -141,8 +145,12 @@
141145
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
142146
</Content>
143147
</ItemGroup>
144-
<ItemGroup>
145-
<Folder Include="Enumeration\" />
146-
</ItemGroup>
148+
<ItemGroup />
147149
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
150+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
151+
<PropertyGroup>
152+
<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>
153+
</PropertyGroup>
154+
<Error Condition="!Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.10.1\build\NUnit.props'))" />
155+
</Target>
148156
</Project>

‎mdoc/mdoc.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="FSharp.Core" version="4.3.4" targetFramework="net461" />
44
<package id="Mono.Cecil" version="0.10.0-beta5" targetFramework="net45" />
5-
<package id="NUnit" version="2.6.4" targetFramework="net461" />
5+
<package id="NUnit" version="3.10.1" targetFramework="net471" />
66
</packages>

‎monodoc/Test/Monodoc.Test.csproj

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,6 +11,8 @@
1011
<RootNamespace>Monodoc.Test</RootNamespace>
1112
<AssemblyName>Monodoc.Test</AssemblyName>
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
1316
</PropertyGroup>
1417
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1518
<DebugSymbols>true</DebugSymbols>
@@ -27,8 +30,8 @@
2730
<WarningLevel>4</WarningLevel>
2831
</PropertyGroup>
2932
<ItemGroup>
30-
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
31-
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
33+
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
34+
<HintPath>..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
3235
</Reference>
3336
<Reference Include="System" />
3437
<Reference Include="System.Xml" />
@@ -43,9 +46,6 @@
4346
<Compile Include="Monodoc.Ecma\EcmaUrlTests.cs" />
4447
<Compile Include="Monodoc.Generators\RawGeneratorTests.cs" />
4548
</ItemGroup>
46-
<ItemGroup>
47-
<None Include="packages.config" />
48-
</ItemGroup>
4949
<ItemGroup>
5050
<ProjectReference Include="..\monodoc.csproj">
5151
<Project>{6e644802-b579-4037-9809-9cf4c7172c9d}</Project>
@@ -55,5 +55,14 @@
5555
<ItemGroup>
5656
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
5757
</ItemGroup>
58+
<ItemGroup>
59+
<None Include="packages.config" />
60+
</ItemGroup>
5861
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
62+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
63+
<PropertyGroup>
64+
<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>
65+
</PropertyGroup>
66+
<Error Condition="!Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.10.1\build\NUnit.props'))" />
67+
</Target>
5968
</Project>

‎monodoc/Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.6.1" targetFramework="net45" />
3+
<package id="NUnit" version="3.10.1" targetFramework="net45" />
44
</packages>

0 commit comments

Comments
 (0)