1 files changed, 29 insertions, 7 deletions

diff --git a/src/ProtoGen/UmbrellaClassGenerator.cs b/src/ProtoGen/UmbrellaClassGenerator.cs
index cdc275c6..e1bbee5d 100644
--- a/src/ProtoGen/UmbrellaClassGenerator.cs
+++ b/src/ProtoGen/UmbrellaClassGenerator.cs
@@ -74,10 +74,6 @@ namespace Google.ProtocolBuffers.ProtoGen {
       return false;
     }
 
-    public string UmbrellaClassName {
-      get { throw new NotImplementedException(); }
-    }
-
     public void Generate(TextGenerator writer) {
       WriteIntroduction(writer);
       WriteExtensionRegistration(writer);
@@ -87,7 +83,11 @@ namespace Google.ProtocolBuffers.ProtoGen {
         new MessageGenerator(message).GenerateStaticVariables(writer);
       }
       writer.WriteLine("#endregion");
-      WriteDescriptor(writer);
+      if (!UseLiteRuntime) {
+        WriteDescriptor(writer);
+      } else {
+        WriteLiteExtensions(writer);
+      }
       // The class declaration either gets closed before or after the children are written.
       if (!Descriptor.CSharpOptions.NestClasses) {
         writer.Outdent();
@@ -113,9 +113,12 @@ namespace Google.ProtocolBuffers.ProtoGen {
     }
 
     private void WriteIntroduction(TextGenerator writer) {
-      writer.WriteLine("// Generated by the protocol buffer compiler.  DO NOT EDIT!");
+      writer.WriteLine("// Generated by {0}.  DO NOT EDIT!", this.GetType().Assembly.FullName);
       writer.WriteLine();
-      Helpers.WriteNamespaces(writer);
+      writer.WriteLine("using pb = global::Google.ProtocolBuffers;");
+      writer.WriteLine("using pbc = global::Google.ProtocolBuffers.Collections;");
+      writer.WriteLine("using pbd = global::Google.ProtocolBuffers.Descriptors;");
+      writer.WriteLine("using scg = global::System.Collections.Generic;");
 
       if (Descriptor.CSharpOptions.Namespace != "") {
         writer.WriteLine("namespace {0} {{", Descriptor.CSharpOptions.Namespace);
@@ -215,5 +218,24 @@ namespace Google.ProtocolBuffers.ProtoGen {
       writer.WriteLine("#endregion");
       writer.WriteLine();
     }
+
+    private void WriteLiteExtensions(TextGenerator writer) {
+      writer.WriteLine("#region Extensions");
+      writer.WriteLine("internal static readonly object Descriptor;");
+      writer.WriteLine("static {0}() {{", Descriptor.CSharpOptions.UmbrellaClassname);
+      writer.Indent();
+      writer.WriteLine("Descriptor = null;");
+
+      foreach (MessageDescriptor message in Descriptor.MessageTypes) {
+        new MessageGenerator(message).GenerateStaticVariableInitializers(writer);
+      }
+      foreach (FieldDescriptor extension in Descriptor.Extensions) {
+        new ExtensionGenerator(extension).GenerateStaticVariableInitializers(writer);
+      }
+      writer.Outdent();
+      writer.WriteLine("}");
+      writer.WriteLine("#endregion");
+      writer.WriteLine();
+    }
   }
 }