Merge pull request #1300 from rabbitmq/update-apigen

Update Apigen to support .NET 6

Author: lukebakken

.github/workflows/main.yaml

@@ -44,7 +44,7 @@ jobs:
       - name: Restore
         run: dotnet restore --verbosity=normal
       - name: ApiGen
-        run: dotnet run --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
+        run: dotnet run --framework "netcoreapp3.1" --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
       - name: Build
         run: dotnet build --no-restore --verbosity=normal
       - name: Test
@@ -70,7 +70,9 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: |
+            3.1.x
+            6.0.x
       - name: Cache NuGet packages
         uses: actions/cache@v3
         with:
@@ -83,7 +85,7 @@ jobs:
       - name: Restore
         run: dotnet restore --verbosity=normal
       - name: ApiGen
-        run: dotnet run --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
+        run: dotnet run --framework "netcoreapp3.1" --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 ./projects/specs/amqp0-9-1.stripped.xml ./gensrc/autogenerated-api-0-9-1.cs
       - name: Build
         run: dotnet build --no-restore --verbosity=normal
       - name: Test

build.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
 set DOTNET_CLI_TELEMETRY_OPTOUT=1
 dotnet restore --verbosity=normal .\RabbitMQDotNetClient.sln
-dotnet run --verbosity=normal --project .\projects\Apigen\Apigen.csproj --apiName:AMQP_0_9_1 .\projects\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
+dotnet run --verbosity=normal --framework net6.0 --project .\projects\Apigen\Apigen.csproj --apiName:AMQP_0_9_1 .\projects\specs\amqp0-9-1.stripped.xml .\gensrc\autogenerated-api-0-9-1.cs
 dotnet build --verbosity=normal .\RabbitMQDotNetClient.sln

build.sh

@@ -14,7 +14,7 @@ fi
 cd "$script_dir"
 
 dotnet restore ./RabbitMQDotNetClient.sln
-dotnet run --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 \
+dotnet run --verbosity=normal --framework net6.0 --project ./projects/Apigen/Apigen.csproj --apiName:AMQP_0_9_1 \
     ./projects/specs/amqp0-9-1.stripped.xml \
     ./gensrc/autogenerated-api-0-9-1.cs
 dotnet build ./RabbitMQDotNetClient.sln

projects/Apigen/Apigen.csproj

@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <OutputType>Exe</OutputType>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\RabbitMQ.Client\client\api\AmqpTimestamp.cs;..\RabbitMQ.Client\client\api\IBasicConsumer.cs;..\RabbitMQ.Client\client\api\IBasicProperties.cs;..\RabbitMQ.Client\client\api\IContentHeader.cs;..\RabbitMQ.Client\client\api\IModel.cs;..\RabbitMQ.Client\client\api\PublicationAddress.cs;..\RabbitMQ.Client\client\api\IBasicPublishBatch.cs;..\RabbitMQ.Client\client\api\BasicGetResult.cs;..\RabbitMQ.Client\client\api\QueueDeclareOk.cs;..\RabbitMQ.Client\client\api\ShutdownEventArgs.cs;..\RabbitMQ.Client\client\api\ShutdownInitiator.cs;..\RabbitMQ.Client\client\events\BasicReturnEventArgs.cs;..\RabbitMQ.Client\client\events\BasicAckEventArgs.cs;..\RabbitMQ.Client\client\events\BasicNackEventArgs.cs;..\RabbitMQ.Client\client\events\CallbackExceptionEventArgs.cs;..\RabbitMQ.Client\client\events\ConsumerEventArgs.cs;..\RabbitMQ.Client\client\events\FlowControlEventArgs.cs;..\RabbitMQ.Client\client\impl\IFullModel.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Version="4.5.5" />
+  </ItemGroup>
+
 </Project>