diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-12 14:06:00 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-12 14:06:00 -0700 |
| commit | 5e68a75fa7eb769db5a38cc8d2f3f5fee75e744e (patch) | |
| tree | 34ca5b0e1aa9399c1b95738f8373c5bf5a7d622a /csharp/src/ProtocolBuffers.Test | |
| parent | d26cef6285d00407268cd1d3d2ea6f0c21995966 (diff) | |
| parent | 3ccbf4b8936f415eed75c81d6228984516dfcbff (diff) | |
| download | protobuf-5e68a75fa7eb769db5a38cc8d2f3f5fee75e744e.tar.gz protobuf-5e68a75fa7eb769db5a38cc8d2f3f5fee75e744e.tar.bz2 protobuf-5e68a75fa7eb769db5a38cc8d2f3f5fee75e744e.zip | |
Merge pull request #370 from jtattermusch/mono_fixes
Fixes for Mono
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test')
| -rw-r--r-- | csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj | 2 | ||||
| -rw-r--r-- | csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 545725e3..76bfcab3 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -29,7 +29,6 @@ <DefineConstants>DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoStdLib>true</NoStdLib>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
@@ -42,7 +41,6 @@ <DefineConstants>TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoStdLib>true</NoStdLib>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
diff --git a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs index da0d9eef..3d4d0320 100644 --- a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs +++ b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs @@ -221,7 +221,8 @@ namespace Google.ProtocolBuffers Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(),
new MessageFormatOptions() { FormattedOutput = true }, "application/json", ms);
- Assert.AreEqual("{\r\n \"text\": \"a\",\r\n \"number\": 1\r\n}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length));
+ string expected = string.Format("{{{0} \"text\": \"a\",{0} \"number\": 1{0}}}", System.Environment.NewLine);
+ Assert.AreEqual(expected, Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length));
}
[Test]
|