From 7149cee2825c013fe5376672572d3745dd5ad57e Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 11:23:35 -0700 Subject: [PATCH 1/2] remove TreatWarningsAsError setting to allow building in Monodevelop --- csharp/src/AddressBook/AddressBook.csproj | 2 -- csharp/src/ProtoBench/ProtoBench.csproj | 2 -- csharp/src/ProtoDump/ProtoDump.csproj | 2 -- csharp/src/ProtoMunge/ProtoMunge.csproj | 2 -- csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj | 2 -- .../ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj | 2 -- .../ProtocolBuffersLiteMixed.Test.csproj | 2 -- 7 files changed, 14 deletions(-) diff --git a/csharp/src/AddressBook/AddressBook.csproj b/csharp/src/AddressBook/AddressBook.csproj index 52b82a8ffe..f7e0d6be2d 100644 --- a/csharp/src/AddressBook/AddressBook.csproj +++ b/csharp/src/AddressBook/AddressBook.csproj @@ -24,7 +24,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -36,7 +35,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtoBench/ProtoBench.csproj b/csharp/src/ProtoBench/ProtoBench.csproj index 280a54a901..beee3a7196 100644 --- a/csharp/src/ProtoBench/ProtoBench.csproj +++ b/csharp/src/ProtoBench/ProtoBench.csproj @@ -23,7 +23,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -35,7 +34,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtoDump/ProtoDump.csproj b/csharp/src/ProtoDump/ProtoDump.csproj index 506d316b42..b7e6c1a338 100644 --- a/csharp/src/ProtoDump/ProtoDump.csproj +++ b/csharp/src/ProtoDump/ProtoDump.csproj @@ -25,7 +25,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -37,7 +36,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtoMunge/ProtoMunge.csproj b/csharp/src/ProtoMunge/ProtoMunge.csproj index 7be2b3f721..60c907b188 100644 --- a/csharp/src/ProtoMunge/ProtoMunge.csproj +++ b/csharp/src/ProtoMunge/ProtoMunge.csproj @@ -25,7 +25,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -37,7 +36,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 545725e34c..76bfcab34a 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -29,7 +29,6 @@ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false @@ -42,7 +41,6 @@ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj index 75a1449957..4d813f83c4 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj @@ -29,7 +29,6 @@ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false @@ -42,7 +41,6 @@ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj index 11109223b8..c42ab93c25 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj @@ -27,7 +27,6 @@ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false @@ -40,7 +39,6 @@ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false From 3ccbf4b8936f415eed75c81d6228984516dfcbff Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 11:54:23 -0700 Subject: [PATCH 2/2] Fix newline assertion in TestJsonFormatted on mono --- csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs index da0d9eeffc..3d4d03209f 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]