Merged branch for issue 16

pull/288/head
csharptest 13 years ago committed by rogerk
commit fad894b7c3
  1. 4
      src/AddressBook/AddressBookProtos.cs
  2. 6
      src/ProtoGen/UmbrellaClassGenerator.cs
  3. 6
      src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj
  4. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs
  5. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs
  6. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
  7. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs
  8. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs
  9. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs
  10. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs
  11. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs
  12. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
  13. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
  14. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs
  15. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
  16. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
  17. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs
  18. 4
      src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs
  19. 4
      src/ProtocolBuffers/DescriptorProtos/CSharpOptions.cs
  20. 4
      src/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
  21. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs
  22. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs
  23. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs
  24. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs
  25. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs
  26. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs
  27. 4
      src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -1028,3 +1030,5 @@ namespace Google.ProtocolBuffers.Examples.AddressBook {
#endregion
}
#endregion Designer generated code

@ -132,11 +132,17 @@ namespace Google.ProtocolBuffers.ProtoGen
writer.Outdent();
writer.WriteLine("}");
}
writer.WriteLine();
writer.WriteLine("#endregion Designer generated code");
}
private void WriteIntroduction(TextGenerator writer)
{
//writer.WriteLine("// <auto-generated />");
writer.WriteLine("// Generated by {0}. DO NOT EDIT!", this.GetType().Assembly.FullName);
writer.WriteLine("#pragma warning disable 1591");
writer.WriteLine("#region Designer generated code");
writer.WriteLine();
writer.WriteLine("using pb = global::Google.ProtocolBuffers;");
writer.WriteLine("using pbc = global::Google.ProtocolBuffers.Collections;");

@ -45,6 +45,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Debug\Google.ProtocolBuffers.Test.XML</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -54,6 +57,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Release\Google.ProtocolBuffers.Test.XML</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.2.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -381,3 +383,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -4393,3 +4395,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -393,3 +395,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -45,3 +47,5 @@ namespace Google.ProtocolBuffers.TestProtos {
}
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -263,3 +265,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -4176,3 +4178,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -6206,3 +6208,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -270,3 +272,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -307,3 +309,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -1601,3 +1603,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -329,3 +331,5 @@ namespace Google.ProtocolBuffers.TestProtos.NoGenericService {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -561,3 +563,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -19616,3 +19618,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -1317,3 +1319,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -2033,3 +2035,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -1585,3 +1587,5 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -7436,3 +7438,5 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -1863,3 +1865,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -1822,3 +1824,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -270,3 +272,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -307,3 +309,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -282,3 +284,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -9731,3 +9733,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

@ -1,4 +1,6 @@
// Generated by ProtoGen, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48. DO NOT EDIT!
#pragma warning disable 1591
#region Designer generated code
using pb = global::Google.ProtocolBuffers;
using pbc = global::Google.ProtocolBuffers.Collections;
@ -19616,3 +19618,5 @@ namespace Google.ProtocolBuffers.TestProtos {
#endregion
}
#endregion Designer generated code

Loading…
Cancel
Save