Upgraded to protoc.exe 2.0.3. Added new build target of clean-build

ProtocolBuffers.build

@@ -44,6 +44,29 @@
             value="${src}/ProtoGen/bin/${tools-protogen-config}/protogen.exe" 
             overwrite="false"/>
   
+  <target name="clean-build"
+          description="Rebuilds all source and binaries, including distribution">
+
+  <!-- 
+    - Use call instead of dependencies to make it clear what's going on: we
+    - need to call some targets multiple times.
+    -->
+    <call target="clean" />
+    <call target="build" />
+    <call target="generate-source" />
+    <call target="copy-generated-source" />
+    <!-- Now we've got fresh source, build again -->
+    <call target="clean" />
+    <call target="build" />
+    <!-- 
+      - In particularly insane situations we should possibly do another
+      - round of generating source and building, but it gets silly.
+      -->
+    
+    <call target="test" />
+    <call target="dist" />
+  </target>
+  
   <target name="clean" 
           description="Removes built binaries (of all configurations) and the source generation directory">
     <delete>

protos/google/protobuf/benchmark.proto

 import "google/protobuf/csharp_options.proto";
-import "google/protobuf/descriptor.proto";
 option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.BenchmarkProtos";
 option (google.protobuf.csharp_file_options).umbrella_classname = "BenchmarkProtoFile";
 

protos/google/protobuf/unittest.proto

 // Additional options required for C# generation. File from copyright
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
-import "google/protobuf/descriptor.proto";
 option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";
 option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestProtoFile";
 

protos/google/protobuf/unittest_embed_optimize_for.proto

 // Additional options required for C# generation. File from copyright
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
-import "google/protobuf/descriptor.proto";
 option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";
 option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestEmbedOptimizeForProtoFile";
 

protos/google/protobuf/unittest_import.proto

 // Additional options required for C# generation. File from copyright
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
-import "google/protobuf/descriptor.proto";
 option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";
 option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestImportProtoFile";
 

protos/google/protobuf/unittest_mset.proto

 // Additional options required for C# generation. File from copyright
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
-import "google/protobuf/descriptor.proto";
 option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";
 option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestMessageSetProtoFile";
 

protos/google/protobuf/unittest_optimize_for.proto

 // Additional options required for C# generation. File from copyright
 // line onwards is as per original distribution.
 import "google/protobuf/csharp_options.proto";
-import "google/protobuf/descriptor.proto";
 option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos";
 option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestOptimizeForProtoFile";
 

src/ProtoBench/BenchmarkProtoFile.cs

