diff options
| author | Jon Skeet <skeet@pobox.com> | 2014-04-05 15:55:22 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2014-04-05 15:55:22 +0100 |
| commit | 8e04d10daba5bfd1213cc9b6c8554a017250e199 (patch) | |
| tree | dcf01d54243a7973365cc4c4d55b7f59b24f1aa0 | |
| parent | f34759e05c271393302091905daee0e265ab8664 (diff) | |
| download | protobuf-8e04d10daba5bfd1213cc9b6c8554a017250e199.tar.gz protobuf-8e04d10daba5bfd1213cc9b6c8554a017250e199.tar.bz2 protobuf-8e04d10daba5bfd1213cc9b6c8554a017250e199.zip | |
Fix for issue 81: quoting for NUnit parameters.
| -rw-r--r-- | build/Common.targets | 8 | ||||
| -rw-r--r-- | build/target.csproj | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/Common.targets b/build/Common.targets index d5ff8797..2aa74dfe 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -56,7 +56,7 @@ Targets For Tools <Copy SourceFiles="$(LibDirectory)\NUnit-config\nunit-console.v2.0.config" DestinationFiles="$(NUnitExePath).config" /> <Exec WorkingDirectory="%(ToolsTestContainer.RootDir)%(ToolsTestContainer.Directory)" - Command=""$(NUnitExePath)" /nologo /noshadow %(ToolsTestContainer.Identity) /xml:$(BuildTempDirectory)\%(ToolsTestContainer.Filename).xml" /> + Command=""$(NUnitExePath)" /nologo /noshadow "%(ToolsTestContainer.Identity)" /xml:"$(BuildTempDirectory)\%(ToolsTestContainer.Filename).xml"" /> </Target> @@ -65,7 +65,7 @@ Targets For GenerateSource *********************************************************************************************** --> <Target Name="_GenerateProjects"> - <Exec Command="$(CsProjectProjector) csproj_templates src\ProtocolBuffersLibrary.sln" WorkingDirectory="$(ProjectDirectory)" /> + <Exec Command=""$(CsProjectProjector)" csproj_templates src\ProtocolBuffersLibrary.sln" WorkingDirectory="$(ProjectDirectory)" /> </Target> <Target Name="_CleanTempSource"> @@ -75,8 +75,8 @@ Targets For GenerateSource <Target Name="_GenerateSource" DependsOnTargets="_CleanTempSource"> <Message Importance="high" Text="Generating source from proto files" /> - <Exec Command="$(ProtocExePath) --proto_path=$(ProtosDirectory) --descriptor_set_out=compiled.pb @(Protos->'%(RelativeDir)%(Filename)%(Extension)', ' ')" WorkingDirectory="$(SourceTempDirectory)" /> - <Exec Command="$(ProtogenExePath) compiled.pb" WorkingDirectory="$(SourceTempDirectory)" /> + <Exec Command=""$(ProtocExePath)" --proto_path=$(ProtosDirectory) --descriptor_set_out=compiled.pb @(Protos->'%(RelativeDir)%(Filename)%(Extension)', ' ')" WorkingDirectory="$(SourceTempDirectory)" /> + <Exec Command=""$(ProtogenExePath)" compiled.pb" WorkingDirectory="$(SourceTempDirectory)" /> </Target> <Target Name="_CopyGeneratedSource" DependsOnTargets="_GenerateSource"> diff --git a/build/target.csproj b/build/target.csproj index 5babb6ff..09a9d50b 100644 --- a/build/target.csproj +++ b/build/target.csproj @@ -156,7 +156,7 @@ Targets For Test <Target Name="_RunNunit"> <Copy SourceFiles="$(LibDirectory)\NUnit-config\nunit-console.$(TargetFrameworkVersion).config" DestinationFiles="$(NUnitExePath).config" /> - <Exec Command=""$(NUnitExePath)" /nologo /noshadow %(TestContainer.Identity) /xml:$(BuildTempDirectory)\%(TestContainer.Filename).xml" /> + <Exec Command=""$(NUnitExePath)" /nologo /noshadow "%(TestContainer.Identity)" /xml:"$(BuildTempDirectory)\%(TestContainer.Filename).xml"" /> </Target> <Target Name="_RunStatLight"> |