diff options
author | csharptest <roger@csharptest.net> | 2011-10-04 13:43:26 -0500 |
---|---|---|
committer | rogerk <devnull@localhost> | 2011-10-04 13:43:26 -0500 |
commit | eac64a5f7afdfca32476534fd8d0bf69d77002ca (patch) | |
tree | 03a38e9992afd1ffb929f3f830d6054009a9cba2 /build | |
parent | 5e48fef659b571db38be18afb61bea0cffcdfdca (diff) | |
download | protobuf-eac64a5f7afdfca32476534fd8d0bf69d77002ca.tar.gz protobuf-eac64a5f7afdfca32476534fd8d0bf69d77002ca.tar.bz2 protobuf-eac64a5f7afdfca32476534fd8d0bf69d77002ca.zip |
- Upgraded NUnit
- Added StatLight and Silverlight unit testing
- Added copies of all projects for Silverlight
- Integrated Silverlight unit tests in build
Diffstat (limited to 'build')
-rw-r--r-- | build/Common.targets | 12 | ||||
-rw-r--r-- | build/build.csproj | 11 |
2 files changed, 16 insertions, 7 deletions
diff --git a/build/Common.targets b/build/Common.targets index 4e429999..057ab456 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -66,7 +66,7 @@ Targets For GenerateSource *********************************************************************************************** --> <Target Name="_BuildProtoGen"> - <MSBuild Targets="Build" ToolsVersion="3.5" + <MSBuild Targets="Rebuild" ToolsVersion="3.5" Projects="$(ProjectDirectory)\src\ProtocolBuffers\ProtocolBuffers.csproj;$(ProjectDirectory)\src\ProtoGen\ProtoGen.csproj" Properties="Step=_BuildProtoGen;Configuration=Release;Platform=AnyCPU;TargetFrameworkVersion=v2.0;DebugType=none;DocumentationFile=;TreatWarningsAsErrors=true;OutputPath=$(BuildOutputDirectory)\ProtoGen;" /> </Target> @@ -93,13 +93,18 @@ Targets For GenerateSource Targets For Test *********************************************************************************************** --> - <Target Name="_Test" Condition="$(BuildConfiguration)=='Debug' or $(BuildConfiguration)=='Release'"> + <Target Name="_Test"> <CallTarget Targets="_RunTests" /> </Target> <Target Name="_RunTests"> + <!-- NUnit --> <Copy SourceFiles="$(NUnitExeConfig)" DestinationFiles="$(NUnitExePath).config" /> - <Exec Command=""$(NUnitExePath)" /nologo /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\%(TestContainer.Filename).$(BuildConfiguration).xml" /> + <Exec Condition="$(BuildConfiguration)=='Debug' or $(BuildConfiguration)=='Release'" + Command=""$(NUnitExePath)" /nologo /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\%(TestContainer.Filename).xml" /> + <!-- StatLight --> + <Exec Condition="$(BuildConfiguration)=='Debug_Silverlight' or $(BuildConfiguration)=='Release_Silverlight'" + Command=""$(StatLightExePath)" -x %(StatLightTestContainer.Identity) --ReportOutputFileType=NUnit --ReportOutputFile=$(BuildTempDirectory)\%(StatLightTestContainer.Filename).xml" /> </Target> <!-- ********************************************************************************************** @@ -121,7 +126,6 @@ Targets For Package <Exec Command=""$(ZipExePath)" a -tzip ..\$(PackageName).zip * -r" WorkingDirectory="$(BuildOutputPackage)" /> </Target> - <!-- ********************************************************************************************** Targets For Benchmark *********************************************************************************************** --> diff --git a/build/build.csproj b/build/build.csproj index bbc4392a..6b8a0c22 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -41,8 +41,9 @@ <ProtocExePath>$(LibDirectory)\protoc.exe</ProtocExePath> <ProtogenExePath>$(BuildOutputDirectory)\ProtoGen\protogen.exe</ProtogenExePath> <ProtoBenchExePath>$(BuildTempDirectory)\ProtoBench.exe</ProtoBenchExePath> - <NUnitExePath>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.exe</NUnitExePath> - <NUnitExeConfig>$(LibDirectory)\NUnit 2.2.8.0\nunit-console.$(ForcedFrameworkVersion).config</NUnitExeConfig> + <NUnitExePath>$(LibDirectory)\NUnit\tools\nunit-console.exe</NUnitExePath> + <NUnitExeConfig>$(LibDirectory)\NUnit-config\nunit-console.$(ForcedFrameworkVersion).config</NUnitExeConfig> + <StatLightExePath>$(LibDirectory)\StatLight\tools\StatLight.exe</StatLightExePath> <ZipExePath>$(LibDirectory)\7-Zip 9.20\7za.exe</ZipExePath> </PropertyGroup> @@ -171,6 +172,10 @@ <TestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersMixedLite.Test.dll" /> <TestContainer Include="$(SourceDirectory)\ProtoGen.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.ProtoGen.Test.dll" /> + <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffers.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Test.xap" /> + <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.Test.xap" /> + <StatLightTestContainer Include="$(SourceDirectory)\ProtocolBuffersLite.Test\bin\$(BuildConfiguration)\Google.ProtocolBuffersLiteMixed.Test.xap" /> + <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffers.*" /> <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers\bin\$(BuildConfiguration)\Google.ProtocolBuffersLite.*" /> <DynamicPackageItem Include="$(SourceDirectory)\ProtocolBuffers.Serialization\bin\$(BuildConfiguration)\Google.ProtocolBuffers.Serialization.*" /> @@ -200,7 +205,7 @@ <!-- targets --> <Target Name="Clean" DependsOnTargets="_Clean" /> <Target Name="Build" DependsOnTargets="GenerateSource;_Compile;_Test" /> - <Target Name="Test" DependsOnTargets="_RunTests" /> + <Target Name="Test" DependsOnTargets="_Test" /> <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> <Target Name="GenerateSource" DependsOnTargets="_BuildProtoGen;_GenerateSource;_CopyGeneratedSource" /> <Target Name="BuildPackage" DependsOnTargets="PrepareOutputDirectory;PreparePackageComponent;GeneratePackage" /> |