@@ -16,67 +16,65 @@ namespace Google.ProtocolBuffers.BenchmarkProtos {
         global::System.Convert.FromBase64String(
         "Ch9nb29nbGUvcHJvdG9idWYvYmVuY2htYXJrLnByb3RvEhdwcm90bzIuYmVu" + 
         "Y2htYXJrLnYyX2FwaRokZ29vZ2xlL3Byb3RvYnVmL2NzaGFycF9vcHRpb25z" + 
-        "LnByb3RvGiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90byLxBgoI" + 
-        "TWVzc2FnZTESDgoGZmllbGQxGAEgAigJEg4KBmZpZWxkORgJIAEoCRIPCgdm" + 
-        "aWVsZDE4GBIgASgJEhYKB2ZpZWxkODAYUCABKAg6BWZhbHNlEhUKB2ZpZWxk" + 
-        "ODEYUSABKAg6BHRydWUSDgoGZmllbGQyGAIgAigFEg4KBmZpZWxkMxgDIAIo" + 
-        "BRIRCghmaWVsZDI4MBiYAiABKAUSEQoGZmllbGQ2GAYgASgFOgEwEg8KB2Zp" + 
-        "ZWxkMjIYFiABKAMSDgoGZmllbGQ0GAQgASgJEg4KBmZpZWxkNRgFIAMoBhIW" + 
-        "CgdmaWVsZDU5GDsgASgIOgVmYWxzZRIOCgZmaWVsZDcYByABKAkSDwoHZmll" + 
-        "bGQxNhgQIAEoBRIUCghmaWVsZDEzMBiCASABKAU6ATASFQoHZmllbGQxMhgM" + 
-        "IAEoCDoEdHJ1ZRIVCgdmaWVsZDE3GBEgASgIOgR0cnVlEhUKB2ZpZWxkMTMY" + 
-        "DSABKAg6BHRydWUSFQoHZmllbGQxNBgOIAEoCDoEdHJ1ZRITCghmaWVsZDEw" + 
-        "NBhoIAEoBToBMBITCghmaWVsZDEwMBhkIAEoBToBMBITCghmaWVsZDEwMRhl" + 
-        "IAEoBToBMBIQCghmaWVsZDEwMhhmIAEoCRIQCghmaWVsZDEwMxhnIAEoCRIS" + 
-        "CgdmaWVsZDI5GB0gASgFOgEwEhYKB2ZpZWxkMzAYHiABKAg6BWZhbHNlEhMK" + 
-        "B2ZpZWxkNjAYPCABKAU6Ai0xEhUKCGZpZWxkMjcxGI8CIAEoBToCLTESFQoI" + 
-        "ZmllbGQyNzIYkAIgASgFOgItMRIRCghmaWVsZDE1MBiWASABKAUSEgoHZmll" + 
-        "bGQyMxgXIAEoBToBMBIWCgdmaWVsZDI0GBggASgIOgVmYWxzZRISCgdmaWVs" + 
-        "ZDI1GBkgASgFOgEwEjIKB2ZpZWxkMTUYDyABKAsyIS5wcm90bzIuYmVuY2ht" + 
-        "YXJrLnYyX2FwaS5NZXNzYWdlMhIPCgdmaWVsZDc4GE4gASgIEhIKB2ZpZWxk" + 
-        "NjcYQyABKAU6ATASDwoHZmllbGQ2OBhEIAEoBRIUCghmaWVsZDEyOBiAASAB" + 
-        "KAU6ATASKAoIZmllbGQxMjkYgQEgASgJOhV4eHh4eHh4eHh4eHh4eHh4eHh4" + 
-        "eHgSFAoIZmllbGQxMzEYgwEgASgFOgEwIpMDCghNZXNzYWdlMhIRCgZmaWVs" + 
-        "ZDEYASABKAU6ATASEQoGZmllbGQyGAIgASgFOgEwEhEKBmZpZWxkMxgDIAEo" + 
-        "BToBMBIPCgdmaWVsZDE1GA8gASgJEhUKB2ZpZWxkMTIYDCABKAg6BHRydWUS" + 
-        "DwoHZmllbGQxMxgNIAEoAxIPCgdmaWVsZDE0GA4gASgDEg8KB2ZpZWxkMTYY" + 
-        "ECABKAUSEgoHZmllbGQxORgTIAEoBToBMhIVCgdmaWVsZDIwGBQgASgIOgR0" + 
-        "cnVlEhUKB2ZpZWxkMjgYHCABKAg6BHRydWUSDwoHZmllbGQyMRgVIAEoBhIP" + 
-        "CgdmaWVsZDIyGBYgASgFEhYKB2ZpZWxkMjMYFyABKAg6BWZhbHNlEhgKCGZp" + 
-        "ZWxkMjA2GM4BIAEoCDoFZmFsc2USEQoIZmllbGQyMDMYywEgASgHEhEKCGZp" + 
-        "ZWxkMjA0GMwBIAEoBRIRCghmaWVsZDIwNRjNASABKAkSEQoIZmllbGQyMDcY" + 
-        "zwEgASgEEhEKCGZpZWxkMzAwGKwCIAEoBCLHBwoITWVzc2FnZTMSDgoGZmll" + 
-        "bGQxGAEgASgJEg4KBmZpZWxkMxgDIAEoAxIOCgZmaWVsZDQYBCABKAMSDwoH" + 
-        "ZmllbGQzMBgeIAEoAxIWCgdmaWVsZDc1GEsgASgIOgVmYWxzZRIOCgZmaWVs" + 
-        "ZDYYBiABKAkSDgoGZmllbGQyGAIgASgMEhIKB2ZpZWxkMjEYFSABKAU6ATAS" + 
-        "DwoHZmllbGQ3MRhHIAEoBRIPCgdmaWVsZDI1GBkgASgCEhMKCGZpZWxkMTA5" + 
-        "GG0gASgFOgEwEhQKCGZpZWxkMjEwGNIBIAEoBToBMBIUCghmaWVsZDIxMRjT" + 
-        "ASABKAU6ATASFAoIZmllbGQyMTIY1AEgASgFOgEwEhQKCGZpZWxkMjEzGNUB" + 
-        "IAEoBToBMBIUCghmaWVsZDIxNhjYASABKAU6ATASFAoIZmllbGQyMTcY2QEg" + 
-        "ASgFOgEwEhQKCGZpZWxkMjE4GNoBIAEoBToBMBIUCghmaWVsZDIyMBjcASAB" + 
-        "KAU6ATASFAoIZmllbGQyMjEY3QEgASgFOgEwEhQKCGZpZWxkMjIyGN4BIAEo" + 
-        "AjoBMBIPCgdmaWVsZDYzGD8gASgFEjgKBmdyb3VwMRgKIAMoCjIoLnByb3Rv" + 
-        "Mi5iZW5jaG1hcmsudjJfYXBpLk1lc3NhZ2UzLkdyb3VwMRIRCghmaWVsZDEy" + 
-        "OBiAASADKAkSEQoIZmllbGQxMzEYgwEgASgDEhAKCGZpZWxkMTI3GH8gAygJ" + 
-        "EhEKCGZpZWxkMTI5GIEBIAEoBRIRCghmaWVsZDEzMBiCASADKAMSGAoIZmll" + 
-        "bGQyMDUYzQEgASgIOgVmYWxzZRIYCghmaWVsZDIwNhjOASABKAg6BWZhbHNl" + 
-        "Gr0CCgZHcm91cDESDwoHZmllbGQxMRgLIAIoAhIPCgdmaWVsZDI2GBogASgC" + 
-        "Eg8KB2ZpZWxkMTIYDCABKAkSDwoHZmllbGQxMxgNIAEoCRIPCgdmaWVsZDE0" + 
-        "GA4gAygJEg8KB2ZpZWxkMTUYDyACKAQSDgoGZmllbGQ1GAUgASgFEg8KB2Zp" + 
-        "ZWxkMjcYGyABKAkSDwoHZmllbGQyOBgcIAEoBRIPCgdmaWVsZDI5GB0gASgJ" + 
-        "Eg8KB2ZpZWxkMTYYECABKAkSDwoHZmllbGQyMhgWIAMoCRIPCgdmaWVsZDcz" + 
-        "GEkgAygFEhIKB2ZpZWxkMjAYFCABKAU6ATASDwoHZmllbGQyNBgYIAEoCRIy" + 
-        "CgdmaWVsZDMxGB8gASgLMiEucHJvdG8yLmJlbmNobWFyay52Ml9hcGkuTWVz" + 
-        "c2FnZTQizAEKCE1lc3NhZ2U0Eg4KBmZpZWxkMRgBIAEoAhIOCgZmaWVsZDIY" + 
-        "AiABKAISEQoGZmllbGQzGAMgASgCOgEwEg4KBmZpZWxkNBgEIAEoCBIOCgZm" + 
-        "aWVsZDUYBSABKAgSFAoGZmllbGQ2GAYgASgIOgR0cnVlEhUKBmZpZWxkNxgH" + 
-        "IAEoCDoFZmFsc2USDgoGZmllbGQ4GAggASgCEg4KBmZpZWxkORgJIAEoCBIP" + 
-        "CgdmaWVsZDEwGAogASgCEg8KB2ZpZWxkMTEYCyABKANCQUgBwj48CiZHb29n" + 
-        "bGUuUHJvdG9jb2xCdWZmZXJzLkJlbmNobWFya1Byb3RvcxISQmVuY2htYXJr" + 
-        "UHJvdG9GaWxl"),
+        "LnByb3RvIvEGCghNZXNzYWdlMRIOCgZmaWVsZDEYASACKAkSDgoGZmllbGQ5" + 
+        "GAkgASgJEg8KB2ZpZWxkMTgYEiABKAkSFgoHZmllbGQ4MBhQIAEoCDoFZmFs" + 
+        "c2USFQoHZmllbGQ4MRhRIAEoCDoEdHJ1ZRIOCgZmaWVsZDIYAiACKAUSDgoG" + 
+        "ZmllbGQzGAMgAigFEhEKCGZpZWxkMjgwGJgCIAEoBRIRCgZmaWVsZDYYBiAB" + 
+        "KAU6ATASDwoHZmllbGQyMhgWIAEoAxIOCgZmaWVsZDQYBCABKAkSDgoGZmll" + 
+        "bGQ1GAUgAygGEhYKB2ZpZWxkNTkYOyABKAg6BWZhbHNlEg4KBmZpZWxkNxgH" + 
+        "IAEoCRIPCgdmaWVsZDE2GBAgASgFEhQKCGZpZWxkMTMwGIIBIAEoBToBMBIV" + 
+        "CgdmaWVsZDEyGAwgASgIOgR0cnVlEhUKB2ZpZWxkMTcYESABKAg6BHRydWUS" + 
+        "FQoHZmllbGQxMxgNIAEoCDoEdHJ1ZRIVCgdmaWVsZDE0GA4gASgIOgR0cnVl" + 
+        "EhMKCGZpZWxkMTA0GGggASgFOgEwEhMKCGZpZWxkMTAwGGQgASgFOgEwEhMK" + 
+        "CGZpZWxkMTAxGGUgASgFOgEwEhAKCGZpZWxkMTAyGGYgASgJEhAKCGZpZWxk" + 
+        "MTAzGGcgASgJEhIKB2ZpZWxkMjkYHSABKAU6ATASFgoHZmllbGQzMBgeIAEo" + 
+        "CDoFZmFsc2USEwoHZmllbGQ2MBg8IAEoBToCLTESFQoIZmllbGQyNzEYjwIg" + 
+        "ASgFOgItMRIVCghmaWVsZDI3MhiQAiABKAU6Ai0xEhEKCGZpZWxkMTUwGJYB" + 
+        "IAEoBRISCgdmaWVsZDIzGBcgASgFOgEwEhYKB2ZpZWxkMjQYGCABKAg6BWZh" + 
+        "bHNlEhIKB2ZpZWxkMjUYGSABKAU6ATASMgoHZmllbGQxNRgPIAEoCzIhLnBy" + 
+        "b3RvMi5iZW5jaG1hcmsudjJfYXBpLk1lc3NhZ2UyEg8KB2ZpZWxkNzgYTiAB" + 
+        "KAgSEgoHZmllbGQ2NxhDIAEoBToBMBIPCgdmaWVsZDY4GEQgASgFEhQKCGZp" + 
+        "ZWxkMTI4GIABIAEoBToBMBIoCghmaWVsZDEyORiBASABKAk6FXh4eHh4eHh4" + 
+        "eHh4eHh4eHh4eHh4eBIUCghmaWVsZDEzMRiDASABKAU6ATAikwMKCE1lc3Nh" + 
+        "Z2UyEhEKBmZpZWxkMRgBIAEoBToBMBIRCgZmaWVsZDIYAiABKAU6ATASEQoG" + 
+        "ZmllbGQzGAMgASgFOgEwEg8KB2ZpZWxkMTUYDyABKAkSFQoHZmllbGQxMhgM" + 
+        "IAEoCDoEdHJ1ZRIPCgdmaWVsZDEzGA0gASgDEg8KB2ZpZWxkMTQYDiABKAMS" + 
+        "DwoHZmllbGQxNhgQIAEoBRISCgdmaWVsZDE5GBMgASgFOgEyEhUKB2ZpZWxk" + 
+        "MjAYFCABKAg6BHRydWUSFQoHZmllbGQyOBgcIAEoCDoEdHJ1ZRIPCgdmaWVs" + 
+        "ZDIxGBUgASgGEg8KB2ZpZWxkMjIYFiABKAUSFgoHZmllbGQyMxgXIAEoCDoF" + 
+        "ZmFsc2USGAoIZmllbGQyMDYYzgEgASgIOgVmYWxzZRIRCghmaWVsZDIwMxjL" + 
+        "ASABKAcSEQoIZmllbGQyMDQYzAEgASgFEhEKCGZpZWxkMjA1GM0BIAEoCRIR" + 
+        "CghmaWVsZDIwNxjPASABKAQSEQoIZmllbGQzMDAYrAIgASgEIscHCghNZXNz" + 
+        "YWdlMxIOCgZmaWVsZDEYASABKAkSDgoGZmllbGQzGAMgASgDEg4KBmZpZWxk" + 
+        "NBgEIAEoAxIPCgdmaWVsZDMwGB4gASgDEhYKB2ZpZWxkNzUYSyABKAg6BWZh" + 
+        "bHNlEg4KBmZpZWxkNhgGIAEoCRIOCgZmaWVsZDIYAiABKAwSEgoHZmllbGQy" + 
+        "MRgVIAEoBToBMBIPCgdmaWVsZDcxGEcgASgFEg8KB2ZpZWxkMjUYGSABKAIS" + 
+        "EwoIZmllbGQxMDkYbSABKAU6ATASFAoIZmllbGQyMTAY0gEgASgFOgEwEhQK" + 
+        "CGZpZWxkMjExGNMBIAEoBToBMBIUCghmaWVsZDIxMhjUASABKAU6ATASFAoI" + 
+        "ZmllbGQyMTMY1QEgASgFOgEwEhQKCGZpZWxkMjE2GNgBIAEoBToBMBIUCghm" + 
+        "aWVsZDIxNxjZASABKAU6ATASFAoIZmllbGQyMTgY2gEgASgFOgEwEhQKCGZp" + 
+        "ZWxkMjIwGNwBIAEoBToBMBIUCghmaWVsZDIyMRjdASABKAU6ATASFAoIZmll" + 
+        "bGQyMjIY3gEgASgCOgEwEg8KB2ZpZWxkNjMYPyABKAUSOAoGZ3JvdXAxGAog" + 
+        "AygKMigucHJvdG8yLmJlbmNobWFyay52Ml9hcGkuTWVzc2FnZTMuR3JvdXAx" + 
+        "EhEKCGZpZWxkMTI4GIABIAMoCRIRCghmaWVsZDEzMRiDASABKAMSEAoIZmll" + 
+        "bGQxMjcYfyADKAkSEQoIZmllbGQxMjkYgQEgASgFEhEKCGZpZWxkMTMwGIIB" + 
+        "IAMoAxIYCghmaWVsZDIwNRjNASABKAg6BWZhbHNlEhgKCGZpZWxkMjA2GM4B" + 
+        "IAEoCDoFZmFsc2UavQIKBkdyb3VwMRIPCgdmaWVsZDExGAsgAigCEg8KB2Zp" + 
+        "ZWxkMjYYGiABKAISDwoHZmllbGQxMhgMIAEoCRIPCgdmaWVsZDEzGA0gASgJ" + 
+        "Eg8KB2ZpZWxkMTQYDiADKAkSDwoHZmllbGQxNRgPIAIoBBIOCgZmaWVsZDUY" + 
+        "BSABKAUSDwoHZmllbGQyNxgbIAEoCRIPCgdmaWVsZDI4GBwgASgFEg8KB2Zp" + 
+        "ZWxkMjkYHSABKAkSDwoHZmllbGQxNhgQIAEoCRIPCgdmaWVsZDIyGBYgAygJ" + 
+        "Eg8KB2ZpZWxkNzMYSSADKAUSEgoHZmllbGQyMBgUIAEoBToBMBIPCgdmaWVs" + 
+        "ZDI0GBggASgJEjIKB2ZpZWxkMzEYHyABKAsyIS5wcm90bzIuYmVuY2htYXJr" + 
+        "LnYyX2FwaS5NZXNzYWdlNCLMAQoITWVzc2FnZTQSDgoGZmllbGQxGAEgASgC" + 
+        "Eg4KBmZpZWxkMhgCIAEoAhIRCgZmaWVsZDMYAyABKAI6ATASDgoGZmllbGQ0" + 
+        "GAQgASgIEg4KBmZpZWxkNRgFIAEoCBIUCgZmaWVsZDYYBiABKAg6BHRydWUS" + 
+        "FQoGZmllbGQ3GAcgASgIOgVmYWxzZRIOCgZmaWVsZDgYCCABKAISDgoGZmll" + 
+        "bGQ5GAkgASgIEg8KB2ZpZWxkMTAYCiABKAISDwoHZmllbGQxMRgLIAEoA0JB" + 
+        "SAHCPjwKJkdvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuQmVuY2htYXJrUHJvdG9z" + 
+        "EhJCZW5jaG1hcmtQcm90b0ZpbGU="),
         new pbd::FileDescriptor[] {
           global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, 
-          global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, 
         });
     #endregion
     

