Skip to content

Commit

Permalink
Merge pull request #17 from Aaronontheweb/lock-nbench
Browse files Browse the repository at this point in the history
upgraded NBench to v0.1.6 and locked the version
  • Loading branch information
Aaronontheweb committed Apr 5, 2016
2 parents 7296271 + cebc9ec commit b3fa9d6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if not exist src\packages\SourceLink.Fake\tools\SourceLink.fsx (
)
rem cls

tools\nuget\NuGet.exe install NBench.Runner -OutputDirectory src\packages -ExcludeVersion
tools\nuget\NuGet.exe install NBench.Runner -OutputDirectory src\packages -ExcludeVersion -Version 0.1.6

set encoding=utf-8
src\packages\FAKE\tools\FAKE.exe build.fsx %*
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mono $SCRIPT_PATH/tools/nuget/NuGet.exe install NBench.Runner -OutputDirectory $


if ! [ -e $SCRIPT_PATH/src/packages/SourceLink.Fake/tools/SourceLink.fsx ] ; then
mono $SCRIPT_PATH/tools/nuget/NuGet.exe install SourceLink.Fake -OutputDirectory $SCRIPT_PATH/src/packages -ExcludeVersion
mono $SCRIPT_PATH/tools/nuget/NuGet.exe install SourceLink.Fake -OutputDirectory $SCRIPT_PATH/src/packages -ExcludeVersion -Version 0.1.6

fi

Expand Down
5 changes: 1 addition & 4 deletions src/Helios.DedicatedThreadPool.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Helios.DedicatedThreadPool", "core\Helios.DedicatedThreadPool\Helios.DedicatedThreadPool.csproj", "{6C8F359E-E479-44D5-8FA0-02BFD38C3860}"
EndProject
Expand All @@ -26,9 +26,6 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Helios.DedicatedThreadPool.Tests.Performance", "tests\Helios.DedicatedThreadPool.Tests.Performance\Helios.DedicatedThreadPool.Tests.Performance.csproj", "{428DF580-1734-4AB6-B80E-F5ABABCE61D6}"
EndProject
Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="NBench, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\NBench.0.1.0\lib\net45\NBench.dll</HintPath>
<Reference Include="NBench, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\NBench.0.1.6\lib\net45\NBench.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NBench" version="0.1.0" targetFramework="net45" />
<package id="NBench" version="0.1.6" targetFramework="net45" />
</packages>

0 comments on commit b3fa9d6

Please sign in to comment.