Merge pull request #1015 from AzureAD/markzuber/confignamespaces

remove apiconfig and appconfig namespaces for public [1006]
AzureAD · Mar 26, 2019 · 2f97726 · 2f97726
2 parents 3e3d5d7 + 27088f4
commit 2f97726
Show file tree

Hide file tree

Showing 114 changed files with 148 additions and 202 deletions.
diff --git a/src/Microsoft.Identity.Client/ApiConfig/AbstractAcquireTokenParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AbstractAcquireTokenParameterBuilder.cs
@@ -27,15 +27,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Identity.Client.Utils;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
-using Microsoft.Identity.Client.AppConfig;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Base class for builders of token requests, which attempt to acquire a token

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AbstractClientAppBaseAcquireTokenParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AbstractClientAppBaseAcquireTokenParameterBuilder.cs
@@ -28,8 +28,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Base class for parameter builders common to public client application and confidential

diff --git a/...osoft.Identity.Client/ApiConfig/AbstractConfidentialClientAcquireTokenParameterBuilder.cs b/...osoft.Identity.Client/ApiConfig/AbstractConfidentialClientAcquireTokenParameterBuilder.cs
@@ -28,8 +28,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
 #if !ANDROID_BUILDTIME && !iOS_BUILDTIME && !WINDOWS_APP_BUILDTIME && !MAC_BUILDTIME // Hide confidential client on mobile platforms
 

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AbstractPublicClientAcquireTokenParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AbstractPublicClientAcquireTokenParameterBuilder.cs
@@ -28,8 +28,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Base class for public client application token request builders

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenByAuthorizationCodeParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenByAuthorizationCodeParameterBuilder.cs
@@ -29,10 +29,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
 #if !ANDROID_BUILDTIME && !iOS_BUILDTIME && !WINDOWS_APP_BUILDTIME && !MAC_BUILDTIME && !MAC_BUILDTIME // Hide confidential client on mobile platforms
 

diff --git a/...icrosoft.Identity.Client/ApiConfig/AcquireTokenByIntegratedWindowsAuthParameterBuilder.cs b/...icrosoft.Identity.Client/ApiConfig/AcquireTokenByIntegratedWindowsAuthParameterBuilder.cs
@@ -28,10 +28,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Builder for AcquireTokenByIntegratedWindowsAuth

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenByRefreshTokenParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenByRefreshTokenParameterBuilder.cs
@@ -28,10 +28,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Parameter builder for the <see cref="IByRefreshToken.AcquireTokenByRefreshToken(IEnumerable{string}, string)"/>

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenByUsernamePasswordParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenByUsernamePasswordParameterBuilder.cs
@@ -29,10 +29,11 @@
 using System.Security;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Parameter builder for the <see cref="IPublicClientApplication.AcquireTokenByUsernamePassword(IEnumerable{string}, string, SecureString)"/>

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenForClientParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenForClientParameterBuilder.cs
@@ -28,10 +28,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
 #if !ANDROID_BUILDTIME && !iOS_BUILDTIME && !WINDOWS_APP_BUILDTIME && !MAC_BUILDTIME // Hide confidential client on mobile platforms
 

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenInteractiveParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenInteractiveParameterBuilder.cs
@@ -33,6 +33,7 @@
 using Microsoft.Identity.Client.Exceptions;
 using Microsoft.Identity.Client.Extensibility;
 using Microsoft.Identity.Client.TelemetryCore;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 
 #if iOS
 using UIKit;
@@ -46,7 +47,7 @@
 using System.Windows.Forms;
 #endif
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Builder for an Interactive token request. See https://aka.ms/msal-net-acquire-token-interactively

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenOnBehalfOfParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenOnBehalfOfParameterBuilder.cs
@@ -28,10 +28,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
 #if !ANDROID_BUILDTIME && !iOS_BUILDTIME && !WINDOWS_APP_BUILDTIME && !MAC_BUILDTIME && !MAC_BUILDTIME // Hide confidential client on mobile platforms
 

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenSilentParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenSilentParameterBuilder.cs
@@ -28,11 +28,12 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.Exceptions;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <inheritdoc />
     /// <summary>

