Merge pull request #65 from escendit/55-orleans-8x

net8, orleans8, and refactor
escendit · Dec 17, 2023 · a5365b4 · a5365b4
2 parents 1e0f011 + e9d2954
commit a5365b4
Show file tree

Hide file tree

Showing 115 changed files with 3,643 additions and 2,058 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,14 @@
 [*]
 charset = utf-8
 insert_final_newline = true
+end_of_line = crlf
+tab_width = 4
+indent_size = 4
+indent_style = space
 
 [*.cs]
-charset = utf-8-bom
+charset = utf-8-bom
+
+[*.{yaml,yml}]
+tab_width = 2
+indent_size = 2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
+      - name: Start RabbitMQ
+        uses: namoshek/rabbitmq-github-action@v1
+        with:
+          version: '3.12'
+          ports: '5672:5672 5552:5552'
+          plugins: rabbitmq_stream
       - name: Setup .NET Core SDK 7, 8
         uses: actions/setup-dotnet@v3
         with:
@@ -21,7 +27,7 @@ jobs:
       - name: Build .NET Solution
         run: dotnet build --configuration Release --no-restore
       - name: Test .NET Solution
-        run: dotnet test --configuration Release --no-build --filter=Category=UnitTest --logger "trx;LogFilePrefix=test-results"
+        run: dotnet test --configuration Release --no-build --filter="Category=UnitTest|Category=IntegrationTest" --logger "trx;LogFilePrefix=test-results"
       - uses: actions/upload-artifact@v2
         if: success() || failure()
         with:

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -75,9 +75,9 @@ jobs:
           dotnet test `
             --configuration Release `
             --no-build `
-            --filter=Category=UnitTest `
+            --filter="Category=UnitTest|Category=IntegrationTest" `
             --collect "XPlat Code Coverage" `
             --results-directory TestResults/ `
             --logger "trx;LogFilePrefix=test-results" `
             -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
-          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,11 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <TargetFrameworks>net8.0;net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
     <PropertyGroup>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
     </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Escendit.Tools.Branding">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Escendit.Tools.CodeAnalysis.NetAnalyzers">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Escendit.Tools.CodeAnalysis.SecurityCodeScanAnalyzers">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Escendit.Tools.CodeAnalysis.SonarAnalyzers">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Escendit.Tools.CodeAnalysis.StyleCopAnalyzers">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Escendit.Tools.SourceLink.GitHub">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="GitVersion.MsBuild">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.Orleans.Sdk"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,38 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <ItemGroup>
-        <PackageReference Include="Escendit.Tools.Branding" Version="1.0.2">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Escendit.Tools.CodeAnalysis.NetAnalyzers" Version="0.5.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Escendit.Tools.CodeAnalysis.SecurityCodeScanAnalyzers" Version="0.5.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Escendit.Tools.CodeAnalysis.SonarAnalyzers" Version="0.5.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Escendit.Tools.CodeAnalysis.StyleCopAnalyzers" Version="0.5.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Escendit.Tools.SourceLink.GitHub" Version="0.4.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <!-- Not Transitive, needs to be included -->
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        <PackageVersion Include="coverlet.collector" Version="6.0.0"/>
+        <PackageVersion Include="Escendit.Extensions.DependencyInjection.RabbitMQ.Abstractions" Version="0.2.0"/>
+        <PackageVersion Include="Escendit.Extensions.DependencyInjection.RabbitMQ.AmqpProtocol" Version="0.2.0"/>
+        <PackageVersion Include="Escendit.Tools.Branding" Version="1.0.2"/>
+        <PackageVersion Include="Escendit.Tools.CodeAnalysis.NetAnalyzers" Version="0.5.0"/>
+        <PackageVersion Include="Escendit.Tools.CodeAnalysis.NSubstituteAnalyzers" Version="0.1.0-rc.18"/>
+        <PackageVersion Include="Escendit.Tools.CodeAnalysis.SecurityCodeScanAnalyzers" Version="0.5.0"/>
+        <PackageVersion Include="Escendit.Tools.CodeAnalysis.SonarAnalyzers" Version="0.5.0"/>
+        <PackageVersion Include="Escendit.Tools.CodeAnalysis.StyleCopAnalyzers" Version="0.5.0"/>
+        <PackageVersion Include="Escendit.Tools.CodeAnalysis.xUnitAnalyzers" Version="0.1.0-rc.21"/>
+        <PackageVersion Include="Escendit.Tools.SourceLink.GitHub" Version="0.4.0"/>
+        <PackageVersion Include="GitVersion.MsBuild" Version="5.12.0"/>
+        <PackageVersion Include="JunitXml.TestLogger" Version="3.0.134"/>
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageVersion Include="NSubstitute" Version="5.1.0"/>
+        <PackageVersion Include="Escendit.Orleans.Streaming.RabbitMQ.Tests.Client" Version="6.8.0"/>
+        <PackageVersion Include="Escendit.Orleans.Streaming.RabbitMQ.Tests.Stream.Client" Version="1.7.4"/>
+        <PackageVersion Include="RabbitMQ.Stream.Client" Version="1.7.4"/>
+        <PackageVersion Include="xunit" Version="2.6.3"/>
+        <PackageVersion Include="xunit.categories" Version="2.0.8"/>
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5"/>
     </ItemGroup>
