From f79d213e508e5718b1c7ecd9a55b0178cfdc4ad9 Mon Sep 17 00:00:00 2001
From: Christopher Warrington <chwarr@microsoft.com>
Date: Wed, 20 Apr 2016 14:22:50 -0700
Subject: [PATCH] Make C# warnings fail the build

* Treat warnings as errors
* Fix existing warning in Core tests
---
 cs/build/Common.Internal.props    |  4 +-
 cs/test/core/CustomBondedTests.cs | 64 +++++++++++++++----------------
 cs/test/core/Equal.cs             | 12 +++---
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/cs/build/Common.Internal.props b/cs/build/Common.Internal.props
index d4f63dd33d..1ed0c2c437 100644
--- a/cs/build/Common.Internal.props
+++ b/cs/build/Common.Internal.props
@@ -24,6 +24,7 @@
     <FileAlignment>512</FileAlignment>
     <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <NoWarn>1591</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -54,5 +55,4 @@
     <AssemblyOriginatorKeyFile>$(DELAY_SIGN_KEY)</AssemblyOriginatorKeyFile>
     <DefineConstants>$(DefineConstants);DELAY_SIGN</DefineConstants>
   </PropertyGroup>
-</Project> 
-
+</Project>
diff --git a/cs/test/core/CustomBondedTests.cs b/cs/test/core/CustomBondedTests.cs
index 4e9d4e3c78..487a0013aa 100644
--- a/cs/test/core/CustomBondedTests.cs
+++ b/cs/test/core/CustomBondedTests.cs
@@ -108,47 +108,47 @@ public static CustomBonded<T> From<TActual>(TActual instance)
             {
                 return new CustomBondedPoly<T,TActual>(instance);
             }
+        }
 
-            internal class CustomBondedPoly<T, TActual> : CustomBonded<T>, IBonded<T>
-            {
-                public new static readonly CustomBonded<T> Empty = new CustomBondedPoly<T, TActual>(GenericFactory.Create<TActual>());
+        internal class CustomBondedPoly<T, TActual> : CustomBonded<T>, IBonded<T>
+        {
+            public new static readonly CustomBonded<T> Empty = new CustomBondedPoly<T, TActual>(GenericFactory.Create<TActual>());
 
-                private readonly TActual instance;
+            private readonly TActual instance;
 
-                public CustomBondedPoly(TActual instance)
-                {
-                    this.instance = instance;
-                }
+            public CustomBondedPoly(TActual instance)
+            {
+                this.instance = instance;
+            }
 
-                public override T Value
-                {
-                    get { return Deserialize(); }
-                }
+            public override T Value
+            {
+                get { return Deserialize(); }
+            }
 
-                public T Deserialize()
-                {
-                    return CustomTransformFactory.Instance.Cloner<TActual, T>().Clone<T>(instance);
-                }
+            public T Deserialize()
+            {
+                return CustomTransformFactory.Instance.Cloner<TActual, T>().Clone<T>(instance);
+            }
 
-                public void Serialize<W>(W writer)
-                {
-                    CustomTransformFactory.Instance.Serializer<W, TActual>().Serialize(instance, writer);
-                }
+            public void Serialize<W>(W writer)
+            {
+                CustomTransformFactory.Instance.Serializer<W, TActual>().Serialize(instance, writer);
+            }
 
-                public U Deserialize<U>()
-                {
-                    return CustomTransformFactory.Instance.Cloner<TActual, U>().Clone<U>(instance);
-                }
+            public U Deserialize<U>()
+            {
+                return CustomTransformFactory.Instance.Cloner<TActual, U>().Clone<U>(instance);
+            }
 
-                IBonded<U> IBonded.Convert<U>()
-                {
-                    return this as IBonded<U>;
-                }
+            IBonded<U> IBonded.Convert<U>()
+            {
+                return this as IBonded<U>;
+            }
 
-                public override CustomBonded<U> Convert<U>()
-                {
-                    return new CustomBondedPoly<U, TActual>(instance);
-                }
+            public override CustomBonded<U> Convert<U>()
+            {
+                return new CustomBondedPoly<U, TActual>(instance);
             }
         }
 
diff --git a/cs/test/core/Equal.cs b/cs/test/core/Equal.cs
index 88dbcbf423..5c16d7497a 100644
--- a/cs/test/core/Equal.cs
+++ b/cs/test/core/Equal.cs
@@ -158,12 +158,12 @@ public static bool IsEqual<T>(this T left, T right) where T : class
             var equal = comparerEqual.MakeGenericMethod(right.GetType());
             var result = (bool)equal.Invoke(null, new object[] { left, right });
 
-            if (!result)
-            {
-                // Set breakpoint here to debug unequal test failure
-                var strLeft = Util.SerializeXmlString(left);
-                var strRight = Util.SerializeXmlString(right);
-            }
+            // Uncomment this block and set breakpoint here to debug unequal test failure
+            //if (!result)
+            //{
+            //    var strLeft = Util.SerializeXmlString(left);
+            //    var strRight = Util.SerializeXmlString(right);
+            //}
 
             return result;
         }