Merge branch 'dev'

.gitignore

@@ -302,3 +302,5 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+package-lock.json
+azurite/

Akka.Persistence.Azure.sln

@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Azure.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Azure.Tests.Performance", "src\Akka.Persistence.Azure.Tests.Performance\Akka.Persistence.Azure.Tests.Performance.csproj", "{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akka.Persistence.Azure.TestHelpers", "src\Akka.Persistence.Azure.TestHelpers\Akka.Persistence.Azure.TestHelpers.csproj", "{FE4C3232-1DB9-40E5-B0BE-BD70ACB4C1F3}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{320BFA6C-930A-4B7F-9FA4-76CDD0F0E552}"
 	ProjectSection(SolutionItems) = preProject
 		build.cmd = build.cmd
@@ -37,10 +35,6 @@ Global
 		{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CAE7CA7C-0D0C-4FDA-BDE9-BE16A27343EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE4C3232-1DB9-40E5-B0BE-BD70ACB4C1F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE4C3232-1DB9-40E5-B0BE-BD70ACB4C1F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE4C3232-1DB9-40E5-B0BE-BD70ACB4C1F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE4C3232-1DB9-40E5-B0BE-BD70ACB4C1F3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+#### 0.8.4 June 2 2022 ####
+* Upgraded to [Akka.NET 1.4.39](https://github.com/akkadotnet/akka.net/releases/tag/1.4.39)
+* [Update Azure.Identity to 1.6.0](https://github.com/petabridge/Akka.Persistence.Azure/pull/205)
+* [Update System.Linq.Async to 6.0.1](https://github.com/petabridge/Akka.Persistence.Azure/pull/198)
+* [Upgrade `Microsoft.Azure.Consmos.Table` to `Azure.Data.Tables` 12.5.0](https://github.com/petabridge/Akka.Persistence.Azure/pull/207)
+
 #### 0.8.3 September 9 2021 ####
 * Upgraded to [Akka.NET 1.4.25](https://github.com/akkadotnet/akka.net/releases/tag/1.4.25)
 * [Update Azure.Identity to 1.4.1](https://github.com/petabridge/Akka.Persistence.Azure/pull/176)

azurite.cmd

@@ -0,0 +1 @@
+start /B azurite --silent --location azurite --debug azirute/debug.log

build-system/azure-pipeline.template.yaml

@@ -16,6 +16,12 @@ jobs:
         submodules: recursive  # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true
       # Linux or macOS
+      - bash: |
+          sudo npm install -g [email protected]
+          sudo mkdir azurite
+          sudo azurite --silent --location azurite --debug azirute/debug.log &
+        displayName: 'Install and Run Azurite (Linux)'
+        condition: in( variables['Agent.OS'], 'Linux', 'Darwin' )
       - task: Bash@3 
         displayName: Linux / OSX Build
         inputs:
@@ -24,8 +30,14 @@ jobs:
         continueOnError: true
         condition: in( variables['Agent.OS'], 'Linux', 'Darwin' )
         env:
-          AZURE_CONNECTION_STR: $(azureConnectionString)      
+          AZURE_CONNECTION_STR: UseDevelopmentStorage=true
       # Windows
+      - powershell: |
+          npm install -g [email protected]
+          mkdir azurite
+          Start-Process azurite.cmd -PassThru
+        displayName: 'Install and Run Azurite (Windows)'
+        condition: eq( variables['Agent.OS'], 'Windows_NT' )
       - task: BatchScript@1
         displayName: Windows Build
         inputs:
@@ -34,7 +46,7 @@ jobs:
         continueOnError: true
         condition: eq( variables['Agent.OS'], 'Windows_NT' )
         env:
-          AZURE_CONNECTION_STR: $(azureConnectionString)   
+          AZURE_CONNECTION_STR: UseDevelopmentStorage=true   
       - task: PublishTestResults@2
         inputs:
           testRunner: VSTest

build-system/linux-pr-validation.yaml

@@ -17,6 +17,6 @@ jobs:
 - template: azure-pipeline.template.yaml
   parameters:
     name: Ubuntu
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-latest'
     scriptFileName: ./build.sh
-    scriptArgs: all
+    scriptArgs: all

build-system/windows-pr-validation.yaml

@@ -17,6 +17,6 @@ jobs:
 - template: azure-pipeline.template.yaml
   parameters:
     name: Windows
-    vmImage: 'windows-2019'
+    vmImage: 'windows-latest'
     scriptFileName: build.cmd
-    scriptArgs: all
+    scriptArgs: all

build-system/windows-release.yaml

@@ -2,7 +2,7 @@
 # See https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for reference
 
 pool:
-  vmImage: vs2017-win2016
+  vmImage: windows-latest
   demands: Cmd
 
 trigger:
@@ -35,4 +35,4 @@ steps:
     title: '$(projectName) v$(Build.SourceBranchName)'
     releaseNotesFile: 'RELEASE_NOTES.md'
     assets: |
-     bin\nuget\*.nupkg
+     bin\nuget\*.nupkg

src/Akka.Persistence.Azure.Tests.Performance/Akka.Persistence.Azure.Tests.Performance.csproj

@@ -13,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Akka.Persistence.Azure.TestHelpers\Akka.Persistence.Azure.TestHelpers.csproj" />
     <ProjectReference Include="..\Akka.Persistence.Azure\Akka.Persistence.Azure.csproj" />
   </ItemGroup>
 

src/Akka.Persistence.Azure.Tests.Performance/AzureJournalPerfSpecs.cs

@@ -7,18 +7,20 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Configuration;
-using Akka.Persistence.Azure.TestHelpers;
 using Akka.Util.Internal;
+using Azure.Data.Tables;
+using Azure.Storage.Blobs;
 using NBench;
 
 namespace Akka.Persistence.Azure.Tests.Performance
 {
     public class AzureJournalPerfSpecs
     {
+        public const string ConnectionString = "UseDevelopmentStorage=true";
+
         public const string RecoveryCounterName = "MsgRecovered";
         private Counter _recoveryCounter;
 
@@ -35,10 +37,12 @@ public class AzureJournalPerfSpecs
 
         public static Config JournalConfig()
         {
-            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("AZURE_CONNECTION_STR")))
-                return JournalConfig(Environment.GetEnvironmentVariable("AZURE_CONNECTION_STR"));
+            var connString = Environment.GetEnvironmentVariable("AZURE_CONNECTION_STR");
+            if (string.IsNullOrWhiteSpace(connString))
+                connString = ConnectionString;
 
-            return JournalConfig(WindowsAzureStorageEmulatorFixture.GenerateConnStr());
+            CleanupCloudTable(connString).Wait();
+            return JournalConfig(connString);
         }
 
         public static Config JournalConfig(string connectionString)
@@ -55,6 +59,22 @@ public static Config JournalConfig(string connectionString)
                 .WithFallback("akka.persistence.journal.azure-table.table-name=" + TableName);
         }
 
+        public static async Task CleanupCloudTable(string connectionString)
+        {
+            var tableClient = new TableServiceClient(connectionString);
+
+            await foreach(var table in tableClient.QueryAsync())
+            {
+                await tableClient.DeleteTableAsync(table.Name);
+            }
+
+            var blobClient = new BlobServiceClient(connectionString);
+            foreach (var blobContainer in blobClient.GetBlobContainers())
+            {
+                await blobClient.DeleteBlobContainerAsync(blobContainer.Name);
+            }
+        }
+
         private ActorSystem ActorSystem { get; set; }
 
         private List<IActorRef> _persistentActors = new List<IActorRef>(PersistentActorCount);
@@ -65,7 +85,6 @@ public void Setup(BenchmarkContext context)
             _recoveryCounter = context.GetCounter(RecoveryCounterName);
             _writeCounter = context.GetCounter(WriteCounterName);
 
-
             ActorSystem = Actor.ActorSystem.Create(nameof(AzureJournalPerfSpecs) + TableVersionCounter.Current, JournalConfig());
 
             foreach (var i in Enumerable.Range(0, PersistentActorCount))
@@ -121,7 +140,7 @@ public void CleanUp()
 
             try
             {
-                DbUtils.CleanupCloudTable(AzurePersistence.Get(ActorSystem).TableSettings.ConnectionString, TableName).Wait(TimeSpan.FromSeconds(3));
+                CleanupCloudTable(AzurePersistence.Get(ActorSystem).TableSettings.ConnectionString).Wait(TimeSpan.FromSeconds(3));
             }
             catch { }
         }