src/ProtocolBuffers.Test/DescriptorsTest.cs

@@ -54,9 +54,9 @@ namespace Google.ProtocolBuffers {
       Assert.AreEqual("UnittestProto", file.Options.JavaOuterClassname);
       Assert.AreEqual("google/protobuf/unittest.proto", file.Proto.Name);
 
-// TODO(jonskeet): Either change to expect 3 dependencies, or don't emit them.
-//      Assert.AreEqual(1, file.Dependencies.Count);
-      Assert.AreEqual(UnitTestImportProtoFile.Descriptor, file.Dependencies[2]);
+// TODO(jonskeet): Either change to expect 2 dependencies, or don't emit them.
+//      Assert.AreEqual(2, file.Dependencies.Count);
+      Assert.AreEqual(UnitTestImportProtoFile.Descriptor, file.Dependencies[1]);
 
       MessageDescriptor messageType = TestAllTypes.Descriptor;
       Assert.AreEqual(messageType, file.MessageTypes[0]);

src/ProtocolBuffers.Test/ReflectionTester.cs

@@ -87,10 +87,10 @@ namespace Google.ProtocolBuffers {
       this.extensionRegistry = extensionRegistry;
 
       this.file = baseDescriptor.File;
-      // TODO(jonskeet): We've got 3 dependencies, not 1 - because of the C# options. Hmm.
+      // TODO(jonskeet): We've got 2 dependencies, not 1 - because of the C# options. Hmm.
 //      Assert.AreEqual(1, file.Dependencies.Count);
       // TODO(jonskeet): Find dependency by name instead of number?
-      this.importFile = file.Dependencies[2];
+      this.importFile = file.Dependencies[1];
 
       MessageDescriptor testAllTypes;
       if (extensionRegistry == null) {

src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs

@@ -16,17 +16,15 @@ namespace Google.ProtocolBuffers.TestProtos {
         global::System.Convert.FromBase64String(
         "CjFnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfZW1iZWRfb3B0aW1pemVfZm9y" + 
         "LnByb3RvEhFwcm90b2J1Zl91bml0dGVzdBokZ29vZ2xlL3Byb3RvYnVmL2Nz" + 
-        "aGFycF9vcHRpb25zLnByb3RvGiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRv" + 
-        "ci5wcm90bxorZ29vZ2xlL3Byb3RvYnVmL3VuaXR0ZXN0X29wdGltaXplX2Zv" + 
-        "ci5wcm90byKhAQoZVGVzdEVtYmVkT3B0aW1pemVkRm9yU2l6ZRJBChBvcHRp" + 
-        "b25hbF9tZXNzYWdlGAEgASgLMicucHJvdG9idWZfdW5pdHRlc3QuVGVzdE9w" + 
-        "dGltaXplZEZvclNpemUSQQoQcmVwZWF0ZWRfbWVzc2FnZRgCIAMoCzInLnBy" + 
-        "b3RvYnVmX3VuaXR0ZXN0LlRlc3RPcHRpbWl6ZWRGb3JTaXplQktIAcI+Rgoh" + 
-        "R29vZ2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9zEiFVbml0VGVzdEVt" + 
-        "YmVkT3B0aW1pemVGb3JQcm90b0ZpbGU="),
+        "aGFycF9vcHRpb25zLnByb3RvGitnb29nbGUvcHJvdG9idWYvdW5pdHRlc3Rf" + 
+        "b3B0aW1pemVfZm9yLnByb3RvIqEBChlUZXN0RW1iZWRPcHRpbWl6ZWRGb3JT" + 
+        "aXplEkEKEG9wdGlvbmFsX21lc3NhZ2UYASABKAsyJy5wcm90b2J1Zl91bml0" + 
+        "dGVzdC5UZXN0T3B0aW1pemVkRm9yU2l6ZRJBChByZXBlYXRlZF9tZXNzYWdl" + 
+        "GAIgAygLMicucHJvdG9idWZfdW5pdHRlc3QuVGVzdE9wdGltaXplZEZvclNp" + 
+        "emVCS0gBwj5GCiFHb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90b3MS" + 
+        "IVVuaXRUZXN0RW1iZWRPcHRpbWl6ZUZvclByb3RvRmlsZQ=="),
         new pbd::FileDescriptor[] {
           global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, 
-          global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, 
           global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor, 
         });
     #endregion

src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs

@@ -16,15 +16,13 @@ namespace Google.ProtocolBuffers.TestProtos {
         global::System.Convert.FromBase64String(
         "CiVnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfaW1wb3J0LnByb3RvEhhwcm90" + 
         "b2J1Zl91bml0dGVzdF9pbXBvcnQaJGdvb2dsZS9wcm90b2J1Zi9jc2hhcnBf" + 
-        "b3B0aW9ucy5wcm90bxogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJv" + 
-        "dG8iGgoNSW1wb3J0TWVzc2FnZRIJCgFkGAEgASgFKjwKCkltcG9ydEVudW0S" + 
-        "DgoKSU1QT1JUX0ZPTxAHEg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFa" + 
-        "EAlCWwoYY29tLmdvb2dsZS5wcm90b2J1Zi50ZXN0SAHCPjwKIUdvb2dsZS5Q" + 
-        "cm90b2NvbEJ1ZmZlcnMuVGVzdFByb3RvcxIXVW5pdFRlc3RJbXBvcnRQcm90" + 
-        "b0ZpbGU="),
+        "b3B0aW9ucy5wcm90byIaCg1JbXBvcnRNZXNzYWdlEgkKAWQYASABKAUqPAoK" + 
+        "SW1wb3J0RW51bRIOCgpJTVBPUlRfRk9PEAcSDgoKSU1QT1JUX0JBUhAIEg4K" + 
+        "CklNUE9SVF9CQVoQCUJbChhjb20uZ29vZ2xlLnByb3RvYnVmLnRlc3RIAcI+" + 
+        "PAohR29vZ2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9zEhdVbml0VGVz" + 
+        "dEltcG9ydFByb3RvRmlsZQ=="),
         new pbd::FileDescriptor[] {
           global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, 
-          global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, 
         });
     #endregion
     

src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs

@@ -16,24 +16,22 @@ namespace Google.ProtocolBuffers.TestProtos {
         global::System.Convert.FromBase64String(
         "CiNnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfbXNldC5wcm90bxIRcHJvdG9i" + 
         "dWZfdW5pdHRlc3QaJGdvb2dsZS9wcm90b2J1Zi9jc2hhcnBfb3B0aW9ucy5w" + 
-        "cm90bxogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8iHgoOVGVz" + 
-        "dE1lc3NhZ2VTZXQqCAgEEICAgIACOgIIASJRChdUZXN0TWVzc2FnZVNldENv" + 
-        "bnRhaW5lchI2CgttZXNzYWdlX3NldBgBIAEoCzIhLnByb3RvYnVmX3VuaXR0" + 
-        "ZXN0LlRlc3RNZXNzYWdlU2V0IpYBChhUZXN0TWVzc2FnZVNldEV4dGVuc2lv" + 
-        "bjESCQoBaRgPIAEoBTJvChVtZXNzYWdlX3NldF9leHRlbnNpb24SIS5wcm90" + 
-        "b2J1Zl91bml0dGVzdC5UZXN0TWVzc2FnZVNldBiwpl4gASgLMisucHJvdG9i" + 
-        "dWZfdW5pdHRlc3QuVGVzdE1lc3NhZ2VTZXRFeHRlbnNpb24xIpgBChhUZXN0" + 
-        "TWVzc2FnZVNldEV4dGVuc2lvbjISCwoDc3RyGBkgASgJMm8KFW1lc3NhZ2Vf" + 
-        "c2V0X2V4dGVuc2lvbhIhLnByb3RvYnVmX3VuaXR0ZXN0LlRlc3RNZXNzYWdl" + 
-        "U2V0GPm7XiABKAsyKy5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWVzc2FnZVNl" + 
-        "dEV4dGVuc2lvbjIibgoNUmF3TWVzc2FnZVNldBIzCgRpdGVtGAEgAygKMiUu" + 
-        "cHJvdG9idWZfdW5pdHRlc3QuUmF3TWVzc2FnZVNldC5JdGVtGigKBEl0ZW0S" + 
-        "DwoHdHlwZV9pZBgCIAIoBRIPCgdtZXNzYWdlGAMgAigMQkVIAcI+QAohR29v" + 
-        "Z2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9zEhtVbml0VGVzdE1lc3Nh" + 
-        "Z2VTZXRQcm90b0ZpbGU="),
+        "cm90byIeCg5UZXN0TWVzc2FnZVNldCoICAQQgICAgAI6AggBIlEKF1Rlc3RN" + 
+        "ZXNzYWdlU2V0Q29udGFpbmVyEjYKC21lc3NhZ2Vfc2V0GAEgASgLMiEucHJv" + 
+        "dG9idWZfdW5pdHRlc3QuVGVzdE1lc3NhZ2VTZXQilgEKGFRlc3RNZXNzYWdl" + 
+        "U2V0RXh0ZW5zaW9uMRIJCgFpGA8gASgFMm8KFW1lc3NhZ2Vfc2V0X2V4dGVu" + 
+        "c2lvbhIhLnByb3RvYnVmX3VuaXR0ZXN0LlRlc3RNZXNzYWdlU2V0GLCmXiAB" + 
+        "KAsyKy5wcm90b2J1Zl91bml0dGVzdC5UZXN0TWVzc2FnZVNldEV4dGVuc2lv" + 
+        "bjEimAEKGFRlc3RNZXNzYWdlU2V0RXh0ZW5zaW9uMhILCgNzdHIYGSABKAky" + 
+        "bwoVbWVzc2FnZV9zZXRfZXh0ZW5zaW9uEiEucHJvdG9idWZfdW5pdHRlc3Qu" + 
+        "VGVzdE1lc3NhZ2VTZXQY+bteIAEoCzIrLnByb3RvYnVmX3VuaXR0ZXN0LlRl" + 
+        "c3RNZXNzYWdlU2V0RXh0ZW5zaW9uMiJuCg1SYXdNZXNzYWdlU2V0EjMKBGl0" + 
+        "ZW0YASADKAoyJS5wcm90b2J1Zl91bml0dGVzdC5SYXdNZXNzYWdlU2V0Lkl0" + 
+        "ZW0aKAoESXRlbRIPCgd0eXBlX2lkGAIgAigFEg8KB21lc3NhZ2UYAyACKAxC" + 
+        "RUgBwj5ACiFHb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90b3MSG1Vu" + 
+        "aXRUZXN0TWVzc2FnZVNldFByb3RvRmlsZQ=="),
         new pbd::FileDescriptor[] {
           global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, 
-          global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, 
         });
     #endregion
     

