Azure · pakrym · Jul 30, 2019 · Jul 30, 2019 · Jul 30, 2019 · Jul 30, 2019
diff --git a/.gitignore b/.gitignore
@@ -150,3 +150,6 @@ pingme.txt
 # TS/Node files
 dist/
 node_modules/
+
+# MSBuild binary log files
+msbuild.binlog
diff --git a/sdk/core/Azure.Core/Azure.Core.All.sln b/sdk/core/Azure.Core/Azure.Core.All.sln
@@ -13,9 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ApplicationModel.Conf
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "src\Azure.Core.csproj", "{CA90A9FA-F955-49DC-A191-6DEE6FA2E493}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Extensions", "..\Azure.Core.Extensions\src\Azure.Core.Extensions.csproj", "{F8B2A9A5-1730-4EC6-B2E5-9029F1066D4D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure", "..\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj", "{F8B2A9A5-1730-4EC6-B2E5-9029F1066D4D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Extensions.Tests", "..\Azure.Core.Extensions\tests\Azure.Core.Extensions.Tests.csproj", "{30AAFF15-4204-493D-9E61-407194FF2330}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure.Tests", "..\Microsoft.Extensions.Azure\tests\Microsoft.Extensions.Azure.Tests.csproj", "{30AAFF15-4204-493D-9E61-407194FF2330}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Tests", "tests\Azure.Core.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
 EndProject
@@ -61,7 +61,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Storage.Queues.Tests"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1BC0D7C7-2E71-4CAA-830C-856E9E2D71A4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Extensions.Samples", "..\Azure.Core.Extensions\samples\Azure.Core.Extensions.Samples.csproj", "{C772E341-1EC6-451A-BDAB-647B02BF262B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure.Samples", "..\Microsoft.Extensions.Azure\samples\Microsoft.Extensions.Azure.Samples.csproj", "{C772E341-1EC6-451A-BDAB-647B02BF262B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/sdk/core/Azure.Core/Azure.Core.sln b/sdk/core/Azure.Core/Azure.Core.sln
@@ -7,9 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "src\Azure.Cor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Tests", "tests\Azure.Core.Tests.csproj", "{84491222-6C36-4FA7-BBAE-1FA804129151}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Extensions", "..\Azure.Core.Extensions\src\Azure.Core.Extensions.csproj", "{F8945D73-B000-4129-AF58-896EC3DB49AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure", "..\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj", "{F8945D73-B000-4129-AF58-896EC3DB49AC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core.Extensions.Tests", "..\Azure.Core.Extensions\tests\Azure.Core.Extensions.Tests.csproj", "{5B093527-8B04-4D2B-B23D-441D4B5EE305}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Azure.Tests", "..\Microsoft.Extensions.Azure\tests\Microsoft.Extensions.Azure.Tests.csproj", "{5B093527-8B04-4D2B-B23D-441D4B5EE305}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/sdk/core/Microsoft.Extensions.Azure/Directory.Build.props b/sdk/core/Microsoft.Extensions.Azure/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <IsClientLibrary>true</IsClientLibrary>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+</Project>
diff --git a/...e.Core.Extensions/samples/CustomPolicy.cs → ....Extensions.Azure/samples/CustomPolicy.cs b/...e.Core.Extensions/samples/CustomPolicy.cs → ....Extensions.Azure/samples/CustomPolicy.cs
@@ -4,7 +4,7 @@
 using Azure.Core.Pipeline;
 using Microsoft.AspNetCore.Hosting;
 
