Updated Storage.Net to FluentStorage (#4540)

Reconciled Newtonsoft.Json to 13.0.3 and Added Netbox extensions previsouly refernced by Storage.net Co-authored-by: Stu Wilson <[email protected]>
elsa-workflows · Oct 17, 2023 · b159d13 · b159d13
1 parent 4654fa0
commit b159d13
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 20 deletions.
diff --git a/src/activities/Elsa.Activities.BlobStorage/Activities/BlobExists.cs b/src/activities/Elsa.Activities.BlobStorage/Activities/BlobExists.cs
@@ -5,7 +5,7 @@
 using Elsa.Expressions;
 using Elsa.Services;
 using Elsa.Services.Models;
-using Storage.Net.Blobs;
+using FluentStorage.Blobs;
 
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.BlobStorage

diff --git a/src/activities/Elsa.Activities.BlobStorage/Activities/DeleteBlob.cs b/src/activities/Elsa.Activities.BlobStorage/Activities/DeleteBlob.cs
@@ -7,7 +7,7 @@
 using Elsa.Expressions;
 using Elsa.Services;
 using Elsa.Services.Models;
-using Storage.Net.Blobs;
+using FluentStorage.Blobs;
 
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.BlobStorage

diff --git a/src/activities/Elsa.Activities.BlobStorage/Activities/ReadBlob.cs b/src/activities/Elsa.Activities.BlobStorage/Activities/ReadBlob.cs
@@ -4,7 +4,7 @@
 using Elsa.Attributes;
 using Elsa.Services;
 using Elsa.Services.Models;
-using Storage.Net.Blobs;
+using FluentStorage.Blobs;
 
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.BlobStorage

diff --git a/src/activities/Elsa.Activities.BlobStorage/Activities/WriteBlob.cs b/src/activities/Elsa.Activities.BlobStorage/Activities/WriteBlob.cs
@@ -7,7 +7,7 @@
 using Elsa.Expressions;
 using Elsa.Services;
 using Elsa.Services.Models;
-using Storage.Net.Blobs;
+using FluentStorage.Blobs;
 
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.BlobStorage

diff --git a/src/activities/Elsa.Activities.BlobStorage/Elsa.Activities.BlobStorage.csproj b/src/activities/Elsa.Activities.BlobStorage/Elsa.Activities.BlobStorage.csproj
@@ -8,13 +8,13 @@
         <Authors>Luca Pisano, Elsa Contributors</Authors>
         <Description>
             Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
-            This package provides activities to read and write files to blob storage using Storage.Net that provides a generic interface for popular cloud storage providers like Amazon S3, Azure Service Bus, Azure Event Hub, Azure Storage, Azure Data Lake Store thus abstracting Blob and Messaging services.
+            This package provides activities to read and write files to blob storage using FluentStorage that provides a generic interface for popular cloud storage providers like Amazon S3, Azure Service Bus, Azure Event Hub, Azure Storage, Azure Data Lake Store thus abstracting Blob and Messaging services.
         </Description>
         <PackageTags>elsa, workflows, blob storage</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Storage.Net" Version="9.3.0" />
+        <PackageReference Include="FluentStorage" Version="5.4.0" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     </ItemGroup>
 

diff --git a/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj b/src/activities/webhooks/Elsa.Activities.Webhooks/Elsa.Activities.Webhooks.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
     </ItemGroup>
 

diff --git a/src/clients/Elsa.Client/Elsa.Client.csproj b/src/clients/Elsa.Client/Elsa.Client.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NodaTime" Version="3.0.9" />
         <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
         <PackageReference Include="Refit" Version="6.0.94" />

diff --git a/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj
@@ -18,7 +18,7 @@
         <PackageReference Include="LinqKit.Core" Version="1.1.27" />
         <PackageReference Include="MediatR" Version="12.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.1" />
         <PackageReference Include="Microsoft.Extensions.Primitives" Version="6.0.0" />

diff --git a/src/core/Elsa.Core/Elsa.Core.csproj b/src/core/Elsa.Core/Elsa.Core.csproj
@@ -19,11 +19,12 @@
         <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
         <PackageReference Include="DistributedLock.Core" Version="1.0.4" />
         <PackageReference Include="DistributedLock.FileSystem" Version="1.0.1" />
+        <PackageReference Include="FluentStorage" Version="5.4.0" />
         <PackageReference Include="Humanizer.Core" Version="2.13.14" />
         <PackageReference Include="MediatR" Version="12.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
@@ -33,12 +34,12 @@
         <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+        <PackageReference Include="netbox" Version="2.5.3" />
         <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.0" />
         <PackageReference Include="Open.Linq.AsyncExtensions" Version="1.2.0" />
         <PackageReference Include="Rebus.Microsoft.Extensions.Logging" Version="4.0.0" />
         <PackageReference Include="Rebus.ServiceProvider" Version="8.4.0" />
         <PackageReference Include="Scrutor" Version="3.3.0" />
-        <PackageReference Include="Storage.Net" Version="9.3.0" />
         <PackageReference Include="System.Linq.Async" Version="5.1.0" />
         <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
     </ItemGroup>

diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
@@ -41,7 +41,7 @@
 using Newtonsoft.Json;
 using NodaTime;
 using Rebus.Handlers;
-using Storage.Net;
+using FluentStorage;
 using BackgroundWorker = Elsa.Services.BackgroundWorker;
 using IDistributedLockProvider = Elsa.Services.IDistributedLockProvider;
 

diff --git a/src/core/Elsa.Core/Providers/WorkflowStorage/BlobStorageWorkflowStorageProvider.cs b/src/core/Elsa.Core/Providers/WorkflowStorage/BlobStorageWorkflowStorageProvider.cs
@@ -5,7 +5,7 @@
 using Elsa.Serialization;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using Storage.Net.Blobs;
+using FluentStorage.Blobs;
 
 namespace Elsa.Providers.WorkflowStorage
 {

diff --git a/src/core/Elsa.Core/Providers/WorkflowStorage/BlobStorageWorkflowStorageProviderOptions.cs b/src/core/Elsa.Core/Providers/WorkflowStorage/BlobStorageWorkflowStorageProviderOptions.cs
@@ -1,6 +1,6 @@
 using System;
-using Storage.Net;
-using Storage.Net.Blobs;
+using FluentStorage;
+using FluentStorage.Blobs;
 
 namespace Elsa.Providers.WorkflowStorage
 {

diff --git a/src/core/Elsa.Core/Providers/Workflows/BlobStorageWorkflowProvider.cs b/src/core/Elsa.Core/Providers/Workflows/BlobStorageWorkflowProvider.cs
@@ -13,8 +13,8 @@
 using LinqKit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Storage.Net;
-using Storage.Net.Blobs;
+using FluentStorage;
+using FluentStorage.Blobs;
 
 namespace Elsa.Providers.Workflows
 {

diff --git a/src/samples/aspnet/Elsa.Samples.SignalApi/Startup.cs b/src/samples/aspnet/Elsa.Samples.SignalApi/Startup.cs
@@ -4,7 +4,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Storage.Net;
+using FluentStorage;
 
 namespace Elsa.Samples.SignalApi
 {

diff --git a/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs b/src/samples/console/Elsa.Samples.FileBasedWorkflow/Program.cs
@@ -4,7 +4,7 @@
 using Elsa.Providers.Workflows;
 using Elsa.Services;
 using Microsoft.Extensions.DependencyInjection;
-using Storage.Net;
+using FluentStorage;
 
 namespace Elsa.Samples.FileBasedWorkflow
 {

diff --git a/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj b/src/server/Elsa.Server.Api/Elsa.Server.Api.csproj
@@ -29,7 +29,7 @@
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.0" />