5 files changed, 25 insertions, 0 deletions
diff --git a/src/ProtoGen/EnumFieldGenerator.cs b/src/ProtoGen/EnumFieldGenerator.cs
index aecf6885..25627310 100644
--- a/src/ProtoGen/EnumFieldGenerator.cs
+++ b/src/ProtoGen/EnumFieldGenerator.cs
@@ -15,6 +15,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("public bool Has{0} {{", PropertyName);
       writer.WriteLine("  get {{ return has{0}; }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public {0} {1} {{", TypeName, PropertyName);
       writer.WriteLine("  get {{ return {0}_; }}", Name);
       writer.WriteLine("}");
@@ -24,10 +25,12 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("public bool Has{0} {{", PropertyName);
       writer.WriteLine(" get {{ return result.Has{0}; }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public {0} {1} {{", TypeName, PropertyName);
       writer.WriteLine("  get {{ return result.{0}; }}", PropertyName);
       writer.WriteLine("  set {{ Set{0}(value); }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public Builder Set{0}({1} value) {{", PropertyName, TypeName);
       writer.WriteLine("  result.has{0} = true;", PropertyName);
       writer.WriteLine("  result.{0}_ = value;", Name);
diff --git a/src/ProtoGen/ExtensionGenerator.cs b/src/ProtoGen/ExtensionGenerator.cs
index 6b44ed73..5c0afed4 100644
--- a/src/ProtoGen/ExtensionGenerator.cs
+++ b/src/ProtoGen/ExtensionGenerator.cs
@@ -30,8 +30,14 @@ namespace Google.ProtocolBuffers.ProtoGen {
     public void Generate(TextGenerator writer) {
       writer.WriteLine ("public const int {0} = {1};", GetFieldConstantName(Descriptor), Descriptor.FieldNumber);
       if (Descriptor.IsRepeated) {
+        if (!Descriptor.IsCLSCompliant) {
+          writer.WriteLine("[global::System.CLSCompliant(false)]");
+        }
         writer.WriteLine("{0} static pb::GeneratedExtensionBase<scg::IList<{1}>> {2};", ClassAccessLevel, type, name);
       } else {
+        if (!Descriptor.IsCLSCompliant) {
+          writer.WriteLine("[global::System.CLSCompliant(false)]");
+        }
         writer.WriteLine("{0} static pb::GeneratedExtensionBase<{1}> {2};", ClassAccessLevel, type, name);
       }
     }
diff --git a/src/ProtoGen/FieldGeneratorBase.cs b/src/ProtoGen/FieldGeneratorBase.cs
index 357614d1..f34d01cd 100644
--- a/src/ProtoGen/FieldGeneratorBase.cs
+++ b/src/ProtoGen/FieldGeneratorBase.cs
@@ -97,6 +97,12 @@ namespace Google.ProtocolBuffers.ProtoGen {
       }
     }
 
+    protected void AddClsComplianceCheck(TextGenerator writer) {
+      if (!Descriptor.IsCLSCompliant) {
+        writer.WriteLine("[global::System.CLSCompliant(false)]");
+      }
+    }
+
     /// <summary>
     /// For encodings with fixed sizes, returns that size in bytes.  Otherwise
     /// returns -1. TODO(jonskeet): Make this less ugly.
diff --git a/src/ProtoGen/PrimitiveFieldGenerator.cs b/src/ProtoGen/PrimitiveFieldGenerator.cs
index 3c2fb246..29d5a739 100644
--- a/src/ProtoGen/PrimitiveFieldGenerator.cs
+++ b/src/ProtoGen/PrimitiveFieldGenerator.cs
@@ -15,6 +15,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("public bool Has{0} {{", PropertyName);
       writer.WriteLine("  get {{ return has{0}; }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public {0} {1} {{", TypeName, PropertyName);
       writer.WriteLine("  get {{ return {0}_; }}", Name);
       writer.WriteLine("}");
@@ -24,10 +25,12 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("public bool Has{0} {{", PropertyName);
       writer.WriteLine("  get {{ return result.Has{0}; }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public {0} {1} {{", TypeName, PropertyName);
       writer.WriteLine("  get {{ return result.{0}; }}", PropertyName);
       writer.WriteLine("  set {{ Set{0}(value); }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public Builder Set{0}({1} value) {{", PropertyName, TypeName);
       AddNullCheck(writer);
       writer.WriteLine("  result.has{0} = true;", PropertyName);
diff --git a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
index 208d4151..09e9fa08 100644
--- a/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
+++ b/src/ProtoGen/RepeatedPrimitiveFieldGenerator.cs
@@ -16,6 +16,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
         writer.WriteLine("private int {0}MemoizedSerializedSize;", Name);
       }
       writer.WriteLine("private pbc::PopsicleList<{0}> {1}_ = new pbc::PopsicleList<{0}>();", TypeName, Name);
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName);
       writer.WriteLine("  get {{ return pbc::Lists.AsReadOnly({0}_); }}", Name);
       writer.WriteLine("}");
@@ -25,6 +26,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("  get {{ return {0}_.Count; }}", Name);
       writer.WriteLine("}");
 
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName);
       writer.WriteLine("  return {0}_[index];", Name);
       writer.WriteLine("}");
@@ -32,25 +34,30 @@ namespace Google.ProtocolBuffers.ProtoGen {
 
     public void GenerateBuilderMembers(TextGenerator writer) {
       // Note:  We can return the original list here, because we make it unmodifiable when we build
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public scg::IList<{0}> {1}List {{", TypeName, PropertyName);
       writer.WriteLine("  get {{ return result.{0}_; }}", Name);
       writer.WriteLine("}");
       writer.WriteLine("public int {0}Count {{", PropertyName);
       writer.WriteLine("  get {{ return result.{0}Count; }}", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public {0} Get{1}(int index) {{", TypeName, PropertyName);
       writer.WriteLine("  return result.Get{0}(index);", PropertyName);
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public Builder Set{0}(int index, {1} value) {{", PropertyName, TypeName);
       AddNullCheck(writer);
       writer.WriteLine("  result.{0}_[index] = value;", Name);
       writer.WriteLine("  return this;");
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public Builder Add{0}({1} value) {{", PropertyName, TypeName);
       AddNullCheck(writer);
       writer.WriteLine("  result.{0}_.Add(value);", Name, TypeName);
       writer.WriteLine("  return this;");
       writer.WriteLine("}");
+      AddClsComplianceCheck(writer);
       writer.WriteLine("public Builder AddRange{0}(scg::IEnumerable<{1}> values) {{", PropertyName, TypeName);
       writer.WriteLine("  base.AddRange(values, result.{0}_);", Name);
       writer.WriteLine("  return this;");