diff --git a/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenWithDeviceCodeParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/AcquireTokenWithDeviceCodeParameterBuilder.cs
@@ -29,10 +29,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Parameters builder for the <see cref="IPublicClientApplication.AcquireTokenWithDeviceCode(IEnumerable{string}, Func{DeviceCodeResult, Task})"/>

diff --git a/...iConfig/IClientApplicationBaseExecutor.cs → ...ecutors/IClientApplicationBaseExecutor.cs b/...iConfig/IClientApplicationBaseExecutor.cs → ...ecutors/IClientApplicationBaseExecutor.cs
@@ -30,7 +30,7 @@
 using System.Threading.Tasks;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client.ApiConfig.Executors
 {
     internal interface IClientApplicationBaseExecutor
     {

diff --git a/...IConfidentialClientApplicationExecutor.cs → ...IConfidentialClientApplicationExecutor.cs b/...IConfidentialClientApplicationExecutor.cs → ...IConfidentialClientApplicationExecutor.cs
@@ -30,7 +30,7 @@
 using System.Threading.Tasks;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client.ApiConfig.Executors
 {
     internal interface IConfidentialClientApplicationExecutor
     {

diff --git a/...onfig/IPublicClientApplicationExecutor.cs → ...utors/IPublicClientApplicationExecutor.cs b/...onfig/IPublicClientApplicationExecutor.cs → ...utors/IPublicClientApplicationExecutor.cs
@@ -29,7 +29,7 @@
 using System.Threading.Tasks;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client.ApiConfig.Executors
 {
     internal interface IPublicClientApplicationExecutor
     {
@@ -53,4 +53,4 @@ Task<AuthenticationResult> ExecuteAsync(
             AcquireTokenByUsernamePasswordParameters usernamePasswordParameters,
             CancellationToken cancellationToken);
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/ApiConfig/GetAuthorizationRequestUrlParameterBuilder.cs b/src/Microsoft.Identity.Client/ApiConfig/GetAuthorizationRequestUrlParameterBuilder.cs
@@ -29,10 +29,11 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Identity.Client.ApiConfig.Executors;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.TelemetryCore;
 
-namespace Microsoft.Identity.Client.ApiConfig
+namespace Microsoft.Identity.Client
 {
 #if !ANDROID_BUILDTIME && !iOS_BUILDTIME && !WINDOWS_APP_BUILDTIME && !MAC_BUILDTIME // Hide confidential client on mobile platforms
 

diff --git a/src/Microsoft.Identity.Client/ApiConfig/Parameters/AcquireTokenCommonParameters.cs b/src/Microsoft.Identity.Client/ApiConfig/Parameters/AcquireTokenCommonParameters.cs
@@ -26,7 +26,6 @@
 // ------------------------------------------------------------------------------
 
 using System.Collections.Generic;
-using Microsoft.Identity.Client.AppConfig;
 using Microsoft.Identity.Client.TelemetryCore;
 
 namespace Microsoft.Identity.Client.ApiConfig.Parameters
@@ -39,4 +38,4 @@ internal class AcquireTokenCommonParameters
         public string Claims { get; set; }
         public AuthorityInfo AuthorityOverride { get; set; }
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/AadAuthorityAudience.cs b/src/Microsoft.Identity.Client/AppConfig/AadAuthorityAudience.cs
@@ -25,7 +25,7 @@
 //
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Specifies which Microsoft accounts can be used for sign-in with a given application.
@@ -61,4 +61,4 @@ public enum AadAuthorityAudience
         /// </summary>
         PersonalMicrosoftAccount
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/AbstractApplicationBuilder.cs b/src/Microsoft.Identity.Client/AppConfig/AbstractApplicationBuilder.cs
@@ -32,7 +32,7 @@
 using Microsoft.Identity.Client.Http;
 using Microsoft.Identity.Client.Utils;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// </summary>

diff --git a/src/Microsoft.Identity.Client/AppConfig/ApplicationConfiguration.cs b/src/Microsoft.Identity.Client/AppConfig/ApplicationConfiguration.cs
@@ -33,7 +33,7 @@
 using Microsoft.Identity.Client.Http;
 using Microsoft.Identity.Client.Internal;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     internal sealed class ApplicationConfiguration : IApplicationConfiguration
     {

diff --git a/src/Microsoft.Identity.Client/AppConfig/ApplicationOptions.cs b/src/Microsoft.Identity.Client/AppConfig/ApplicationOptions.cs
@@ -25,7 +25,7 @@
 //
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Base class for options objects with string values loadable from a configuration file
@@ -125,4 +125,4 @@ public abstract class ApplicationOptions
         /// </summary>
         public string Component { get; set; }
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/AuthorityInfo.cs b/src/Microsoft.Identity.Client/AppConfig/AuthorityInfo.cs
@@ -29,7 +29,7 @@
 using System.Globalization;
 using Microsoft.Identity.Client.Exceptions;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     internal class AuthorityInfo
     {

diff --git a/src/Microsoft.Identity.Client/AppConfig/AuthorityType.cs b/src/Microsoft.Identity.Client/AppConfig/AuthorityType.cs
@@ -25,7 +25,7 @@
 // 
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// </summary>
@@ -43,4 +43,4 @@ internal enum AuthorityType
         /// </summary>
         B2C
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/AzureCloud.cs b/src/Microsoft.Identity.Client/AppConfig/AzureCloud.cs
@@ -25,7 +25,7 @@
 // 
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// </summary>
@@ -56,4 +56,4 @@ public enum AzureCloudInstance
         /// </summary>
         AzureUsGovernment,
     };
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/ConfidentialClientApplicationBuilder.cs b/src/Microsoft.Identity.Client/AppConfig/ConfidentialClientApplicationBuilder.cs
@@ -31,7 +31,7 @@
 using Microsoft.Identity.Client.Exceptions;
 using Microsoft.Identity.Client.Internal;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
 #if !ANDROID_BUILDTIME && !iOS_BUILDTIME && !WINDOWS_APP_BUILDTIME && !MAC_BUILDTIME // Hide confidential client on mobile platforms
 

diff --git a/src/Microsoft.Identity.Client/AppConfig/ConfidentialClientApplicationOptions.cs b/src/Microsoft.Identity.Client/AppConfig/ConfidentialClientApplicationOptions.cs
@@ -25,7 +25,7 @@
 // 
 // ------------------------------------------------------------------------------
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Configuration options for a confidential client application 
@@ -40,4 +40,4 @@ public class ConfidentialClientApplicationOptions : ApplicationOptions
         /// </summary>
         public string ClientSecret { get; set; }
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/IAppConfig.cs b/src/Microsoft.Identity.Client/AppConfig/IAppConfig.cs
@@ -28,7 +28,7 @@
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Configuration properties used to build a public or confidential client application

diff --git a/src/Microsoft.Identity.Client/AppConfig/IApplicationConfiguration.cs b/src/Microsoft.Identity.Client/AppConfig/IApplicationConfiguration.cs
@@ -27,7 +27,7 @@
 
 using Microsoft.Identity.Client.Internal;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     internal interface IApplicationConfiguration : IAppConfig
     {

diff --git a/src/Microsoft.Identity.Client/AppConfig/IMsalHttpClientFactory.cs b/src/Microsoft.Identity.Client/AppConfig/IMsalHttpClientFactory.cs
@@ -27,7 +27,7 @@
 
 using System.Net.Http;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// Http Client Factory
@@ -42,4 +42,4 @@ public interface IMsalHttpClientFactory
         /// <returns>An Http client</returns>
         HttpClient GetHttpClient();
     }
-}
+}
diff --git a/src/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs b/src/Microsoft.Identity.Client/AppConfig/PublicClientApplicationBuilder.cs
@@ -30,7 +30,7 @@
 using Microsoft.Identity.Client.Exceptions;
 using Microsoft.Identity.Client.PlatformsCommon.Factories;
 
-namespace Microsoft.Identity.Client.AppConfig
+namespace Microsoft.Identity.Client
 {
     /// <summary>
     /// </summary>