commit/linqbridge: azizatif: Using NUnit over NuGet package instead of a private copy
commits...@bitbucket.org
https://bitbucket.org/raboof/linqbridge/commits/6bee3790c024/
Changeset: 6bee3790c024
User: azizatif
Date: 2015-05-29 10:35:05+00:00
Summary: Using NUnit over NuGet package instead of a private copy
Affected #: 11 files
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 .hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -9,3 +9,4 @@
_ReSharper.*
*.orig
dist/**
+packages/**
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 .hgsub
--- a/.hgsub
+++ /dev/null
@@ -1,1 +0,0 @@
-tools = http://tools.linqbridge.googlecode.com/hg
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 .hgsubstate
--- a/.hgsubstate
+++ /dev/null
@@ -1,1 +0,0 @@
-6f690f40198e4e7f1bb34d3aa80d9b60411f6eb3 tools
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 build.cmd
--- a/build.cmd
+++ b/build.cmd
@@ -24,8 +24,18 @@
REM OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
REM
REM -------------------------------------------------------------------------
-REM
-for %%i in (Debug Release) do (
- "%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild" /p:Configuration=%%i "%~dp0LINQBridge.sln" %*
-)
+pushd "%~dp0"
+call :main %*
+popd
+goto:EOF
+
+:main
+setlocal
+nuget restore && call :build Debug %* && call :build Release %*
+goto :EOF
+
+:build
+setlocal
+"%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild" "/p:Configuration=%~1" "%~dp0LINQBridge.sln" %2 %3 %4 %5 %6 %7 %8 %9
+goto :EOF
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQ.Tests/LINQ.Tests.csproj
--- a/test/LINQ.Tests/LINQ.Tests.csproj
+++ b/test/LINQ.Tests/LINQ.Tests.csproj
@@ -24,9 +24,9 @@
<NoWarn>1685</NoWarn></PropertyGroup><ItemGroup>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\tools\NUnit\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+ <Private>True</Private></Reference><Reference Include="System" /><Reference Include="System.Core">
@@ -47,6 +47,9 @@
<ItemGroup><Folder Include="Properties\" /></ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup><Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQ.Tests/packages.config
--- /dev/null
+++ b/test/LINQ.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NUnit" version="2.6.4" targetFramework="net35" />
+</packages>
\ No newline at end of file
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQBridge.Tests/EnumerableFixture.cs
--- a/test/LINQBridge.Tests/EnumerableFixture.cs
+++ b/test/LINQBridge.Tests/EnumerableFixture.cs
@@ -37,7 +37,6 @@
using System.Reflection;
using NUnit.Framework;
using System.Linq;
- using NUnit.Framework.SyntaxHelpers;
using System.Diagnostics;
using ExtensionAttribute = System.Runtime.CompilerServices.ExtensionAttribute;
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQBridge.Tests/LINQBridge.Tests.csproj
--- a/test/LINQBridge.Tests/LINQBridge.Tests.csproj
+++ b/test/LINQBridge.Tests/LINQBridge.Tests.csproj
@@ -26,9 +26,9 @@
<NoWarn>1685</NoWarn></PropertyGroup><ItemGroup>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\tools\NUnit\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+ <Private>True</Private></Reference><Reference Include="System" /></ItemGroup>
@@ -46,6 +46,9 @@
<ItemGroup><Folder Include="Properties\" /></ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup><Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQBridge.Tests/Reader.cs
--- a/test/LINQBridge.Tests/Reader.cs
+++ b/test/LINQBridge.Tests/Reader.cs
@@ -36,7 +36,6 @@
using System.Diagnostics;
using NUnit.Framework;
using NUnit.Framework.Constraints;
- using NUnit.Framework.SyntaxHelpers;
#endregion
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQBridge.Tests/Tester.cs
--- a/test/LINQBridge.Tests/Tester.cs
+++ b/test/LINQBridge.Tests/Tester.cs
@@ -33,7 +33,6 @@
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.Constraints;
- using NUnit.Framework.SyntaxHelpers;
#endregion
diff -r 379bad0ef3bd655abc7e7dc1c4c7a1e9a2f5407e -r 6bee3790c02432c752071eff78373df623194319 test/LINQBridge.Tests/packages.config
--- /dev/null
+++ b/test/LINQBridge.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NUnit" version="2.6.4" targetFramework="net20" />
+</packages>
\ No newline at end of file
Repository URL: https://bitbucket.org/raboof/linqbridge/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.