From ab5fffcc9e3b8716bfe552fa841a818ca9ab6bbb Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 15 Jul 2015 19:35:38 -0700
Subject: [PATCH 1/2] C# cleanup - assorted nits

---
 csharp/src/ProtocolBuffers/Collections/RepeatedField.cs     | 3 +--
 csharp/src/ProtocolBuffers/FrameworkPortability.cs          | 1 +
 .../src/ProtocolBuffers/InvalidProtocolBufferException.cs   | 6 ------
 csharp/src/ProtocolBuffers/ProtocolBuffers.csproj           | 1 -
 csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs     | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs b/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
index b6b52cb918..a09c795497 100644
--- a/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
+++ b/csharp/src/ProtocolBuffers/Collections/RepeatedField.cs
@@ -44,9 +44,9 @@ namespace Google.Protobuf.Collections
     public sealed class RepeatedField<T> : IList<T>, IList, IDeepCloneable<RepeatedField<T>>, IEquatable<RepeatedField<T>>, IFreezable
     {
         private static readonly T[] EmptyArray = new T[0];
+        private const int MinArraySize = 8;
 
         private bool frozen;
-        private const int MinArraySize = 8;
         private T[] array = EmptyArray;
         private int count = 0;
 
@@ -259,7 +259,6 @@ namespace Google.Protobuf.Collections
 
         public int Count { get { return count; } }
 
-        // TODO(jonskeet): If we implement freezing, make this reflect it.
         public bool IsReadOnly { get { return IsFrozen; } }
 
         public void Add(RepeatedField<T> values)
diff --git a/csharp/src/ProtocolBuffers/FrameworkPortability.cs b/csharp/src/ProtocolBuffers/FrameworkPortability.cs
index f3da5333e9..082eb2e155 100644
--- a/csharp/src/ProtocolBuffers/FrameworkPortability.cs
+++ b/csharp/src/ProtocolBuffers/FrameworkPortability.cs
@@ -40,6 +40,7 @@ namespace Google.Protobuf
     /// </summary>
     internal static class FrameworkPortability
     {
+        // TODO(jtattermusch): is this still a thing?
         // The value of RegexOptions.Compiled is 8. We can test for the presence at
         // execution time using Enum.IsDefined, so a single build will do the right thing
         // on each platform.
diff --git a/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs b/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
index 87b283f2f8..4f89347d63 100644
--- a/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
+++ b/csharp/src/ProtocolBuffers/InvalidProtocolBufferException.cs
@@ -79,12 +79,6 @@ namespace Google.Protobuf
                 "Protocol message end-group tag did not match expected tag.");
         }
 
-        internal static InvalidProtocolBufferException InvalidWireType()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message tag had invalid wire type.");
-        }
-
         internal static InvalidProtocolBufferException RecursionLimitExceeded()
         {
             return new InvalidProtocolBufferException(
diff --git a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
index f529c19a2e..402d661201 100644
--- a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
+++ b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj
@@ -111,7 +111,6 @@
   <ItemGroup>
     <None Include="Google.Protobuf.nuspec" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs b/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
index b631d34f60..3f4f05f408 100644
--- a/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
+++ b/csharp/src/ProtocolBuffers/Reflection/IFieldAccessor.cs
@@ -42,7 +42,7 @@ namespace Google.Protobuf.Reflection
         /// </summary>
         FieldDescriptor Descriptor { get; }
 
-        // TODO: Should the argument type for these messages by IReflectedMessage?
+        // TODO: Should the argument type for these messages be IReflectedMessage?
 
         /// <summary>
         /// Clears the field in the specified message. (For repeated fields,

From b4a24aa5faa5e4229fe71108301a8d49434ddffd Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 15 Jul 2015 19:44:22 -0700
Subject: [PATCH 2/2] added comment for ByteString.CopyFrom

---
 csharp/src/ProtocolBuffers/ByteString.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/csharp/src/ProtocolBuffers/ByteString.cs b/csharp/src/ProtocolBuffers/ByteString.cs
index d5b7aee984..738f020ef9 100644
--- a/csharp/src/ProtocolBuffers/ByteString.cs
+++ b/csharp/src/ProtocolBuffers/ByteString.cs
@@ -134,6 +134,8 @@ namespace Google.Protobuf
         /// Constructs a ByteString from the given array. The contents
         /// are copied, so further modifications to the array will not
         /// be reflected in the returned ByteString.
+        /// This method can also be invoked in <c>ByteString.CopyFrom(0xaa, 0xbb, ...)</c> form
+        /// which is primarily useful for testing.
         /// </summary>
         public static ByteString CopyFrom(params byte[] bytes)
         {