Skip to content

Commit

Permalink
- updated build script
Browse files Browse the repository at this point in the history
- updated nunit version
  • Loading branch information
theburningmonk committed Jan 13, 2014
1 parent 91a7c4b commit f3336c6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 15 deletions.
4 changes: 2 additions & 2 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let project = "SimpleSpeedTester"

// Short summary of the project
// (used as description in AssemblyInfo and as a short summary for NuGet package)
let summary = "SimpleSpeedTester is a simple, easy to use framework that helps you speed test your .Net code by taking care of some of the orchestration for you."
let summary = "A simple framework to help benchmark test your .Net code."

// Longer description of the project
// (used as a description for NuGet package; line breaks are automatically cleaned up)
Expand Down Expand Up @@ -63,7 +63,7 @@ let release = parseReleaseNotes (IO.File.ReadAllLines "RELEASE_NOTES.md")
// Generate assembly info files with the right version & up-to-date information
Target "AssemblyInfo" (fun _ ->
let fileName = "src/" + project + "/Properties/AssemblyInfo.cs"
CreateFSharpAssemblyInfo fileName
CreateCSharpAssemblyInfo fileName
[ Attribute.Title project
Attribute.Product project
Attribute.Description summary
Expand Down
2 changes: 1 addition & 1 deletion src/SimpleSpeedTester/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyVersion("1.1.0")]

// expose internal methods to the SimpleSpeedTester.Tests project for unit tests
[assembly: InternalsVisibleTo("SimpleSpeedTester.Tests")]
17 changes: 6 additions & 11 deletions tests/SimpleSpeedTester.Tests/SimpleSpeedTester.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.mocks">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
</Reference>
<Reference Include="pnunit.framework">
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -57,15 +52,15 @@
<Compile Include="TestActionTest.cs" />
<Compile Include="TestGroupTest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\SimpleSpeedTester\SimpleSpeedTester.csproj">
<Project>{87b76a3e-3932-47f1-924d-c80a1ae92787}</Project>
<Name>SimpleSpeedTester</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion tests/SimpleSpeedTester.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.5.10.11092" />
<package id="NUnit" version="2.6.3" targetFramework="net40" />
</packages>

0 comments on commit f3336c6

Please sign in to comment.