Switch to the new version of Azure Storage library. Fixes #116

SeanFeldman · Nov 12, 2019 · db5b2cf · db5b2cf
1 parent 1a52fa6
commit db5b2cf
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 30 deletions.
diff --git a/...tachmentPlugin.Tests/ApprovalFiles/ApiApprovals.AzureStorageAttachmentPlugin.approved.txt b/...tachmentPlugin.Tests/ApprovalFiles/ApiApprovals.AzureStorageAttachmentPlugin.approved.txt
@@ -4,7 +4,7 @@ namespace Microsoft.Azure.ServiceBus
     public class AzureStorageAttachmentConfiguration
     {
         public AzureStorageAttachmentConfiguration(string connectionString, string containerName = "attachments", string messagePropertyToIdentifyAttachmentBlob = "$attachment.blob", System.Func<Microsoft.Azure.ServiceBus.Message, bool> messageMaxSizeReachedCriteria = null) { }
-        public AzureStorageAttachmentConfiguration(Microsoft.WindowsAzure.Storage.Auth.StorageCredentials storageCredentials, string blobEndpoint, string containerName = "attachments", string messagePropertyToIdentifyAttachmentBlob = "$attachment.blob", System.Func<Microsoft.Azure.ServiceBus.Message, bool> messageMaxSizeReachedCriteria = null) { }
+        public AzureStorageAttachmentConfiguration(Microsoft.Azure.Storage.Auth.StorageCredentials storageCredentials, string blobEndpoint, string containerName = "attachments", string messagePropertyToIdentifyAttachmentBlob = "$attachment.blob", System.Func<Microsoft.Azure.ServiceBus.Message, bool> messageMaxSizeReachedCriteria = null) { }
         public AzureStorageAttachmentConfiguration(Microsoft.Azure.ServiceBus.IProvideStorageConnectionString connectionStringProvider, string containerName = "attachments", string messagePropertyToIdentifyAttachmentBlob = "$attachment.blob", System.Func<Microsoft.Azure.ServiceBus.Message, bool> messageMaxSizeReachedCriteria = null) { }
     }
     public class static AzureStorageAttachmentConfigurationExtensions

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/AzureStorageAttachmentConfigurationTests.cs b/src/ServiceBus.AttachmentPlugin.Tests/AzureStorageAttachmentConfigurationTests.cs
@@ -3,7 +3,7 @@
     using System;
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
-    using Microsoft.WindowsAzure.Storage.Auth;
+    using Microsoft.Azure.Storage.Auth;
     using Xunit;
 
     public class AzureStorageAttachmentConfigurationTests

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/AzureStorageEmulatorFixture.cs b/src/ServiceBus.AttachmentPlugin.Tests/AzureStorageEmulatorFixture.cs
@@ -8,8 +8,8 @@
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
-    using Microsoft.WindowsAzure.Storage;
-    using Microsoft.WindowsAzure.Storage.Blob;
+    using Microsoft.Azure.Storage;
+    using Microsoft.Azure.Storage.Blob;
 
     public class AzureStorageEmulatorFixture
     {

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/DocoUpdater.cs b/src/ServiceBus.AttachmentPlugin.Tests/DocoUpdater.cs
@@ -1,11 +1,15 @@
-using MarkdownSnippets;
-using Xunit;
-
-public class DocoUpdater
+namespace ServiceBus.AttachmentPlugin.Tests
 {
-    [Fact]
-    public void Run()
+    using MarkdownSnippets;
+    using Xunit;
+
+    public class DocoUpdater
     {
-        new DirectoryMarkdownProcessor(GitRepoDirectoryFinder.FindForFilePath()).Run();
+        [Fact]
+        public void Run()
+        {
+            new DirectoryMarkdownProcessor(GitRepoDirectoryFinder.FindForFilePath()).Run();
+        }
     }
+
 }
diff --git a/src/ServiceBus.AttachmentPlugin.Tests/ServiceBus.AttachmentPlugin.Tests.csproj b/src/ServiceBus.AttachmentPlugin.Tests/ServiceBus.AttachmentPlugin.Tests.csproj
@@ -10,10 +10,10 @@
 
   <ItemGroup>
     <PackageReference Include="MarkdownSnippets" Version="16.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta2-build3683" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/Snippets.cs b/src/ServiceBus.AttachmentPlugin.Tests/Snippets.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Azure.ServiceBus.Core;
-using Microsoft.WindowsAzure.Storage.Auth;
+using Microsoft.Azure.Storage.Auth;
 using Newtonsoft.Json;
 
 class Snippets

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/When_receiving_message.cs b/src/ServiceBus.AttachmentPlugin.Tests/When_receiving_message.cs
@@ -1,5 +1,4 @@
-
-namespace ServiceBus.AttachmentPlugin.Tests
+namespace ServiceBus.AttachmentPlugin.Tests
 {
     using System;
     using System.Text;

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/When_registering_plugin.cs b/src/ServiceBus.AttachmentPlugin.Tests/When_registering_plugin.cs
@@ -6,7 +6,7 @@
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
     using Microsoft.Azure.ServiceBus.Core;
-    using Microsoft.WindowsAzure.Storage.Auth;
+    using Microsoft.Azure.Storage.Auth;
     using Xunit;
 
     public class When_registering_plugin : IClassFixture<AzureStorageEmulatorFixture>

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/When_sending_message_using_connection_string.cs b/src/ServiceBus.AttachmentPlugin.Tests/When_sending_message_using_connection_string.cs
@@ -4,8 +4,9 @@
     using System.Text;
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
-    using Microsoft.WindowsAzure.Storage;
-    using Microsoft.WindowsAzure.Storage.Auth;
+    using Microsoft.Azure.Storage;
+    using Microsoft.Azure.Storage.Auth;
+    using Microsoft.Azure.Storage.Blob;
     using Xunit;
 
     public class When_sending_message_using_connection_string : IClassFixture<AzureStorageEmulatorFixture>

diff --git a/src/ServiceBus.AttachmentPlugin.Tests/When_sending_message_using_container_sas.cs b/src/ServiceBus.AttachmentPlugin.Tests/When_sending_message_using_container_sas.cs
@@ -4,8 +4,9 @@
     using System.Text;
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
-    using Microsoft.WindowsAzure.Storage;
-    using Microsoft.WindowsAzure.Storage.Auth;
+    using Microsoft.Azure.Storage;
+    using Microsoft.Azure.Storage.Auth;
+    using Microsoft.Azure.Storage.Blob;
     using Xunit;
 
     public class When_sending_message_using_container_sas : IClassFixture<AzureStorageEmulatorFixture>

diff --git a/src/ServiceBus.AttachmentPlugin/AzureStorageAttachment.cs b/src/ServiceBus.AttachmentPlugin/AzureStorageAttachment.cs
@@ -5,8 +5,8 @@
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
     using Microsoft.Azure.ServiceBus.Core;
-    using Microsoft.WindowsAzure.Storage;
-    using Microsoft.WindowsAzure.Storage.Blob;
+    using Microsoft.Azure.Storage;
+    using Microsoft.Azure.Storage.Blob;
 
     class AzureStorageAttachment : ServiceBusPlugin
     {

diff --git a/src/ServiceBus.AttachmentPlugin/AzureStorageAttachmentConfiguration.cs b/src/ServiceBus.AttachmentPlugin/AzureStorageAttachmentConfiguration.cs
@@ -1,8 +1,8 @@
 namespace Microsoft.Azure.ServiceBus
 {
     using System;
-    using WindowsAzure.Storage;
-    using WindowsAzure.Storage.Auth;
+    using Storage;
+    using Storage.Auth;
 
     /// <summary>Runtime configuration for Azure Storage Attachment plugin.</summary>
     public class AzureStorageAttachmentConfiguration

diff --git a/src/ServiceBus.AttachmentPlugin/ReceiveOnlyAzureStorageAttachment.cs b/src/ServiceBus.AttachmentPlugin/ReceiveOnlyAzureStorageAttachment.cs
@@ -4,8 +4,8 @@
     using System.Threading.Tasks;
     using Microsoft.Azure.ServiceBus;
     using Microsoft.Azure.ServiceBus.Core;
-    using Microsoft.WindowsAzure.Storage;
-    using Microsoft.WindowsAzure.Storage.Blob;
+    using Microsoft.Azure.Storage;
+    using Microsoft.Azure.Storage.Blob;
 
     class ReceiveOnlyAzureStorageAttachment : ServiceBusPlugin
     {

diff --git a/src/ServiceBus.AttachmentPlugin/ServiceBus.AttachmentPlugin.csproj b/src/ServiceBus.AttachmentPlugin/ServiceBus.AttachmentPlugin.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Microsoft Azure ServiceBus attachment plugin</Description>
-    <Version>5.1.0</Version>
+    <Version>6.0.0-preview01</Version>
     <Authors>Sean Feldman</Authors>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <PackageTags>Azure;Service Bus;ServiceBus;.NET;AMQP;IoT;Queue;Topic;Attachment;Plugin</PackageTags>
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="2.0.0" />
-    <PackageReference Include="WindowsAzure.Storage" Version="8.5.0" />
+    <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/ServiceBus.AttachmentPlugin/TokenGenerator.cs b/src/ServiceBus.AttachmentPlugin/TokenGenerator.cs
@@ -1,7 +1,7 @@
 namespace ServiceBus.AttachmentPlugin
 {
     using System;
-    using Microsoft.WindowsAzure.Storage.Blob;
+    using Microsoft.Azure.Storage.Blob;
 
     static class TokenGenerator
     {