Skip to content

Commit e0a55f3

Browse files
authored
Merge pull request #104 from markcowl/az100
Common code removal and aliases for 1.0
2 parents e30aae3 + 58506e2 commit e0a55f3

11 files changed

+7
-284
lines changed

src/Authentication.Abstractions/Authentication.Abstractions.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,13 @@
9696
<DesignTime>True</DesignTime>
9797
<DependentUpon>Resources.resx</DependentUpon>
9898
</Compile>
99-
<Compile Include="Settings\SessionSettings.cs" />
10099
<Compile Include="Interfaces\IStorageContext.cs" />
101-
<Compile Include="Settings\ClientFactorySettings.cs" />
102-
<Compile Include="Settings\AuthenticationFactorySettings.cs" />
103-
<Compile Include="Settings\DataStorageSettings.cs" />
104100
<Compile Include="AzureEnvironment.cs" />
105101
<Compile Include="AzureTenant.cs" />
106102
<Compile Include="AzureSubscription.cs" />
107103
<Compile Include="AzureContext.cs" />
108-
<Compile Include="Settings\ClientActionSettings.cs" />
109104
<Compile Include="Interfaces\IAzureContextContainer.cs" />
110105
<Compile Include="Interfaces\IStorageContextProvider.cs" />
111-
<Compile Include="Settings\UserAgentSettings.cs" />
112-
<Compile Include="Settings\HandlerSettings.cs" />
113106
<Compile Include="Properties\AssemblyInfo.cs" />
114107
<Compile Include="Utilities\FileUtilities.cs" />
115108
</ItemGroup>

src/Authentication.Abstractions/AzureEnvironmentConstants.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
1919
/// </summary>
2020
public static class AzureEnvironmentConstants
2121
{
22+
/// <summary>
23+
/// The default AD Tenant value
24+
/// </summary>
25+
public const string CommonAdTenant = "Common";
26+
2227
/// <summary>
2328
/// RDFE endpoints
2429
/// </summary>

src/Authentication.Abstractions/Settings/AuthenticationFactorySettings.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/Authentication.Abstractions/Settings/ClientActionSettings.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/Authentication.Abstractions/Settings/ClientFactorySettings.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/Authentication.Abstractions/Settings/DataStorageSettings.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/Authentication.Abstractions/Settings/HandlerSettings.cs

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/Authentication.Abstractions/Settings/SessionSettings.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/Authentication.Abstractions/Settings/UserAgentSettings.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/ResourceManager/Version2016_09_01/AzureRMCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public AzureRMCmdlet()
5858
/// Gets or sets the global profile for ARM cmdlets.
5959
/// </summary>
6060
[Parameter(Mandatory =false, HelpMessage= "The credentials, account, tenant, and subscription used for communication with Azure.")]
61-
[Alias("AzureRmContext", "AzureCredential")]
61+
[Alias("AzContext", "AzureRmContext", "AzureCredential")]
6262
public IAzureContextContainer DefaultProfile
6363
{
6464
get

src/ResourceManager/Version2016_09_01/Utilities/SubscriptionAndTenantHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private static IEnumerable<AzureSubscription> ListAllSubscriptionsForTenant(
146146

147147
private static string GetCommonTenant(IAzureAccount account)
148148
{
149-
string result = AuthenticationFactorySettings.CommonAdTenant;
149+
string result = AzureEnvironmentConstants.CommonAdTenant;
150150
if (account.IsPropertySet(AzureAccount.Property.Tenants))
151151
{
152152
var candidate = account.GetTenants().FirstOrDefault();

0 commit comments

Comments
 (0)