Regenerate protobuf with the right filename

For some reason we were renaming cloudevents.proto as ProtoSchema.proto, which breaks compatibility with anyone using the original file.

Renaming the reflection class is a breaking change, so I've added an obsolete compatibility class to keep compatibility.
Also updated to Google.Protobuf 3.22.0 (of the general protobuf 22.0 release; protobuf versioning is complex).

Fixes #256

Signed-off-by: Jon Skeet <[email protected]>

Author: jskeet

generate_protos.sh

@@ -4,7 +4,7 @@
 # See LICENSE file in the project root for full license information.
 
 set -e
-PROTOBUF_VERSION=3.19.3
+PROTOBUF_VERSION=22.0
 
 # Generates the classes for the protobuf event format
 
@@ -43,7 +43,7 @@ unzip -q protobuf.zip
 echo "- Downloading schema"
 # TODO: Use the 1.0.2 branch when it exists.
 mkdir cloudevents
-curl -sSL https://raw.githubusercontent.com/cloudevents/spec/main/cloudevents/formats/cloudevents.proto -o cloudevents/ProtoSchema.proto
+curl -sSL https://raw.githubusercontent.com/cloudevents/spec/main/cloudevents/formats/cloudevents.proto -o cloudevents/cloudevents.proto
 
 cd ..
 
@@ -53,7 +53,7 @@ $PROTOC \
   -I tmp/cloudevents \
   --csharp_out=src/CloudNative.CloudEvents.Protobuf \
   --csharp_opt=file_extension=.g.cs \
-  tmp/cloudevents/ProtoSchema.proto
+  tmp/cloudevents/cloudevents.proto
 
 # Test protos
 $PROTOC \

src/CloudNative.CloudEvents.Protobuf/CloudNative.CloudEvents.Protobuf.csproj

@@ -4,12 +4,12 @@
 	<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
 	<Description>Support for the Protobuf event format in for CloudNative.CloudEvents</Description>
 	<PackageTags>cncf;cloudnative;cloudevents;events;protobuf</PackageTags>
-	<LangVersion>8.0</LangVersion>
+	<LangVersion>10.0</LangVersion>
 	<Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.19.3" />
+    <PackageReference Include="Google.Protobuf" Version="3.22.0" />
 
     <!-- Be explicit about not including these files in the package. -->
     <None Include="README.md" />

src/CloudNative.CloudEvents.Protobuf/ProtoSchema.g.cs renamed to src/CloudNative.CloudEvents.Protobuf/Cloudevents.g.cs

@@ -1,8 +1,8 @@
 // <auto-generated>
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: ProtoSchema.proto
+//     source: cloudevents.proto
 // </auto-generated>
-#pragma warning disable 1591, 0612, 3021
+#pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
 
 using pb = global::Google.Protobuf;
@@ -11,20 +11,20 @@
 using scg = global::System.Collections.Generic;
 namespace CloudNative.CloudEvents.V1 {
 
-  /// <summary>Holder for reflection information generated from ProtoSchema.proto</summary>
-  public static partial class ProtoSchemaReflection {
+  /// <summary>Holder for reflection information generated from cloudevents.proto</summary>
+  public static partial class CloudeventsReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for ProtoSchema.proto</summary>
+    /// <summary>File descriptor for cloudevents.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
     private static pbr::FileDescriptor descriptor;
 
-    static ProtoSchemaReflection() {
+    static CloudeventsReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChFQcm90b1NjaGVtYS5wcm90bxIRaW8uY2xvdWRldmVudHMudjEaGWdvb2ds",
+            "ChFjbG91ZGV2ZW50cy5wcm90bxIRaW8uY2xvdWRldmVudHMudjEaGWdvb2ds",
             "ZS9wcm90b2J1Zi9hbnkucHJvdG8aH2dvb2dsZS9wcm90b2J1Zi90aW1lc3Rh",
             "bXAucHJvdG8isAQKCkNsb3VkRXZlbnQSCgoCaWQYASABKAkSDgoGc291cmNl",
             "GAIgASgJEhQKDHNwZWNfdmVyc2lvbhgDIAEoCRIMCgR0eXBlGAQgASgJEkEK",
@@ -69,7 +69,7 @@ public sealed partial class CloudEvent : pb::IMessage<CloudEvent>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::CloudNative.CloudEvents.V1.ProtoSchemaReflection.Descriptor.MessageTypes[0]; }
+      get { return global::CloudNative.CloudEvents.V1.CloudeventsReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -423,7 +423,7 @@ public void MergeFrom(CloudEvent other) {
       if (other.Type.Length != 0) {
         Type = other.Type;
       }
-      attributes_.Add(other.attributes_);
+      attributes_.MergeFrom(other.attributes_);
       switch (other.DataCase) {
         case DataOneofCase.BinaryData:
           BinaryData = other.BinaryData;
@@ -1044,7 +1044,7 @@ public sealed partial class CloudEventBatch : pb::IMessage<CloudEventBatch>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::CloudNative.CloudEvents.V1.ProtoSchemaReflection.Descriptor.MessageTypes[1]; }
+      get { return global::CloudNative.CloudEvents.V1.CloudeventsReflection.Descriptor.MessageTypes[1]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]

src/CloudNative.CloudEvents.Protobuf/ProtoSchemaReflection.cs

@@ -0,0 +1,23 @@
+// Copyright 2023 Cloud Native Foundation.
+// Licensed under the Apache 2.0 license.
+// See LICENSE file in the project root for full license information.
+
+using CloudNative.CloudEvents.V1;
+using Google.Protobuf.Reflection;
+using System;
+
+namespace CloudNative.CloudEvents.V1;
+
+/// <summary>
+/// Access to reflection information for the CloudEvents protobuf schema.
+/// </summary>
+/// <remarks>
+/// This class exists for backward-compatibility, when the protobuf messages
+/// were generated with a file named ProtoSchema.proto instead of cloudevents.proto.
+/// </remarks>
+[Obsolete($"Use {nameof(CloudeventsReflection)} instead.")]
+public class ProtoSchemaReflection
+{
+    /// <summary>File descriptor for cloudevents.proto</summary>
+    public static FileDescriptor Descriptor => CloudeventsReflection.Descriptor;
+}

test/CloudNative.CloudEvents.UnitTests/Protobuf/CompatibilityTest.cs

@@ -0,0 +1,19 @@
+// Copyright 2023 Cloud Native Foundation. 
+// Licensed under the Apache 2.0 license.
+// See LICENSE file in the project root for full license information.
+
+using CloudNative.CloudEvents.V1;
+using Xunit;
+
+namespace CloudNative.CloudEvents.UnitTests.Protobuf;
+
+public class CompatibilityTest
+{
+    [Fact]
+    public void ProtoSchemaReflectionEquivalence()
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        Assert.Same(CloudeventsReflection.Descriptor, ProtoSchemaReflection.Descriptor);
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+}

test/CloudNative.CloudEvents.UnitTests/Protobuf/TestMessages.g.cs

@@ -2,7 +2,7 @@
 //     Generated by the protocol buffer compiler.  DO NOT EDIT!
 //     source: test_messages.proto
 // </auto-generated>
-#pragma warning disable 1591, 0612, 3021
+#pragma warning disable 1591, 0612, 3021, 8981
 #region Designer generated code
 
 using pb = global::Google.Protobuf;