Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove apiconfig and appconfig namespaces for public [1006] #1015

Merged
merged 2 commits into from
Mar 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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})"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -53,4 +53,4 @@ Task<AuthenticationResult> ExecuteAsync(
AcquireTokenByUsernamePasswordParameters usernamePasswordParameters,
CancellationToken cancellationToken);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
// ------------------------------------------------------------------------------

using System.Collections.Generic;
using Microsoft.Identity.Client.AppConfig;
using Microsoft.Identity.Client.TelemetryCore;

namespace Microsoft.Identity.Client.ApiConfig.Parameters
Expand All @@ -39,4 +38,4 @@ internal class AcquireTokenCommonParameters
public string Claims { get; set; }
public AuthorityInfo AuthorityOverride { get; set; }
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -61,4 +61,4 @@ public enum AadAuthorityAudience
/// </summary>
PersonalMicrosoftAccount
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Identity.Client/AppConfig/ApplicationOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -125,4 +125,4 @@ public abstract class ApplicationOptions
/// </summary>
public string Component { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.Identity.Client/AppConfig/AuthorityInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
using System.Globalization;
using Microsoft.Identity.Client.Exceptions;

namespace Microsoft.Identity.Client.AppConfig
namespace Microsoft.Identity.Client
{
internal class AuthorityInfo
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Identity.Client/AppConfig/AuthorityType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//
// ------------------------------------------------------------------------------

namespace Microsoft.Identity.Client.AppConfig
namespace Microsoft.Identity.Client
{
/// <summary>
/// </summary>
Expand All @@ -43,4 +43,4 @@ internal enum AuthorityType
/// </summary>
B2C
}
}
}
4 changes: 2 additions & 2 deletions src/Microsoft.Identity.Client/AppConfig/AzureCloud.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//
// ------------------------------------------------------------------------------

namespace Microsoft.Identity.Client.AppConfig
namespace Microsoft.Identity.Client
{
/// <summary>
/// </summary>
Expand Down Expand Up @@ -56,4 +56,4 @@ public enum AzureCloudInstance
/// </summary>
AzureUsGovernment,
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//
// ------------------------------------------------------------------------------

namespace Microsoft.Identity.Client.AppConfig
namespace Microsoft.Identity.Client
{
/// <summary>
/// Configuration options for a confidential client application
Expand All @@ -40,4 +40,4 @@ public class ConfidentialClientApplicationOptions : ApplicationOptions
/// </summary>
public string ClientSecret { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.Identity.Client/AppConfig/IAppConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

using Microsoft.Identity.Client.Internal;

namespace Microsoft.Identity.Client.AppConfig
namespace Microsoft.Identity.Client
{
internal interface IApplicationConfiguration : IAppConfig
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

using System.Net.Http;

namespace Microsoft.Identity.Client.AppConfig
namespace Microsoft.Identity.Client
{
/// <summary>
/// Http Client Factory
Expand All @@ -42,4 +42,4 @@ public interface IMsalHttpClientFactory
/// <returns>An Http client</returns>
HttpClient GetHttpClient();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading