Merge from origin

.github/workflows/ci.yml

@@ -11,8 +11,11 @@ name: CI
 on:
   push:
     branches: [ master ]
+    tags:
+      - '*.*.*'
   pull_request:
     branches: [ master ]
+
 env:
  # Stop wasting time caching packages
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -27,97 +30,58 @@ env:
 
 jobs:
   build:
+    timeout-minutes: 20
     runs-on: ubuntu-latest
-    timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Setup dotnet 5.0.x
+      - name: setup-dotnet tests-sdk
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.x
-      - name: Install dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --configuration Release --no-restore 
-      - uses: actions/upload-artifact@v2
+          dotnet-version: "3.1.*"
+      - uses: actions/setup-dotnet@v1
         with:
-          name: dotnet artifacts
-          path: |
-            ./
-            src/
-            tests/
-
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    needs: [build]
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-
-    steps:
+          dotnet-version: "5.0.*"
+      - run: dotnet --info
       - uses: actions/checkout@v2
-      - name: Setup dotnet 3.1
-        uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.x'
-      - name: Setup dotnet 5.0.x
-        uses: actions/setup-dotnet@v1
+          fetch-depth: 0
+      - uses: actions/cache@v2
         with:
-          dotnet-version: 5.0.x
-      - name: Install dependencies
-        run: dotnet restore
+          path: ~/.nuget/packages
+          key: ubuntu-latest-nuget-${{ hashFiles('**/*.csproj') }}
+          restore-keys: |
+            ubuntu-latest-nuget-
+      - name: Build
+        run: dotnet build --configuration Release
       - name: Core Tests
-        run: dotnet test tests/Paramore.Brighter.Core.Tests/Paramore.Brighter.Core.Tests.csproj -c Release --no-restore --logger "console;verbosity=normal" --blame -v n
-
-  package:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    needs: [test]
-
-    steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: dotnet artifacts
-      - uses: actions/upload-artifact@v2
+        run: dotnet test tests/Paramore.Brighter.Core.Tests/Paramore.Brighter.Core.Tests.csproj -c Release --no-restore --no-build
+      - name: Upload packages as artifacts
+        uses: actions/upload-artifact@v2
         with:
           name: nuget packages
           path: "**/*.nupkg"
-
-  prerelease:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    needs: [package]
-
-    steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: nuget packages
-      - name: to GitHub Feed
+      - name: Push to GitHub Feed
         run: dotnet nuget push **/*.nupkg --source https://nuget.pkg.github.com/${REPOSITORY_OWNER}/index.json --api-key ${GITHUB_TOKEN} --skip-duplicate
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPOSITORY_OWNER: ${{ github.repository_owner }}
 
+
   release:
     if: startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [package]
+    needs: [build]
     steps:
       - uses: actions/download-artifact@v2
         with:
           name: nuget packages
       - name: Push generated package to NuGet
-        run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
+        run: dotnet nuget push **/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
 
   memory:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     steps:
       - uses: actions/checkout@v2
@@ -137,7 +101,7 @@ jobs:
   redis-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       redis:  
@@ -168,7 +132,7 @@ jobs:
   rabbitmq-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       rabbitmq:
@@ -199,8 +163,13 @@ jobs:
 
   kafka-ci:
     runs-on: ubuntu-latest
-    timeout-minutes: 5
-    needs: [test]
+    timeout-minutes: 10
+    needs: [build]
+    env:
+      CONFLUENT_BOOSTRAP_SERVER: ${{ secrets.CONFLUENT_BOOSTRAP_SERVER }}
+      CONFLUENT_SASL_PASSWORD: ${{ secrets.CONFLUENT_SASL_PASSWORD }}
+      CONFLUENT_SASL_USERNAME: ${{ secrets.CONFLUENT_SASL_USERNAME }}
+
     services:
       zookeeper:
         image: confluentinc/cp-zookeeper:latest
@@ -222,7 +191,7 @@ jobs:
           KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
           KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
           KAFKA_AUTO_CREATE_TOPICS_ENABLE: true
-          KAFKA_DELETE_TOPIC_ENABLE: "true"
+          KAFKA_DELETE_TOPIC_ENABLE: "false"
 
     steps:
     - name: Install KafkaCat
@@ -246,17 +215,13 @@ jobs:
         dotnet-version: 5.0.x
     - name: Install dependencies
       run: dotnet restore
-    # - name: Debugging with tmate
-    #   uses: mxschmitt/[email protected]
-    - name: Kafka Install Check
-      run:  kafkacat -L -b localhost
     - name: Kafka Transport Tests
-      run: dotnet test ./tests/Paramore.Brighter.Kafka.Tests/Paramore.Brighter.Kafka.Tests.csproj --configuration Release --logger "console;verbosity=normal" --blame -v n
-
+      run: dotnet test ./tests/Paramore.Brighter.Kafka.Tests/Paramore.Brighter.Kafka.Tests.csproj --filter "Category=Kafka&Category!=Confluent" --configuration Release --logger "console;verbosity=normal" --blame -v n
+ 
   postgres-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       postgres:
@@ -288,7 +253,7 @@ jobs:
   eventstore-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       evenstore: 
@@ -324,7 +289,7 @@ jobs:
   sqlserver-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       sqlserver:
@@ -352,7 +317,7 @@ jobs:
   mysql-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       mariadb:
@@ -389,7 +354,7 @@ jobs:
   dynamo-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
 
     services:
       dynamo:
@@ -415,7 +380,7 @@ jobs:
   aws-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -449,7 +414,7 @@ jobs:
   azure-ci:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [test]
+    needs: [build]
     steps:
       - uses: actions/checkout@v2
       - name: Setup dotnet 3.1

.gitignore

@@ -327,4 +327,7 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
-.ionide
+.ionide
+broker/
+/zoo/
+.DS_Store

Brighter.sln

@@ -9,6 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{235D
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{329736D2-BF92-4D06-A7BF-19F4B6B64EDD}"
+	ProjectSection(SolutionItems) = preProject
+		tests\README.md = tests\README.md
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter", "src\Paramore.Brighter\Paramore.Brighter.csproj", "{3975AC2F-C3C0-4044-AFC8-A5F2AAC565FE}"
 EndProject
@@ -187,7 +190,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.Extension
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.Inbox.Postgres", "src\Paramore.Brighter.Inbox.Postgres\Paramore.Brighter.Inbox.Postgres.csproj", "{DE191819-35B1-40C8-9118-E169633C5041}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Paramore.Brighter.AzureServiceBus.Tests", "tests\Paramore.Brighter.AzureServiceBus.Tests\Paramore.Brighter.AzureServiceBus.Tests.csproj", "{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greetings", "samples\RMQPartitionTesting\Greetings\Greetings.csproj", "{11CAC3F5-2737-479A-95F7-43E8535F5647}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KafkaPartitionTesting", "KafkaPartitionTesting", "{ACED4F91-08E1-4097-B919-895B6B403833}"
+	ProjectSection(SolutionItems) = preProject
+		samples\KafkaPartitionTesting\Handling Kafka Failure.md = samples\KafkaPartitionTesting\Handling Kafka Failure.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greetings", "samples\KafkaPartitionTesting\Greetings\Greetings.csproj", "{403DFDF3-B59F-4638-9F08-985450B30875}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreetingsReceiverConsole", "samples\KafkaPartitionTesting\GreetingsReceiverConsole\GreetingsReceiverConsole.csproj", "{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Paramore.Brighter.AzureServiceBus.Tests", "tests\Paramore.Brighter.AzureServiceBus.Tests\Paramore.Brighter.AzureServiceBus.Tests.csproj", "{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreetingsSender", "samples\KafkaPartitionTesting\GreetingsSender\GreetingsSender.csproj", "{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -967,6 +983,42 @@ Global
 		{DE191819-35B1-40C8-9118-E169633C5041}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DE191819-35B1-40C8-9118-E169633C5041}.Release|x86.ActiveCfg = Release|Any CPU
 		{DE191819-35B1-40C8-9118-E169633C5041}.Release|x86.Build.0 = Release|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Debug|x86.Build.0 = Debug|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Release|x86.ActiveCfg = Release|Any CPU
+		{11CAC3F5-2737-479A-95F7-43E8535F5647}.Release|x86.Build.0 = Release|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Debug|x86.Build.0 = Debug|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Release|Any CPU.Build.0 = Release|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Release|x86.ActiveCfg = Release|Any CPU
+		{403DFDF3-B59F-4638-9F08-985450B30875}.Release|x86.Build.0 = Release|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4}.Release|x86.Build.0 = Release|Any CPU
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -979,6 +1031,18 @@ Global
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}.Release|x86.ActiveCfg = Release|Any CPU
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7}.Release|x86.Build.0 = Release|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Debug|x86.Build.0 = Debug|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Release|x86.ActiveCfg = Release|Any CPU
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1035,7 +1099,12 @@ Global
 		{B853A06F-5DFD-4093-979B-B08D1BBDD2D6} = {329736D2-BF92-4D06-A7BF-19F4B6B64EDD}
 		{C2355F42-792D-4964-B068-79186F887C6D} = {329736D2-BF92-4D06-A7BF-19F4B6B64EDD}
 		{D2B52F80-5106-4981-9031-A02C5EB479B4} = {329736D2-BF92-4D06-A7BF-19F4B6B64EDD}
+		{11CAC3F5-2737-479A-95F7-43E8535F5647} = {AA661ADC-4B0E-4C68-BD2D-BB3871E4C03E}
+		{ACED4F91-08E1-4097-B919-895B6B403833} = {235DE1F1-E71B-4817-8E27-3B34FF006E4C}
+		{403DFDF3-B59F-4638-9F08-985450B30875} = {ACED4F91-08E1-4097-B919-895B6B403833}
+		{F6683D05-CAAE-46FB-9E7F-73DD8702A9D4} = {ACED4F91-08E1-4097-B919-895B6B403833}
 		{48F584DF-0BA1-4485-A612-14FD4F6A4CF7} = {329736D2-BF92-4D06-A7BF-19F4B6B64EDD}
+		{A980A6CC-3FF6-4D64-A0DC-2CA44E2F43F7} = {ACED4F91-08E1-4097-B919-895B6B403833}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8B7C7E31-2E32-4E0D-9426-BC9AF22E9F4C}

CONTRIBUTORS.md

@@ -123,6 +123,8 @@ Brighter contributors (sorted alphabeticaly)
 
 **[Paul Reardon](https://github.com/preardon)**
   * Improvements to ASB Transport 
+  * Replaced Newtonsoft.Json with System.Text.Json
+  * Created Social Media Card
 
 **[tmschlot](https://github.com/tmschlot)**
   * Various fixes