-</Project>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageVersion Include="Microsoft.Orleans.EventSourcing" Version="7.2.4"/>
+        <PackageVersion Include="Microsoft.Orleans.Runtime" Version="7.2.4"/>
+        <PackageVersion Include="Microsoft.Orleans.Sdk" Version="7.2.4"/>
+        <PackageVersion Include="Microsoft.Orleans.Streaming" Version="7.2.4"/>
+        <PackageVersion Include="Microsoft.Orleans.TestingHost" Version="7.2.4"/>
+        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1"/>
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageVersion Include="Microsoft.Orleans.EventSourcing" Version="8.0.0-rc1"/>
+        <PackageVersion Include="Microsoft.Orleans.Runtime" Version="8.0.0-rc1"/>
+        <PackageVersion Include="Microsoft.Orleans.Sdk" Version="8.0.0-rc1"/>
+        <PackageVersion Include="Microsoft.Orleans.Streaming" Version="8.0.0-rc1"/>
+        <PackageVersion Include="Microsoft.Orleans.TestingHost" Version="8.0.0-rc1"/>
+        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
+    </ItemGroup>
+</Project>
diff --git a/Escendit.Orleans.Streaming.RabbitMQ.sln b/Escendit.Orleans.Streaming.RabbitMQ.sln
diff --git a/rabbitmq-orleans-extensions.sln b/rabbitmq-orleans-extensions.sln
@@ -0,0 +1,76 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EFD3DA34-B04F-4C90-B3E0-BEB2402B2D6A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A5880995-120F-422E-9B46-4302F74C87FE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orleans", "Orleans", "{3947EC73-A7D9-482C-86B1-8E4F6387B5FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCore", "AspNetCore", "{275062C9-CF0B-4445-8940-1D6106966163}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Escendit.Orleans.Streaming.RabbitMQ", "src\Orleans\RabbitMQ\Escendit.Orleans.Streaming.RabbitMQ.csproj", "{EFA84B10-485C-4410-A201-E5F717404678}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Escendit.Orleans.Streaming.RabbitMQ.AmqpProtocol", "src\Orleans\AmqpProtocol\Escendit.Orleans.Streaming.RabbitMQ.AmqpProtocol.csproj", "{AF8058B1-5AD2-4E0F-B483-12FE69C7ABBD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Escendit.Orleans.Streaming.RabbitMQ.StreamProtocol", "src\Orleans\StreamProtocol\Escendit.Orleans.Streaming.RabbitMQ.StreamProtocol.csproj", "{F7431962-0830-47B5-8E51-8EED823E8794}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orleans", "Orleans", "{5C89E98A-C88E-4478-9AD5-7FFE87AFD903}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Escendit.Orleans.Streaming.RabbitMQ.AmqpProtocol.Tests", "test\Orleans\AmqpProtocol\Escendit.Orleans.Streaming.RabbitMQ.AmqpProtocol.Tests.csproj", "{A0D36FA0-B374-4702-B51D-D7BBB8A764A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Escendit.Orleans.Streaming.RabbitMQ.Tests", "test\Orleans\RabbitMQ\Escendit.Orleans.Streaming.RabbitMQ.Tests.csproj", "{D3385699-829C-4D03-A5CA-788D1470FD2A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Escendit.Orleans.Streaming.RabbitMQ.StreamProtocol.Tests", "test\Orleans\StreamProtocol\Escendit.Orleans.Streaming.RabbitMQ.StreamProtocol.Tests.csproj", "{2437B71B-0685-4428-93F2-8A1C472AEC63}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EFA84B10-485C-4410-A201-E5F717404678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFA84B10-485C-4410-A201-E5F717404678}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFA84B10-485C-4410-A201-E5F717404678}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFA84B10-485C-4410-A201-E5F717404678}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF8058B1-5AD2-4E0F-B483-12FE69C7ABBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF8058B1-5AD2-4E0F-B483-12FE69C7ABBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF8058B1-5AD2-4E0F-B483-12FE69C7ABBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF8058B1-5AD2-4E0F-B483-12FE69C7ABBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7431962-0830-47B5-8E51-8EED823E8794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7431962-0830-47B5-8E51-8EED823E8794}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7431962-0830-47B5-8E51-8EED823E8794}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7431962-0830-47B5-8E51-8EED823E8794}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0D36FA0-B374-4702-B51D-D7BBB8A764A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0D36FA0-B374-4702-B51D-D7BBB8A764A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0D36FA0-B374-4702-B51D-D7BBB8A764A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0D36FA0-B374-4702-B51D-D7BBB8A764A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3385699-829C-4D03-A5CA-788D1470FD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3385699-829C-4D03-A5CA-788D1470FD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3385699-829C-4D03-A5CA-788D1470FD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3385699-829C-4D03-A5CA-788D1470FD2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2437B71B-0685-4428-93F2-8A1C472AEC63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2437B71B-0685-4428-93F2-8A1C472AEC63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2437B71B-0685-4428-93F2-8A1C472AEC63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2437B71B-0685-4428-93F2-8A1C472AEC63}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3947EC73-A7D9-482C-86B1-8E4F6387B5FC} = {EFD3DA34-B04F-4C90-B3E0-BEB2402B2D6A}
+		{275062C9-CF0B-4445-8940-1D6106966163} = {EFD3DA34-B04F-4C90-B3E0-BEB2402B2D6A}
+		{EFA84B10-485C-4410-A201-E5F717404678} = {3947EC73-A7D9-482C-86B1-8E4F6387B5FC}
+		{AF8058B1-5AD2-4E0F-B483-12FE69C7ABBD} = {3947EC73-A7D9-482C-86B1-8E4F6387B5FC}
+		{F7431962-0830-47B5-8E51-8EED823E8794} = {3947EC73-A7D9-482C-86B1-8E4F6387B5FC}
+		{5C89E98A-C88E-4478-9AD5-7FFE87AFD903} = {A5880995-120F-422E-9B46-4302F74C87FE}
+		{A0D36FA0-B374-4702-B51D-D7BBB8A764A8} = {5C89E98A-C88E-4478-9AD5-7FFE87AFD903}
+		{D3385699-829C-4D03-A5CA-788D1470FD2A} = {5C89E98A-C88E-4478-9AD5-7FFE87AFD903}
+		{2437B71B-0685-4428-93F2-8A1C472AEC63} = {5C89E98A-C88E-4478-9AD5-7FFE87AFD903}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C067AF04-0718-4504-9C39-F953038CFF86}
+	EndGlobalSection
+EndGlobal
diff --git a/...Escendit.Orleans.Streaming.RabbitMQ/Configuration/RabbitClusterClientQueueConfigurator.cs b/...Escendit.Orleans.Streaming.RabbitMQ/Configuration/RabbitClusterClientQueueConfigurator.cs