diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 0b5a894d44c9..8cfcf96d7fd3 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -41,6 +41,7 @@ and are generated based on the last package release.
+
@@ -159,7 +160,6 @@ and are generated based on the last package release.
-
diff --git a/eng/Versions.props b/eng/Versions.props
index e5582ceeddf8..fbada593ed2c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -146,6 +146,7 @@
5.2.6
2.3.2
+ 10.0.1
15.8.166
15.8.166
2.8.0
@@ -162,7 +163,6 @@
11.1.0
1.4.0
5.3.0
- 8.1.4
0.10.0-preview-20190325.1
diff --git a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
index 890377f7b2e6..dc9fa4eb0910 100644
--- a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
+++ b/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
@@ -6,6 +6,6 @@
-
+
diff --git a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netcoreapp3.0.cs b/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netcoreapp3.0.cs
index 9270109ec2d0..9d6c003d3eff 100644
--- a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netcoreapp3.0.cs
+++ b/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netcoreapp3.0.cs
@@ -5,9 +5,9 @@ namespace Microsoft.AspNetCore.DataProtection
{
public static partial class AzureDataProtectionBuilderExtensions
{
- public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.WindowsAzure.Storage.Blob.CloudBlobContainer container, string blobName) { throw null; }
- public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.WindowsAzure.Storage.Blob.CloudBlockBlob blobReference) { throw null; }
- public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.WindowsAzure.Storage.CloudStorageAccount storageAccount, string relativePath) { throw null; }
+ public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.Storage.Blob.CloudBlobContainer container, string blobName) { throw null; }
+ public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.Storage.Blob.CloudBlockBlob blobReference) { throw null; }
+ public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.Storage.CloudStorageAccount storageAccount, string relativePath) { throw null; }
public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, System.Uri blobUri) { throw null; }
}
}
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.DataProtection.AzureStorage
{
public sealed partial class AzureBlobXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository
{
- public AzureBlobXmlRepository(System.Func blobRefFactory) { }
+ public AzureBlobXmlRepository(System.Func blobRefFactory) { }
public System.Collections.Generic.IReadOnlyCollection GetAllElements() { throw null; }
public void StoreElement(System.Xml.Linq.XElement element, string friendlyName) { }
}
diff --git a/src/DataProtection/AzureStorage/src/AzureBlobXmlRepository.cs b/src/DataProtection/AzureStorage/src/AzureBlobXmlRepository.cs
index e39babaa315f..4467235c2e6e 100644
--- a/src/DataProtection/AzureStorage/src/AzureBlobXmlRepository.cs
+++ b/src/DataProtection/AzureStorage/src/AzureBlobXmlRepository.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -12,8 +12,8 @@
using System.Xml;
using System.Xml.Linq;
using Microsoft.AspNetCore.DataProtection.Repositories;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Blob;
namespace Microsoft.AspNetCore.DataProtection.AzureStorage
{
@@ -42,12 +42,7 @@ public sealed class AzureBlobXmlRepository : IXmlRepository
/// concurrent threads, and each invocation must return a new object.
public AzureBlobXmlRepository(Func blobRefFactory)
{
- if (blobRefFactory == null)
- {
- throw new ArgumentNullException(nameof(blobRefFactory));
- }
-
- _blobRefFactory = blobRefFactory;
+ _blobRefFactory = blobRefFactory ?? throw new ArgumentNullException(nameof(blobRefFactory));
_random = new Random();
}
diff --git a/src/DataProtection/AzureStorage/src/AzureDataProtectionBuilderExtensions.cs b/src/DataProtection/AzureStorage/src/AzureDataProtectionBuilderExtensions.cs
index 8ff62929e2e9..34bb3edf08b8 100644
--- a/src/DataProtection/AzureStorage/src/AzureDataProtectionBuilderExtensions.cs
+++ b/src/DataProtection/AzureStorage/src/AzureDataProtectionBuilderExtensions.cs
@@ -1,13 +1,13 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.DataProtection.AzureStorage;
using Microsoft.AspNetCore.DataProtection.KeyManagement;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Auth;
+using Microsoft.Azure.Storage.Blob;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Auth;
-using Microsoft.WindowsAzure.Storage.Blob;
namespace Microsoft.AspNetCore.DataProtection
{
diff --git a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
index a5a03e9ab0d6..ea12eab5e9b7 100644
--- a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
+++ b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
@@ -11,7 +11,12 @@
-
+
+
+
+
+
+
diff --git a/src/DataProtection/AzureStorage/test/AzureBlobXmlRepositoryTests.cs b/src/DataProtection/AzureStorage/test/AzureBlobXmlRepositoryTests.cs
index 61d5d0ae7806..868e08b7584d 100644
--- a/src/DataProtection/AzureStorage/test/AzureBlobXmlRepositoryTests.cs
+++ b/src/DataProtection/AzureStorage/test/AzureBlobXmlRepositoryTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.IO;
@@ -6,8 +6,8 @@
using System.Text;
using System.Threading.Tasks;
using System.Xml.Linq;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Blob;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Blob;
using Moq;
using Xunit;
diff --git a/src/DataProtection/AzureStorage/test/AzureDataProtectionBuilderExtensionsTest.cs b/src/DataProtection/AzureStorage/test/AzureDataProtectionBuilderExtensionsTest.cs
index d386352b7307..88e673d98080 100644
--- a/src/DataProtection/AzureStorage/test/AzureDataProtectionBuilderExtensionsTest.cs
+++ b/src/DataProtection/AzureStorage/test/AzureDataProtectionBuilderExtensionsTest.cs
@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.DataProtection.KeyManagement;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
-using Microsoft.WindowsAzure.Storage.Blob;
+using Microsoft.Azure.Storage.Blob;
using Xunit;
namespace Microsoft.AspNetCore.DataProtection.AzureStorage
diff --git a/src/DataProtection/samples/AzureBlob/Program.cs b/src/DataProtection/samples/AzureBlob/Program.cs
index cce860464827..2adc7c0aa913 100644
--- a/src/DataProtection/samples/AzureBlob/Program.cs
+++ b/src/DataProtection/samples/AzureBlob/Program.cs
@@ -1,11 +1,12 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Blob;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-using Microsoft.WindowsAzure.Storage;
using LogLevel = Microsoft.Extensions.Logging.LogLevel;
namespace AzureBlob