diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e67248db..b3a23445 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,14 +19,14 @@ jobs: with: submodules: true - # Build with .NET 8.0 SDK - # Test with .NET 6.0 and 8.0 - - name: Setup .NET 6.0 and 8.0 - uses: actions/setup-dotnet@v3 + # Build with .NET 10.0 SDK + # Test with .NET 8.0 and 10.0 + - name: Setup .NET 8.0 and 10.0 + uses: actions/setup-dotnet@v5.2.0 with: dotnet-version: | 8.0.x - 6.0.x + 10.0.x - name: Build run: | diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index a5e84000..f4109e7f 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -17,14 +17,14 @@ jobs: with: submodules: true - # Build with .NET 8.0 SDK - # Test with .NET 6.0 and 8.0 - - name: Setup .NET 6.0 and 8.0 - uses: actions/setup-dotnet@v3 + # Build with .NET 10.0 SDK + # Test with .NET 8.0 and 10.0 + - name: Setup .NET 8.0 and 10.0 + uses: actions/setup-dotnet@v5.2.0 with: dotnet-version: | 8.0.x - 6.0.x + 10.0.x - name: Build run: | diff --git a/CloudEvents.sln b/CloudEvents.sln deleted file mode 100644 index 530452ab..00000000 --- a/CloudEvents.sln +++ /dev/null @@ -1,254 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32112.339 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents", "src\CloudNative.CloudEvents\CloudNative.CloudEvents.csproj", "{C5DC9F44-7C03-4A70-80EF-7A29696455EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.UnitTests", "test\CloudNative.CloudEvents.UnitTests\CloudNative.CloudEvents.UnitTests.csproj", "{95215090-BDE3-4628-9261-64B91FBE4665}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3C6E118F-05CA-41BA-B21E-4E17863F5826}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - appveyor.yml = appveyor.yml - LICENSE = LICENSE - README.md = README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpSend", "samples\HttpSend\HttpSend.csproj", "{F1B9B769-DB6B-481F-905C-24FE3B12E00E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.Mqtt", "src\CloudNative.CloudEvents.Mqtt\CloudNative.CloudEvents.Mqtt.csproj", "{FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.Amqp", "src\CloudNative.CloudEvents.Amqp\CloudNative.CloudEvents.Amqp.csproj", "{39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.Kafka", "src\CloudNative.CloudEvents.Kafka\CloudNative.CloudEvents.Kafka.csproj", "{193D6D9D-C1A0-459E-86CF-F207CDF0FC73}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.AspNetCore", "src\CloudNative.CloudEvents.AspNetCore\CloudNative.CloudEvents.AspNetCore.csproj", "{C726DD78-2D56-48D3-928A-D10226E3750B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.AspNetCoreSample", "samples\CloudNative.CloudEvents.AspNetCoreSample\CloudNative.CloudEvents.AspNetCoreSample.csproj", "{9760D744-D1BF-40E3-BD6F-7F639BFB9188}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.IntegrationTests", "test\CloudNative.CloudEvents.IntegrationTests\CloudNative.CloudEvents.IntegrationTests.csproj", "{9639E4FD-0438-4901-B57F-EFF773B19D5A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.Avro", "src\CloudNative.CloudEvents.Avro\CloudNative.CloudEvents.Avro.csproj", "{E4BE54BF-F4D7-495F-9278-07E5A8C79935}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.NewtonsoftJson", "src\CloudNative.CloudEvents.NewtonsoftJson\CloudNative.CloudEvents.NewtonsoftJson.csproj", "{9DC17081-21D8-4123-8650-D97C2153DB8C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.SystemTextJson", "src\CloudNative.CloudEvents.SystemTextJson\CloudNative.CloudEvents.SystemTextJson.csproj", "{FACB3EF2-F078-479A-A91C-719894CB66BF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudNative.CloudEvents.Protobuf", "src\CloudNative.CloudEvents.Protobuf\CloudNative.CloudEvents.Protobuf.csproj", "{9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "conformance", "conformance", "{8CCC98B3-1776-49FF-96D6-947A9E5DFB0A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "format", "format", "{A5906FBA-D73A-4A09-8539-CB10D7B586AE}" - ProjectSection(SolutionItems) = preProject - conformance\format\README.md = conformance\format\README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "json", "json", "{D8055631-E6BB-4CD2-8162-F674D6D30E76}" - ProjectSection(SolutionItems) = preProject - conformance\format\json\invalid-batches.json = conformance\format\json\invalid-batches.json - conformance\format\json\invalid-events.json = conformance\format\json\invalid-events.json - conformance\format\json\README.md = conformance\format\json\README.md - conformance\format\json\valid-batches.json = conformance\format\json\valid-batches.json - conformance\format\json\valid-events.json = conformance\format\json\valid-events.json - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "protobuf", "protobuf", "{119AD438-878B-4383-BC9F-779F1605E711}" - ProjectSection(SolutionItems) = preProject - conformance\format\protobuf\conformance_tests.proto = conformance\format\protobuf\conformance_tests.proto - conformance\format\protobuf\invalid-batches.json = conformance\format\protobuf\invalid-batches.json - conformance\format\protobuf\invalid-events.json = conformance\format\protobuf\invalid-events.json - conformance\format\protobuf\README.md = conformance\format\protobuf\README.md - conformance\format\protobuf\valid-batches.json = conformance\format\protobuf\valid-batches.json - conformance\format\protobuf\valid-events.json = conformance\format\protobuf\valid-events.json - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xml", "xml", "{4012C753-68DE-4737-936F-F5DBC485C51B}" - ProjectSection(SolutionItems) = preProject - conformance\format\xml\invalid-batches.xml = conformance\format\xml\invalid-batches.xml - conformance\format\xml\invalid-events.xml = conformance\format\xml\invalid-events.xml - conformance\format\xml\README.md = conformance\format\xml\README.md - conformance\format\xml\valid-batches.xml = conformance\format\xml\valid-batches.xml - conformance\format\xml\valid-events.xml = conformance\format\xml\valid-events.xml - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Debug|x64.ActiveCfg = Debug|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Debug|x64.Build.0 = Debug|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Debug|x86.ActiveCfg = Debug|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Debug|x86.Build.0 = Debug|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Release|Any CPU.Build.0 = Release|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Release|x64.ActiveCfg = Release|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Release|x64.Build.0 = Release|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Release|x86.ActiveCfg = Release|Any CPU - {C5DC9F44-7C03-4A70-80EF-7A29696455EB}.Release|x86.Build.0 = Release|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Debug|x64.ActiveCfg = Debug|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Debug|x64.Build.0 = Debug|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Debug|x86.ActiveCfg = Debug|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Debug|x86.Build.0 = Debug|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Release|Any CPU.Build.0 = Release|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Release|x64.ActiveCfg = Release|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Release|x64.Build.0 = Release|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Release|x86.ActiveCfg = Release|Any CPU - {95215090-BDE3-4628-9261-64B91FBE4665}.Release|x86.Build.0 = Release|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Debug|x64.ActiveCfg = Debug|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Debug|x64.Build.0 = Debug|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Debug|x86.ActiveCfg = Debug|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Debug|x86.Build.0 = Debug|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Release|Any CPU.Build.0 = Release|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Release|x64.ActiveCfg = Release|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Release|x64.Build.0 = Release|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Release|x86.ActiveCfg = Release|Any CPU - {F1B9B769-DB6B-481F-905C-24FE3B12E00E}.Release|x86.Build.0 = Release|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Debug|x64.ActiveCfg = Debug|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Debug|x64.Build.0 = Debug|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Debug|x86.ActiveCfg = Debug|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Debug|x86.Build.0 = Debug|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Release|Any CPU.Build.0 = Release|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Release|x64.ActiveCfg = Release|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Release|x64.Build.0 = Release|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Release|x86.ActiveCfg = Release|Any CPU - {FBF5EF1F-FBF7-4D3C-B309-3344C74714AF}.Release|x86.Build.0 = Release|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Debug|x64.ActiveCfg = Debug|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Debug|x64.Build.0 = Debug|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Debug|x86.ActiveCfg = Debug|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Debug|x86.Build.0 = Debug|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Release|Any CPU.Build.0 = Release|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Release|x64.ActiveCfg = Release|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Release|x64.Build.0 = Release|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Release|x86.ActiveCfg = Release|Any CPU - {39EF4DB0-9890-4CAD-A36E-F7E25D2E72EF}.Release|x86.Build.0 = Release|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Debug|x64.ActiveCfg = Debug|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Debug|x64.Build.0 = Debug|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Debug|x86.ActiveCfg = Debug|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Debug|x86.Build.0 = Debug|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Release|Any CPU.Build.0 = Release|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Release|x64.ActiveCfg = Release|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Release|x64.Build.0 = Release|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Release|x86.ActiveCfg = Release|Any CPU - {193D6D9D-C1A0-459E-86CF-F207CDF0FC73}.Release|x86.Build.0 = Release|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Debug|x64.ActiveCfg = Debug|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Debug|x64.Build.0 = Debug|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Debug|x86.ActiveCfg = Debug|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Debug|x86.Build.0 = Debug|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Release|Any CPU.Build.0 = Release|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Release|x64.ActiveCfg = Release|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Release|x64.Build.0 = Release|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Release|x86.ActiveCfg = Release|Any CPU - {C726DD78-2D56-48D3-928A-D10226E3750B}.Release|x86.Build.0 = Release|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Debug|x64.ActiveCfg = Debug|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Debug|x64.Build.0 = Debug|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Debug|x86.ActiveCfg = Debug|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Debug|x86.Build.0 = Debug|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Release|Any CPU.Build.0 = Release|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Release|x64.ActiveCfg = Release|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Release|x64.Build.0 = Release|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Release|x86.ActiveCfg = Release|Any CPU - {9760D744-D1BF-40E3-BD6F-7F639BFB9188}.Release|x86.Build.0 = Release|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Debug|x64.ActiveCfg = Debug|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Debug|x64.Build.0 = Debug|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Debug|x86.ActiveCfg = Debug|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Debug|x86.Build.0 = Debug|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Release|Any CPU.Build.0 = Release|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Release|x64.ActiveCfg = Release|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Release|x64.Build.0 = Release|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Release|x86.ActiveCfg = Release|Any CPU - {9639E4FD-0438-4901-B57F-EFF773B19D5A}.Release|x86.Build.0 = Release|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Debug|x64.ActiveCfg = Debug|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Debug|x64.Build.0 = Debug|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Debug|x86.ActiveCfg = Debug|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Debug|x86.Build.0 = Debug|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Release|Any CPU.Build.0 = Release|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Release|x64.ActiveCfg = Release|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Release|x64.Build.0 = Release|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Release|x86.ActiveCfg = Release|Any CPU - {E4BE54BF-F4D7-495F-9278-07E5A8C79935}.Release|x86.Build.0 = Release|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Debug|x64.ActiveCfg = Debug|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Debug|x64.Build.0 = Debug|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Debug|x86.ActiveCfg = Debug|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Debug|x86.Build.0 = Debug|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Release|Any CPU.Build.0 = Release|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Release|x64.ActiveCfg = Release|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Release|x64.Build.0 = Release|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Release|x86.ActiveCfg = Release|Any CPU - {9DC17081-21D8-4123-8650-D97C2153DB8C}.Release|x86.Build.0 = Release|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Debug|x64.ActiveCfg = Debug|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Debug|x64.Build.0 = Debug|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Debug|x86.ActiveCfg = Debug|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Debug|x86.Build.0 = Debug|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Release|Any CPU.Build.0 = Release|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Release|x64.ActiveCfg = Release|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Release|x64.Build.0 = Release|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Release|x86.ActiveCfg = Release|Any CPU - {FACB3EF2-F078-479A-A91C-719894CB66BF}.Release|x86.Build.0 = Release|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Debug|x64.ActiveCfg = Debug|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Debug|x64.Build.0 = Debug|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Debug|x86.ActiveCfg = Debug|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Debug|x86.Build.0 = Debug|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Release|Any CPU.Build.0 = Release|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Release|x64.ActiveCfg = Release|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Release|x64.Build.0 = Release|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Release|x86.ActiveCfg = Release|Any CPU - {9D82AC2B-0075-4161-AE0E-4A6629C9FF2A}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {A5906FBA-D73A-4A09-8539-CB10D7B586AE} = {8CCC98B3-1776-49FF-96D6-947A9E5DFB0A} - {D8055631-E6BB-4CD2-8162-F674D6D30E76} = {A5906FBA-D73A-4A09-8539-CB10D7B586AE} - {119AD438-878B-4383-BC9F-779F1605E711} = {A5906FBA-D73A-4A09-8539-CB10D7B586AE} - {4012C753-68DE-4737-936F-F5DBC485C51B} = {A5906FBA-D73A-4A09-8539-CB10D7B586AE} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F77A454C-CC17-4AD6-823A-64E1A94FDA0A} - EndGlobalSection -EndGlobal diff --git a/CloudEvents.slnx b/CloudEvents.slnx new file mode 100644 index 00000000..9ba3c9ae --- /dev/null +++ b/CloudEvents.slnx @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props index 89ed2d5e..fd7c6478 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/generate_protos.sh b/generate_protos.sh index 8c6bd734..9d91b3ea 100644 --- a/generate_protos.sh +++ b/generate_protos.sh @@ -4,7 +4,7 @@ # See LICENSE file in the project root for full license information. set -e -PROTOBUF_VERSION=22.0 +PROTOBUF_VERSION=34.0 # Generates the classes for the protobuf event format diff --git a/global.json b/global.json index b61e1fb9..7c4d4e92 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", + "version": "10.0.201", "allowPrerelease": false, "rollForward": "latestMinor" } diff --git a/samples/CloudNative.CloudEvents.AspNetCoreSample/CloudNative.CloudEvents.AspNetCoreSample.csproj b/samples/CloudNative.CloudEvents.AspNetCoreSample/CloudNative.CloudEvents.AspNetCoreSample.csproj index 1bc34728..62558207 100644 --- a/samples/CloudNative.CloudEvents.AspNetCoreSample/CloudNative.CloudEvents.AspNetCoreSample.csproj +++ b/samples/CloudNative.CloudEvents.AspNetCoreSample/CloudNative.CloudEvents.AspNetCoreSample.csproj @@ -1,7 +1,7 @@ - + - net6.0 + net10.0 diff --git a/samples/HttpSend/HttpSend.csproj b/samples/HttpSend/HttpSend.csproj index ccb54bd8..e7200cc6 100644 --- a/samples/HttpSend/HttpSend.csproj +++ b/samples/HttpSend/HttpSend.csproj @@ -1,8 +1,8 @@ - + Exe - net6.0 + net10.0 diff --git a/samples/README.md b/samples/README.md index cf73e16e..2e7c4408 100644 --- a/samples/README.md +++ b/samples/README.md @@ -10,7 +10,7 @@ This directory contains a sample ASP.NET Core application that exposes two endpo To run the sample, execute the `dotnet run` command in the `CloudNative.CloudEvents.AspNetCoreSample` directory. ```shell -dotnet run --framework net6.0 +dotnet run --framework net8.0 ``` After running the web service using the command above, there are three strategies for sending requests to the web service. @@ -20,7 +20,7 @@ After running the web service using the command above, there are three strategie The `HttpSend` project provides a CLI tool for sending requests to the `/api/events/receive` endpoint exposed by the service. To use the tool, navigate to the `HttpSend` directory and execute the following command: ```shell -dotnet run --framework net6.0 --url https://localhost:5001/api/events/receive +dotnet run --framework net8.0 --url https://localhost:5001/api/events/receive ``` ### Using the `.http` file diff --git a/src/CloudNative.CloudEvents.Protobuf/Cloudevents.g.cs b/src/CloudNative.CloudEvents.Protobuf/Cloudevents.g.cs index e46f9cbe..4a043097 100644 --- a/src/CloudNative.CloudEvents.Protobuf/Cloudevents.g.cs +++ b/src/CloudNative.CloudEvents.Protobuf/Cloudevents.g.cs @@ -55,6 +55,7 @@ static CloudeventsReflection() { } #region Messages + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class CloudEvent : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -188,24 +189,52 @@ public string Type { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pb::ByteString BinaryData { - get { return dataCase_ == DataOneofCase.BinaryData ? (pb::ByteString) data_ : pb::ByteString.Empty; } + get { return HasBinaryData ? (pb::ByteString) data_ : pb::ByteString.Empty; } set { data_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); dataCase_ = DataOneofCase.BinaryData; } } + /// Gets whether the "binary_data" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasBinaryData { + get { return dataCase_ == DataOneofCase.BinaryData; } + } + /// Clears the value of the oneof if it's currently set to "binary_data" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearBinaryData() { + if (HasBinaryData) { + ClearData(); + } + } /// Field number for the "text_data" field. public const int TextDataFieldNumber = 7; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public string TextData { - get { return dataCase_ == DataOneofCase.TextData ? (string) data_ : ""; } + get { return HasTextData ? (string) data_ : ""; } set { data_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); dataCase_ = DataOneofCase.TextData; } } + /// Gets whether the "text_data" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasTextData { + get { return dataCase_ == DataOneofCase.TextData; } + } + /// Clears the value of the oneof if it's currently set to "text_data" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearTextData() { + if (HasTextData) { + ClearData(); + } + } /// Field number for the "proto_data" field. public const int ProtoDataFieldNumber = 8; @@ -277,8 +306,8 @@ public override int GetHashCode() { if (SpecVersion.Length != 0) hash ^= SpecVersion.GetHashCode(); if (Type.Length != 0) hash ^= Type.GetHashCode(); hash ^= Attributes.GetHashCode(); - if (dataCase_ == DataOneofCase.BinaryData) hash ^= BinaryData.GetHashCode(); - if (dataCase_ == DataOneofCase.TextData) hash ^= TextData.GetHashCode(); + if (HasBinaryData) hash ^= BinaryData.GetHashCode(); + if (HasTextData) hash ^= TextData.GetHashCode(); if (dataCase_ == DataOneofCase.ProtoData) hash ^= ProtoData.GetHashCode(); hash ^= (int) dataCase_; if (_unknownFields != null) { @@ -316,11 +345,11 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteString(Type); } attributes_.WriteTo(output, _map_attributes_codec); - if (dataCase_ == DataOneofCase.BinaryData) { + if (HasBinaryData) { output.WriteRawTag(50); output.WriteBytes(BinaryData); } - if (dataCase_ == DataOneofCase.TextData) { + if (HasTextData) { output.WriteRawTag(58); output.WriteString(TextData); } @@ -355,11 +384,11 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteString(Type); } attributes_.WriteTo(ref output, _map_attributes_codec); - if (dataCase_ == DataOneofCase.BinaryData) { + if (HasBinaryData) { output.WriteRawTag(50); output.WriteBytes(BinaryData); } - if (dataCase_ == DataOneofCase.TextData) { + if (HasTextData) { output.WriteRawTag(58); output.WriteString(TextData); } @@ -390,10 +419,10 @@ public int CalculateSize() { size += 1 + pb::CodedOutputStream.ComputeStringSize(Type); } size += attributes_.CalculateSize(_map_attributes_codec); - if (dataCase_ == DataOneofCase.BinaryData) { + if (HasBinaryData) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(BinaryData); } - if (dataCase_ == DataOneofCase.TextData) { + if (HasTextData) { size += 1 + pb::CodedOutputStream.ComputeStringSize(TextData); } if (dataCase_ == DataOneofCase.ProtoData) { @@ -450,7 +479,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -502,7 +535,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; @@ -553,6 +590,7 @@ public void MergeFrom(pb::CodedInputStream input) { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static partial class Types { + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class CloudEventAttributeValue : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -625,72 +663,156 @@ public CloudEventAttributeValue Clone() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public bool CeBoolean { - get { return attrCase_ == AttrOneofCase.CeBoolean ? (bool) attr_ : false; } + get { return HasCeBoolean ? (bool) attr_ : false; } set { attr_ = value; attrCase_ = AttrOneofCase.CeBoolean; } } + /// Gets whether the "ce_boolean" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasCeBoolean { + get { return attrCase_ == AttrOneofCase.CeBoolean; } + } + /// Clears the value of the oneof if it's currently set to "ce_boolean" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearCeBoolean() { + if (HasCeBoolean) { + ClearAttr(); + } + } /// Field number for the "ce_integer" field. public const int CeIntegerFieldNumber = 2; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CeInteger { - get { return attrCase_ == AttrOneofCase.CeInteger ? (int) attr_ : 0; } + get { return HasCeInteger ? (int) attr_ : 0; } set { attr_ = value; attrCase_ = AttrOneofCase.CeInteger; } } + /// Gets whether the "ce_integer" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasCeInteger { + get { return attrCase_ == AttrOneofCase.CeInteger; } + } + /// Clears the value of the oneof if it's currently set to "ce_integer" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearCeInteger() { + if (HasCeInteger) { + ClearAttr(); + } + } /// Field number for the "ce_string" field. public const int CeStringFieldNumber = 3; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public string CeString { - get { return attrCase_ == AttrOneofCase.CeString ? (string) attr_ : ""; } + get { return HasCeString ? (string) attr_ : ""; } set { attr_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); attrCase_ = AttrOneofCase.CeString; } } + /// Gets whether the "ce_string" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasCeString { + get { return attrCase_ == AttrOneofCase.CeString; } + } + /// Clears the value of the oneof if it's currently set to "ce_string" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearCeString() { + if (HasCeString) { + ClearAttr(); + } + } /// Field number for the "ce_bytes" field. public const int CeBytesFieldNumber = 4; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public pb::ByteString CeBytes { - get { return attrCase_ == AttrOneofCase.CeBytes ? (pb::ByteString) attr_ : pb::ByteString.Empty; } + get { return HasCeBytes ? (pb::ByteString) attr_ : pb::ByteString.Empty; } set { attr_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); attrCase_ = AttrOneofCase.CeBytes; } } + /// Gets whether the "ce_bytes" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasCeBytes { + get { return attrCase_ == AttrOneofCase.CeBytes; } + } + /// Clears the value of the oneof if it's currently set to "ce_bytes" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearCeBytes() { + if (HasCeBytes) { + ClearAttr(); + } + } /// Field number for the "ce_uri" field. public const int CeUriFieldNumber = 5; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public string CeUri { - get { return attrCase_ == AttrOneofCase.CeUri ? (string) attr_ : ""; } + get { return HasCeUri ? (string) attr_ : ""; } set { attr_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); attrCase_ = AttrOneofCase.CeUri; } } + /// Gets whether the "ce_uri" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasCeUri { + get { return attrCase_ == AttrOneofCase.CeUri; } + } + /// Clears the value of the oneof if it's currently set to "ce_uri" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearCeUri() { + if (HasCeUri) { + ClearAttr(); + } + } /// Field number for the "ce_uri_ref" field. public const int CeUriRefFieldNumber = 6; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public string CeUriRef { - get { return attrCase_ == AttrOneofCase.CeUriRef ? (string) attr_ : ""; } + get { return HasCeUriRef ? (string) attr_ : ""; } set { attr_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); attrCase_ = AttrOneofCase.CeUriRef; } } + /// Gets whether the "ce_uri_ref" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasCeUriRef { + get { return attrCase_ == AttrOneofCase.CeUriRef; } + } + /// Clears the value of the oneof if it's currently set to "ce_uri_ref" + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearCeUriRef() { + if (HasCeUriRef) { + ClearAttr(); + } + } /// Field number for the "ce_timestamp" field. public const int CeTimestampFieldNumber = 7; @@ -760,12 +882,12 @@ public bool Equals(CloudEventAttributeValue other) { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (attrCase_ == AttrOneofCase.CeBoolean) hash ^= CeBoolean.GetHashCode(); - if (attrCase_ == AttrOneofCase.CeInteger) hash ^= CeInteger.GetHashCode(); - if (attrCase_ == AttrOneofCase.CeString) hash ^= CeString.GetHashCode(); - if (attrCase_ == AttrOneofCase.CeBytes) hash ^= CeBytes.GetHashCode(); - if (attrCase_ == AttrOneofCase.CeUri) hash ^= CeUri.GetHashCode(); - if (attrCase_ == AttrOneofCase.CeUriRef) hash ^= CeUriRef.GetHashCode(); + if (HasCeBoolean) hash ^= CeBoolean.GetHashCode(); + if (HasCeInteger) hash ^= CeInteger.GetHashCode(); + if (HasCeString) hash ^= CeString.GetHashCode(); + if (HasCeBytes) hash ^= CeBytes.GetHashCode(); + if (HasCeUri) hash ^= CeUri.GetHashCode(); + if (HasCeUriRef) hash ^= CeUriRef.GetHashCode(); if (attrCase_ == AttrOneofCase.CeTimestamp) hash ^= CeTimestamp.GetHashCode(); hash ^= (int) attrCase_; if (_unknownFields != null) { @@ -786,27 +908,27 @@ public void WriteTo(pb::CodedOutputStream output) { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (attrCase_ == AttrOneofCase.CeBoolean) { + if (HasCeBoolean) { output.WriteRawTag(8); output.WriteBool(CeBoolean); } - if (attrCase_ == AttrOneofCase.CeInteger) { + if (HasCeInteger) { output.WriteRawTag(16); output.WriteInt32(CeInteger); } - if (attrCase_ == AttrOneofCase.CeString) { + if (HasCeString) { output.WriteRawTag(26); output.WriteString(CeString); } - if (attrCase_ == AttrOneofCase.CeBytes) { + if (HasCeBytes) { output.WriteRawTag(34); output.WriteBytes(CeBytes); } - if (attrCase_ == AttrOneofCase.CeUri) { + if (HasCeUri) { output.WriteRawTag(42); output.WriteString(CeUri); } - if (attrCase_ == AttrOneofCase.CeUriRef) { + if (HasCeUriRef) { output.WriteRawTag(50); output.WriteString(CeUriRef); } @@ -824,27 +946,27 @@ public void WriteTo(pb::CodedOutputStream output) { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (attrCase_ == AttrOneofCase.CeBoolean) { + if (HasCeBoolean) { output.WriteRawTag(8); output.WriteBool(CeBoolean); } - if (attrCase_ == AttrOneofCase.CeInteger) { + if (HasCeInteger) { output.WriteRawTag(16); output.WriteInt32(CeInteger); } - if (attrCase_ == AttrOneofCase.CeString) { + if (HasCeString) { output.WriteRawTag(26); output.WriteString(CeString); } - if (attrCase_ == AttrOneofCase.CeBytes) { + if (HasCeBytes) { output.WriteRawTag(34); output.WriteBytes(CeBytes); } - if (attrCase_ == AttrOneofCase.CeUri) { + if (HasCeUri) { output.WriteRawTag(42); output.WriteString(CeUri); } - if (attrCase_ == AttrOneofCase.CeUriRef) { + if (HasCeUriRef) { output.WriteRawTag(50); output.WriteString(CeUriRef); } @@ -862,22 +984,22 @@ public void WriteTo(pb::CodedOutputStream output) { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (attrCase_ == AttrOneofCase.CeBoolean) { + if (HasCeBoolean) { size += 1 + 1; } - if (attrCase_ == AttrOneofCase.CeInteger) { + if (HasCeInteger) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(CeInteger); } - if (attrCase_ == AttrOneofCase.CeString) { + if (HasCeString) { size += 1 + pb::CodedOutputStream.ComputeStringSize(CeString); } - if (attrCase_ == AttrOneofCase.CeBytes) { + if (HasCeBytes) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(CeBytes); } - if (attrCase_ == AttrOneofCase.CeUri) { + if (HasCeUri) { size += 1 + pb::CodedOutputStream.ComputeStringSize(CeUri); } - if (attrCase_ == AttrOneofCase.CeUriRef) { + if (HasCeUriRef) { size += 1 + pb::CodedOutputStream.ComputeStringSize(CeUriRef); } if (attrCase_ == AttrOneofCase.CeTimestamp) { @@ -933,7 +1055,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -981,7 +1107,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; @@ -1030,6 +1160,7 @@ public void MergeFrom(pb::CodedInputStream input) { } + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class CloudEventBatch : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -1174,7 +1305,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -1193,7 +1328,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; diff --git a/test/CloudNative.CloudEvents.IntegrationTests/CloudNative.CloudEvents.IntegrationTests.csproj b/test/CloudNative.CloudEvents.IntegrationTests/CloudNative.CloudEvents.IntegrationTests.csproj index 3dc846d0..774ca9a5 100644 --- a/test/CloudNative.CloudEvents.IntegrationTests/CloudNative.CloudEvents.IntegrationTests.csproj +++ b/test/CloudNative.CloudEvents.IntegrationTests/CloudNative.CloudEvents.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + - net6.0;net8.0 + net10.0 diff --git a/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj b/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj index a9f903d3..82f48280 100644 --- a/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj +++ b/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj @@ -1,7 +1,7 @@ - + - net6.0;net8.0 + net8.0;net10.0 enable @@ -10,7 +10,6 @@ - diff --git a/test/CloudNative.CloudEvents.UnitTests/ConformanceTestData/TestDataProvider.cs b/test/CloudNative.CloudEvents.UnitTests/ConformanceTestData/TestDataProvider.cs index ff6e8ea3..a33ef693 100644 --- a/test/CloudNative.CloudEvents.UnitTests/ConformanceTestData/TestDataProvider.cs +++ b/test/CloudNative.CloudEvents.UnitTests/ConformanceTestData/TestDataProvider.cs @@ -1,4 +1,4 @@ -// Copyright 2023 Cloud Native Foundation. +// Copyright 2023 Cloud Native Foundation. // Licensed under the Apache 2.0 license. // See LICENSE file in the project root for full license information. @@ -49,7 +49,7 @@ private static string FindRepoRoot() var directory = new DirectoryInfo(currentDirectory); while (directory != null && (!File.Exists(Path.Combine(directory.FullName, "LICENSE")) - || !File.Exists(Path.Combine(directory.FullName, "CloudEvents.sln")))) + || !File.Exists(Path.Combine(directory.FullName, "CloudEvents.slnx")))) { directory = directory.Parent; } diff --git a/test/CloudNative.CloudEvents.UnitTests/Protobuf/ConformanceTests.g.cs b/test/CloudNative.CloudEvents.UnitTests/Protobuf/ConformanceTests.g.cs index cb85f465..d6cff85c 100644 --- a/test/CloudNative.CloudEvents.UnitTests/Protobuf/ConformanceTests.g.cs +++ b/test/CloudNative.CloudEvents.UnitTests/Protobuf/ConformanceTests.g.cs @@ -52,6 +52,7 @@ static ConformanceTestsReflection() { /// /// A simple container for conformance tests. /// + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class ConformanceTestFile : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -199,7 +200,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -218,7 +223,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; @@ -236,6 +245,7 @@ public void MergeFrom(pb::CodedInputStream input) { /// /// A single test in the conformance test suite. /// + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class ConformanceTest : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -640,7 +650,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -703,7 +717,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; @@ -765,6 +783,7 @@ public void MergeFrom(pb::CodedInputStream input) { /// /// A sample message for tests using CloudEvent.proto_data. /// + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class ConformanceTestMessageData : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -923,7 +942,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -942,7 +965,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; diff --git a/test/CloudNative.CloudEvents.UnitTests/Protobuf/TestMessages.g.cs b/test/CloudNative.CloudEvents.UnitTests/Protobuf/TestMessages.g.cs index bdd2592d..921ebd60 100644 --- a/test/CloudNative.CloudEvents.UnitTests/Protobuf/TestMessages.g.cs +++ b/test/CloudNative.CloudEvents.UnitTests/Protobuf/TestMessages.g.cs @@ -37,6 +37,7 @@ static TestMessagesReflection() { } #region Messages + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class PayloadData1 : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage @@ -192,7 +193,11 @@ public void MergeFrom(pb::CodedInputStream input) { #else uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; @@ -211,7 +216,11 @@ public void MergeFrom(pb::CodedInputStream input) { void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { uint tag; while ((tag = input.ReadTag()) != 0) { - switch(tag) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break;