Browse Source

tweaked build file to remove managed references and to be a little more xbuild friendly - but there is still an issue with InternalVisibleTo

corrected the ToString Vector test

Signed-off-by: Marcus Cuda <marcus@cuda.net>
pull/2/head
Marcus Cuda 17 years ago
parent
commit
d6e1626dcc
  1. 15
      build/build.proj
  2. 5
      src/UnitTests/LinearAlgebraTests/Double/VectorTests.cs

15
build/build.proj

@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="BuildAndTestManaged" ToolsVersion="3.5">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="BuildAndTest" ToolsVersion="3.5">
<UsingTask TaskName="MSBuild.ExtensionPack.CodeQuality.StyleCop" AssemblyFile=".\MSBuild_Extension_Pack_3.5.3\StyleCop\MSBuild.ExtensionPack.StyleCop.dll" />
<UsingTask TaskName="Gallio.MSBuildTasks.Gallio" AssemblyFile="..\lib\Gallio_3.0.6.787\bin\Gallio.MSBuildTasks.dll" />
@ -7,15 +7,16 @@
<Optimize Condition="'$(Optimize)' == ''">False</Optimize>
</PropertyGroup>
<Target Name="CompileManaged">
<Target Name="Compile">
<MSBuild Projects="../src/Numerics/Numerics.csproj" Properties="Configuration=$(Config);Optimize=$(Optimize)" />
<MSBuild Projects="../src/UnitTests/UnitTests.csproj" Properties="Configuration=$(Config);Optimize=$(Optimize)" />
</Target>
<Target Name="TestManaged" DependsOnTargets="CompileManaged">
<Target Name="Test" DependsOnTargets="Compile">
<Gallio.MSBuildTasks.Gallio ContinueOnError="False" IgnoreFailures="False" Assemblies="../src/UnitTests/bin/Debug/MathNet.Numerics.UnitTests.dll" RunnerExtensions="TeamCityExtension,Gallio.TeamCityIntegration" />
</Target>
<Target Name="StyleManaged">
<Target Name="Style">
<CreateItem Include="../src/Numerics/**/*.cs">
<Output TaskParameter="Include" ItemName="StyleCopFiles" />
</CreateItem>
@ -30,16 +31,16 @@
<!--Error Text="StyleCop analysis warnings occured" Condition="'$(AllPassed)' == 'False'" /-->
</Target>
<Target Name="BuildDocs" DependsOnTargets="CompileManaged">
<Target Name="BuildDocs" DependsOnTargets="Compile">
<MSBuild Projects="./mathnet-numerics.shfbproj" />
</Target>
<Target Name="Coverage" DependsOnTargets="CompileManaged">
<Target Name="Coverage" DependsOnTargets="Compile">
<Exec Command="ncover.console.exe ..\lib\Gallio_3.0.6.787\bin\Gallio.Echo.exe ..\src\UnitTests\bin\Debug\MathNet.Numerics.UnitTests.dll //pm gallio.host.exe //eas zlib.net;MathNet.Numerics.UnitTests //et .*Resources;.*Exception //p &quot;Math.NET Numerics&quot;" />
<Exec Command="ncover.reporting.exe coverage.xml //or FullCoverageReport:Html //op NCoverReport" />
</Target>
<Target Name="BuildAndTestManaged" DependsOnTargets="TestManaged; StyleManaged">
<Target Name="BuildAndTest" DependsOnTargets="Test; Style">
<Exec Command="$(MSBuildProjectDirectory)\..\tools\Gendarme-2.4\gendarme.exe $(MSBuildProjectDirectory)\..\src\Numerics\bin\Debug\MathNet.Numerics.dll"/>
</Target>

5
src/UnitTests/LinearAlgebraTests/Double/VectorTests.cs

@ -10,6 +10,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{
using System;
using System.Collections.Generic;
using System.Globalization;
using MathNet.Numerics.LinearAlgebra.Double;
@ -49,8 +50,8 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double
{
var vector = CreateVector(_data);
var str = vector.ToString();
Assert.AreEqual("1,2,3,4,5", str);
var sep = CultureInfo.CurrentCulture.TextInfo.ListSeparator;
Assert.AreEqual(string.Format("1{0}2{0}3{0}4{0}5", sep), str);
}
/// <summary>

Loading…
Cancel
Save