-namespace Azure.Core.Extensions.Samples
+namespace Microsoft.Extensions.Azure.Samples
 {
     internal class DependencyInjectionEnabledPolicy : SynchronousHttpPipelinePolicy
     {

diff --git a/...ples/Azure.Core.Extensions.Samples.csproj → ...Microsoft.Extensions.Azure.Samples.csproj b/...ples/Azure.Core.Extensions.Samples.csproj → ...Microsoft.Extensions.Azure.Samples.csproj
@@ -8,6 +8,6 @@
     <PackageReference Include="Microsoft.AspNetCore.App" IsImplicitlyDefined="true" />
     <ProjectReference Include="..\..\..\keyvault\Azure.Security.KeyVault.Secrets\src\Azure.Security.KeyVault.Secrets.csproj" />
     <ProjectReference Include="..\..\..\storage\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" />
-    <ProjectReference Include="..\src\Azure.Core.Extensions.csproj" />
+    <ProjectReference Include="..\src\Microsoft.Extensions.Azure.csproj" />
   </ItemGroup>
 </Project>
diff --git a/.../Azure.Core.Extensions/samples/Program.cs → ...osoft.Extensions.Azure/samples/Program.cs b/.../Azure.Core.Extensions/samples/Program.cs → ...osoft.Extensions.Azure/samples/Program.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
-namespace Azure.Core.Extensions.Samples
+namespace Microsoft.Extensions.Azure.Samples
 {
     public class Program
     {

diff --git a/.../Azure.Core.Extensions/samples/Startup.cs → ...osoft.Extensions.Azure/samples/Startup.cs b/.../Azure.Core.Extensions/samples/Startup.cs → ...osoft.Extensions.Azure/samples/Startup.cs
@@ -5,15 +5,14 @@
 using Azure.Core.Pipeline;
 using Azure.Identity;
 using Azure.Security.KeyVault.Secrets;
-using Azure.Storage;
 using Azure.Storage.Blobs;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Azure.Core.Extensions.Samples
+namespace Microsoft.Extensions.Azure.Samples
 {
     public class Startup
     {

diff --git a/....Core.Extensions/samples/appsettings.json → ...Extensions.Azure/samples/appsettings.json b/....Core.Extensions/samples/appsettings.json → ...Extensions.Azure/samples/appsettings.json
diff --git a/...sions/src/AzureClientBuilderExtensions.cs → ...Azure/src/AzureClientBuilderExtensions.cs b/...sions/src/AzureClientBuilderExtensions.cs → ...Azure/src/AzureClientBuilderExtensions.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
+using Azure.Core;
+using Azure.Core.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using System;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     public static class AzureClientBuilderExtensions
     {

diff --git a/...tensions/src/AzureClientFactoryBuilder.cs → ...ns.Azure/src/AzureClientFactoryBuilder.cs b/...tensions/src/AzureClientFactoryBuilder.cs → ...ns.Azure/src/AzureClientFactoryBuilder.cs
@@ -1,14 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
+using Azure.Core;
+using Azure.Core.Extensions;
 using Azure.Core.Pipeline;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
+using System;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     public sealed class AzureClientFactoryBuilder : IAzureClientFactoryBuilderWithConfiguration<IConfiguration>, IAzureClientFactoryBuilderWithCredential
     {

diff --git a/...AzureClientServiceCollectionExtensions.cs → ...AzureClientServiceCollectionExtensions.cs b/...AzureClientServiceCollectionExtensions.cs → ...AzureClientServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
 using Microsoft.Extensions.DependencyInjection;
+using System;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     public static class AzureClientServiceCollectionExtensions
     {

diff --git a/...ore.Extensions/src/IAzureClientFactory.cs → ...tensions.Azure/src/IAzureClientFactory.cs b/...ore.Extensions/src/IAzureClientFactory.cs → ...tensions.Azure/src/IAzureClientFactory.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Core
+namespace Microsoft.Extensions.Azure
 {
     public interface IAzureClientFactory<TClient>
     {

diff --git a/...nsions/src/Internal/AzureClientBuilder.cs → ....Azure/src/Internal/AzureClientBuilder.cs b/...nsions/src/Internal/AzureClientBuilder.cs → ....Azure/src/Internal/AzureClientBuilder.cs
@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Azure.Core.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal sealed class AzureClientBuilder<TClient, TOptions>: IAzureClientBuilder<TClient, TOptions> where TOptions : class
     {

diff --git a/...nsions/src/Internal/AzureClientFactory.cs → ....Azure/src/Internal/AzureClientFactory.cs b/...nsions/src/Internal/AzureClientFactory.cs → ....Azure/src/Internal/AzureClientFactory.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.Options;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class AzureClientFactory<TClient, TOptions>: IAzureClientFactory<TClient>
     {

diff --git a/...nsions/src/Internal/AzureClientOptions.cs → ....Azure/src/Internal/AzureClientOptions.cs b/...nsions/src/Internal/AzureClientOptions.cs → ....Azure/src/Internal/AzureClientOptions.cs
@@ -2,8 +2,9 @@
 // Licensed under the MIT License.
 
 using System;
+using Azure.Core;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class AzureClientCredentialOptions<TClient>
     {

diff --git a/...src/Internal/AzureClientsGlobalOptions.cs → ...src/Internal/AzureClientsGlobalOptions.cs b/...src/Internal/AzureClientsGlobalOptions.cs → ...src/Internal/AzureClientsGlobalOptions.cs
@@ -3,10 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.Core;
 using Azure.Core.Pipeline;
 using Azure.Identity;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class AzureClientsGlobalOptions
     {

diff --git a/...ensions/src/Internal/ClientInformation.cs → ...s.Azure/src/Internal/ClientInformation.cs b/...ensions/src/Internal/ClientInformation.cs → ...s.Azure/src/Internal/ClientInformation.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Runtime.ExceptionServices;
+using Azure.Core;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class ClientRegistration<TClient, TOptions>
     {

diff --git a/...ions/src/Internal/ClientOptionsFactory.cs → ...zure/src/Internal/ClientOptionsFactory.cs b/...ions/src/Internal/ClientOptionsFactory.cs → ...zure/src/Internal/ClientOptionsFactory.cs
@@ -6,7 +6,7 @@
 using System.Reflection;
 using Microsoft.Extensions.Options;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     // Slightly adjusted copy of https://github.com/aspnet/Extensions/blob/master/src/Options/Options/src/OptionsFactory.cs
     internal class ClientOptionsFactory<TClient, TOptions> where TOptions : class
@@ -82,7 +82,7 @@ public TOptions Create(string name)
                 {
                     namedSetup.Configure(name, options);
                 }
-                else if (name == Options.DefaultName)
+                else if (name == Microsoft.Extensions.Options.Options.DefaultName)
                 {
                     setup.Configure(options);
                 }

diff --git a/...ions/src/Internal/ClientOptionsMonitor.cs → ...zure/src/Internal/ClientOptionsMonitor.cs b/...ions/src/Internal/ClientOptionsMonitor.cs → ...zure/src/Internal/ClientOptionsMonitor.cs
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     // Slightly adjusted copy of https://github.com/aspnet/Extensions/blob/master/src/Options/Options/src/OptionsMonitor.cs
     internal class ClientOptionsMonitor<TClient, TOptions> : IOptionsMonitor<TOptions>, IDisposable where TOptions : class
@@ -36,7 +36,7 @@ public ClientOptionsMonitor(ClientOptionsFactory<TClient, TOptions> factory, IEn
 
         private void InvokeChanged(string name)
         {
-            name = name ?? Options.DefaultName;
+            name = name ?? Microsoft.Extensions.Options.Options.DefaultName;
             _cache.TryRemove(name);
             var options = Get(name);
             if (_onChange != null)
@@ -50,15 +50,15 @@ private void InvokeChanged(string name)
         /// </summary>
         public TOptions CurrentValue
         {
-            get => Get(Options.DefaultName);
+            get => Get(Microsoft.Extensions.Options.Options.DefaultName);
         }
 
         /// <summary>
         /// Returns a configured <typeparamref name="TOptions"/> instance with the given <paramref name="name"/>.
         /// </summary>
         public virtual TOptions Get(string name)
         {
-            name = name ?? Options.DefaultName;
+            name = name ?? Microsoft.Extensions.Options.Options.DefaultName;
             return _cache.GetOrAdd(name, () => _factory.Create(name));
         }
 

diff --git a/...rc/Internal/ConfigurationClientFactory.cs → ...rc/Internal/ConfigurationClientFactory.cs b/...rc/Internal/ConfigurationClientFactory.cs → ...rc/Internal/ConfigurationClientFactory.cs
@@ -7,10 +7,11 @@
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using Azure.Core;
 using Azure.Identity;
 using Microsoft.Extensions.Configuration;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal static class ClientFactory
     {

diff --git a/...rc/Internal/ConfigureClientCredentials.cs → ...rc/Internal/ConfigureClientCredentials.cs b/...rc/Internal/ConfigureClientCredentials.cs → ...rc/Internal/ConfigureClientCredentials.cs
@@ -2,9 +2,10 @@
 // Licensed under the MIT License.
 
 using System;
+using Azure.Core;
 using Microsoft.Extensions.Options;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class ConfigureClientCredentials<TClient, TOptions> : IConfigureNamedOptions<AzureClientCredentialOptions<TClient>>
     {

diff --git a/...ns/src/Internal/ConfigureClientOptions.cs → ...re/src/Internal/ConfigureClientOptions.cs b/...ns/src/Internal/ConfigureClientOptions.cs → ...re/src/Internal/ConfigureClientOptions.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Options;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class ConfigureClientOptions<TClient, TOptions> : IConfigureNamedOptions<TOptions> where TOptions : class
     {

diff --git a/...src/Internal/DefaultClientOptionsSetup.cs → ...src/Internal/DefaultClientOptionsSetup.cs b/...src/Internal/DefaultClientOptionsSetup.cs → ...src/Internal/DefaultClientOptionsSetup.cs
@@ -5,7 +5,7 @@
 using Azure.Core.Pipeline;
 using Microsoft.Extensions.Options;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class DefaultClientOptionsSetup<T> : IConfigureNamedOptions<T> where T : class
     {

diff --git a/...al/DefaultCredentialClientOptionsSetup.cs → ...al/DefaultCredentialClientOptionsSetup.cs b/...al/DefaultCredentialClientOptionsSetup.cs → ...al/DefaultCredentialClientOptionsSetup.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Options;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class DefaultCredentialClientOptionsSetup<T> : IConfigureNamedOptions<AzureClientCredentialOptions<T>>
     {

diff --git a/...s/src/Internal/EventSourceLogForwarder.cs → ...e/src/Internal/EventSourceLogForwarder.cs b/...s/src/Internal/EventSourceLogForwarder.cs → ...e/src/Internal/EventSourceLogForwarder.cs
@@ -10,7 +10,7 @@
 using System.Text;
 using Microsoft.Extensions.Logging;
 
-namespace Azure.Core.Extensions
+namespace Microsoft.Extensions.Azure
 {
     internal class EventSourceLogForwarder: EventListener
     {

diff --git a/...tensions/src/Azure.Core.Extensions.csproj → ...ure/src/Microsoft.Extensions.Azure.csproj b/...tensions/src/Azure.Core.Extensions.csproj → ...ure/src/Microsoft.Extensions.Azure.csproj
diff --git a/...Extensions/src/Properties/AssemblyInfo.cs → ...ions.Azure/src/Properties/AssemblyInfo.cs b/...Extensions/src/Properties/AssemblyInfo.cs → ...ions.Azure/src/Properties/AssemblyInfo.cs
diff --git a/sdk/core/Microsoft.Extensions.Azure/src/msbuild.binlog b/sdk/core/Microsoft.Extensions.Azure/src/msbuild.binlog
diff --git a/...tensions/tests/AzureClientFactoryTests.cs → ...ns.Azure/tests/AzureClientFactoryTests.cs b/...tensions/tests/AzureClientFactoryTests.cs → ...ns.Azure/tests/AzureClientFactoryTests.cs
diff --git a/...re.Extensions/tests/ClientFactoryTests.cs → ...ensions.Azure/tests/ClientFactoryTests.cs b/...re.Extensions/tests/ClientFactoryTests.cs → ...ensions.Azure/tests/ClientFactoryTests.cs
diff --git a/.../tests/Azure.Core.Extensions.Tests.csproj → ...s/Microsoft.Extensions.Azure.Tests.csproj b/.../tests/Azure.Core.Extensions.Tests.csproj → ...s/Microsoft.Extensions.Azure.Tests.csproj
@@ -15,6 +15,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\Azure.Core.Extensions.csproj" />
+    <ProjectReference Include="..\src\Microsoft.Extensions.Azure.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...Azure.Core.Extensions/tests/TestClient.cs → ...soft.Extensions.Azure/tests/TestClient.cs b/...Azure.Core.Extensions/tests/TestClient.cs → ...soft.Extensions.Azure/tests/TestClient.cs
diff --git a/...ore.Extensions/tests/TestClientOptions.cs → ...tensions.Azure/tests/TestClientOptions.cs b/...ore.Extensions/tests/TestClientOptions.cs → ...tensions.Azure/tests/TestClientOptions.cs
diff --git a/...nsions/tests/TestClientWithCredentials.cs → ....Azure/tests/TestClientWithCredentials.cs b/...nsions/tests/TestClientWithCredentials.cs → ....Azure/tests/TestClientWithCredentials.cs
diff --git a/...ons/tests/TestClientsBuilderExtensions.cs → ...ure/tests/TestClientsBuilderExtensions.cs b/...ons/tests/TestClientsBuilderExtensions.cs → ...ure/tests/TestClientsBuilderExtensions.cs