src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs

@@ -16,22 +16,20 @@ namespace Google.ProtocolBuffers.TestProtos {
         global::System.Convert.FromBase64String(
         "Citnb29nbGUvcHJvdG9idWYvdW5pdHRlc3Rfb3B0aW1pemVfZm9yLnByb3Rv" + 
         "EhFwcm90b2J1Zl91bml0dGVzdBokZ29vZ2xlL3Byb3RvYnVmL2NzaGFycF9v" + 
-        "cHRpb25zLnByb3RvGiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90" + 
-        "bxoeZ29vZ2xlL3Byb3RvYnVmL3VuaXR0ZXN0LnByb3RvIpICChRUZXN0T3B0" + 
-        "aW1pemVkRm9yU2l6ZRIJCgFpGAEgASgFEi4KA21zZxgTIAEoCzIhLnByb3Rv" + 
-        "YnVmX3VuaXR0ZXN0LkZvcmVpZ25NZXNzYWdlKgkI6AcQgICAgAIyQAoOdGVz" + 
-        "dF9leHRlbnNpb24SJy5wcm90b2J1Zl91bml0dGVzdC5UZXN0T3B0aW1pemVk" + 
-        "Rm9yU2l6ZRjSCSABKAUycgoPdGVzdF9leHRlbnNpb24yEicucHJvdG9idWZf" + 
-        "dW5pdHRlc3QuVGVzdE9wdGltaXplZEZvclNpemUY0wkgASgLMi8ucHJvdG9i" + 
-        "dWZfdW5pdHRlc3QuVGVzdFJlcXVpcmVkT3B0aW1pemVkRm9yU2l6ZSIpChxU" + 
-        "ZXN0UmVxdWlyZWRPcHRpbWl6ZWRGb3JTaXplEgkKAXgYASACKAUiWgocVGVz" + 
-        "dE9wdGlvbmFsT3B0aW1pemVkRm9yU2l6ZRI6CgFvGAEgASgLMi8ucHJvdG9i" + 
-        "dWZfdW5pdHRlc3QuVGVzdFJlcXVpcmVkT3B0aW1pemVkRm9yU2l6ZUJGSALC" + 
-        "PkEKIUdvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFByb3RvcxIcVW5pdFRl" + 
-        "c3RPcHRpbWl6ZUZvclByb3RvRmlsZQ=="),
+        "cHRpb25zLnByb3RvGh5nb29nbGUvcHJvdG9idWYvdW5pdHRlc3QucHJvdG8i" + 
+        "kgIKFFRlc3RPcHRpbWl6ZWRGb3JTaXplEgkKAWkYASABKAUSLgoDbXNnGBMg" + 
+        "ASgLMiEucHJvdG9idWZfdW5pdHRlc3QuRm9yZWlnbk1lc3NhZ2UqCQjoBxCA" + 
+        "gICAAjJACg50ZXN0X2V4dGVuc2lvbhInLnByb3RvYnVmX3VuaXR0ZXN0LlRl" + 
+        "c3RPcHRpbWl6ZWRGb3JTaXplGNIJIAEoBTJyCg90ZXN0X2V4dGVuc2lvbjIS" + 
+        "Jy5wcm90b2J1Zl91bml0dGVzdC5UZXN0T3B0aW1pemVkRm9yU2l6ZRjTCSAB" + 
+        "KAsyLy5wcm90b2J1Zl91bml0dGVzdC5UZXN0UmVxdWlyZWRPcHRpbWl6ZWRG" + 
+        "b3JTaXplIikKHFRlc3RSZXF1aXJlZE9wdGltaXplZEZvclNpemUSCQoBeBgB" + 
+        "IAIoBSJaChxUZXN0T3B0aW9uYWxPcHRpbWl6ZWRGb3JTaXplEjoKAW8YASAB" + 
+        "KAsyLy5wcm90b2J1Zl91bml0dGVzdC5UZXN0UmVxdWlyZWRPcHRpbWl6ZWRG" + 
+        "b3JTaXplQkZIAsI+QQohR29vZ2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJv" + 
+        "dG9zEhxVbml0VGVzdE9wdGltaXplRm9yUHJvdG9GaWxl"),
         new pbd::FileDescriptor[] {
           global::Google.ProtocolBuffers.DescriptorProtos.CSharpOptions.Descriptor, 
-          global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.Descriptor, 
           global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor, 
         });
     #endregion