Skip to content

Commit 3cb13e6

Browse files
author
azizatif
committed
Using NUnit over NuGet package instead of a private copy
1 parent 627e61d commit 3cb13e6

File tree

11 files changed

+35
-15
lines changed

11 files changed

+35
-15
lines changed

.hgignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ obj/**
99
_ReSharper.*
1010
*.orig
1111
dist/**
12+
packages/**

.hgsub

Lines changed: 0 additions & 1 deletion
This file was deleted.

.hgsubstate

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.cmd

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,18 @@ REM (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2424
REM OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
REM
2626
REM -------------------------------------------------------------------------
27-
REM
2827

29-
for %%i in (Debug Release) do (
30-
"%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild" /p:Configuration=%%i "%~dp0LINQBridge.sln" %*
31-
)
28+
pushd "%~dp0"
29+
call :main %*
30+
popd
31+
goto:EOF
32+
33+
:main
34+
setlocal
35+
nuget restore && call :build Debug %* && call :build Release %*
36+
goto :EOF
37+
38+
:build
39+
setlocal
40+
"%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild" "/p:Configuration=%~1" "%~dp0LINQBridge.sln" %2 %3 %4 %5 %6 %7 %8 %9
41+
goto :EOF

test/LINQ.Tests/LINQ.Tests.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<NoWarn>1685</NoWarn>
2525
</PropertyGroup>
2626
<ItemGroup>
27-
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
28-
<SpecificVersion>False</SpecificVersion>
29-
<HintPath>..\..\tools\NUnit\nunit.framework.dll</HintPath>
27+
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
28+
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
29+
<Private>True</Private>
3030
</Reference>
3131
<Reference Include="System" />
3232
<Reference Include="System.Core">
@@ -47,6 +47,9 @@
4747
<ItemGroup>
4848
<Folder Include="Properties\" />
4949
</ItemGroup>
50+
<ItemGroup>
51+
<None Include="packages.config" />
52+
</ItemGroup>
5053
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5154
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5255
Other similar extension points exist, see Microsoft.Common.targets.

test/LINQ.Tests/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="2.6.4" targetFramework="net35" />
4+
</packages>

test/LINQBridge.Tests/EnumerableFixture.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ namespace LinqBridge.Tests
3737
using System.Reflection;
3838
using NUnit.Framework;
3939
using System.Linq;
40-
using NUnit.Framework.SyntaxHelpers;
4140
using System.Diagnostics;
4241
using ExtensionAttribute = System.Runtime.CompilerServices.ExtensionAttribute;
4342

test/LINQBridge.Tests/LINQBridge.Tests.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<NoWarn>1685</NoWarn>
2727
</PropertyGroup>
2828
<ItemGroup>
29-
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
30-
<SpecificVersion>False</SpecificVersion>
31-
<HintPath>..\..\tools\NUnit\nunit.framework.dll</HintPath>
29+
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
30+
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
31+
<Private>True</Private>
3232
</Reference>
3333
<Reference Include="System" />
3434
</ItemGroup>
@@ -46,6 +46,9 @@
4646
<ItemGroup>
4747
<Folder Include="Properties\" />
4848
</ItemGroup>
49+
<ItemGroup>
50+
<None Include="packages.config" />
51+
</ItemGroup>
4952
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5053
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5154
Other similar extension points exist, see Microsoft.Common.targets.

test/LINQBridge.Tests/Reader.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ namespace LinqBridge.Tests
3636
using System.Diagnostics;
3737
using NUnit.Framework;
3838
using NUnit.Framework.Constraints;
39-
using NUnit.Framework.SyntaxHelpers;
4039

4140
#endregion
4241

test/LINQBridge.Tests/Tester.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ namespace LinqBridge.Tests
3333
using System.Collections.Generic;
3434
using NUnit.Framework;
3535
using NUnit.Framework.Constraints;
36-
using NUnit.Framework.SyntaxHelpers;
3736

3837
#endregion
3938

0 commit comments

Comments
 (0)