diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_code.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_code.verified.proto index 5824d66..e1d6f13 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_code.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_code.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message FooExecuted { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_enums.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_enums.verified.proto index 399b98c..7ab18f9 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_enums.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_enums.verified.proto @@ -1,12 +1,14 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; enum Foo { option allow_alias = true; - Default = 0; - Bar = -2; - Baz = -1; - Alias = 0; + Foo_Default = 0; + Foo_Bar = -2; + Foo_Baz = -1; + Foo_Alias = 0; } diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_message_with_prefix.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_message_with_prefix.verified.proto index cef7344..a684911 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_message_with_prefix.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_message_with_prefix.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message Abc { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_name_with_correct_order.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_name_with_correct_order.verified.proto index 0882d34..840ab42 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_name_with_correct_order.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_nested_name_with_correct_order.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message Abc { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_packed_members.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_packed_members.verified.proto index d83dfd8..b42c2bc 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_packed_members.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_packed_members.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message FooExecuted { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_reservations.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_reservations.verified.proto index 69bb2a9..93429e0 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_reservations.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_reservations.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message MsgA { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_simple_enums.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_simple_enums.verified.proto index 366ed48..09b4e3a 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_simple_enums.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_generate_simple_enums.verified.proto @@ -1,9 +1,11 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; enum Foo { - Default = 0; - Bar = -2; + Foo_Default = 0; + Foo_Bar = -2; } diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_deprecated_fields.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_deprecated_fields.verified.proto index 051fb88..bd1597e 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_deprecated_fields.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_deprecated_fields.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message FooExecuted { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_message_inheritance.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_message_inheritance.verified.proto index 885b6fc..217f14f 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_message_inheritance.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_handle_message_inheritance.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message MsgA { diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_reference_sub_type_with_correct_name.verified.proto b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_reference_sub_type_with_correct_name.verified.proto index 3ed3615..403114f 100644 --- a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_reference_sub_type_with_correct_name.verified.proto +++ b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/Snapshots/ProtoGeneratorTests.should_reference_sub_type_with_correct_name.verified.proto @@ -1,6 +1,8 @@  // Generated by Abc.Zebus.MessageDsl v1.2.3.4 +syntax = "proto2"; + import "servicebus.proto"; message Msg { diff --git a/src/Abc.Zebus.MessageDsl/Generator/ProtoGenerator.cs b/src/Abc.Zebus.MessageDsl/Generator/ProtoGenerator.cs index 8b2a4ab..7283342 100644 --- a/src/Abc.Zebus.MessageDsl/Generator/ProtoGenerator.cs +++ b/src/Abc.Zebus.MessageDsl/Generator/ProtoGenerator.cs @@ -47,6 +47,8 @@ private void WriteHeader() Writer.WriteLine(); Writer.WriteLine("// Generated by {0} v{1}", GeneratorName, GeneratorVersion); Writer.WriteLine(); + Writer.WriteLine("syntax = \"proto2\";"); + Writer.WriteLine(); var requiresBclPackage = Contracts.Messages .SelectMany(msg => msg.Parameters) @@ -75,7 +77,7 @@ private void WriteEnum(EnumDefinition enumDef) Writer.WriteLine("option allow_alias = true;"); foreach (var member in enumDef.Members) - Writer.WriteLine("{0} = {1};", member.Name, member.InferredValueAsNumber ?? "TODO"); + Writer.WriteLine($"{enumDef.Name}_{member.Name} = {member.InferredValueAsNumber ?? "TODO"};"); } }