Skip to content

Merge profile branch into dev #173

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.

Sign up for GitHub

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

Merged
merged 48 commits into from
Feb 18, 2015
Merged

Merge profile branch into dev #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
769079f
Adding NewAzureProfileCommand stub
Jan 27, 2015
b770452
Breaking everything - referencing new Azure.Common.Authorization library
Jan 27, 2015
ea9abae
Referencing latest Authentication client.
Jan 28, 2015
9ff1154
Referencing latest Common.Authentication package
Jan 28, 2015
5029025
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Jan 28, 2015
9d3befd
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Jan 29, 2015
3826235
making tenant mandatory argument for New-AzureProfile
Jan 29, 2015
052bad3
Merge branch 'dev' of github.com:Azure/azure-powershell into profile
Jan 30, 2015
546bf08
Referencing latest Common.Authentication library
Feb 2, 2015
afd3177
Resources Cleanup
Feb 2, 2015
822cb3d
Fixing build breaks and aligning ADAL package references
Feb 2, 2015
37f1488
Merge branch 'profile' of github.com:hovsepm/azure-powershell into pr…
Feb 2, 2015
19fd2f0
Merge pull request #1 from ogail/profile
Feb 2, 2015
9a88d6e
Fixing Common.Profile tests
Feb 2, 2015
d6c70cf
Merge branch 'profile' of github.com:hovsepm/azure-powershell into pr…
Feb 2, 2015
403afca
Fixing failing tests and updating reference to Common.Authentication'…
Feb 3, 2015
d7da22c
Fixed RecoveryServices tests
stankovski Feb 3, 2015
eb4d8f4
Merge pull request #132 from stankovski/profile
stankovski Feb 3, 2015
bfbbaf3
Add azure profile parameter
stankovski Feb 3, 2015
cfba760
Merge branch 'profile' of https://github.com/Azure/azure-powershell i…
stankovski Feb 3, 2015
1656ff9
referencing latest authentication
stankovski Feb 3, 2015
62a6e84
Converting code to use stateless Profile parameter instead of one fro…
stankovski Feb 3, 2015
4a3ea7e
Changing tests to use in-memory AzureProfile and bumping up version o…
Feb 3, 2015
503fd0d
Fixing build breaks
Feb 4, 2015
e15a2dc
Fixing CI build breaks
Feb 4, 2015
441d872
Fixed GalleryClient
Feb 4, 2015
5ef07b2
Fixing build breaks. Episode 2.
Feb 4, 2015
b1e6c75
Fixing Website tests
Feb 4, 2015
9e74167
Fixing Websites.GetAzureWebsiteTests.ProcessGetWebsiteWithNullSubscri…
Feb 4, 2015
4e3a21d
do not use sdkinternal myget feed
yugangw-msft Feb 5, 2015
1601c84
bump up the adal version
yugangw-msft Feb 5, 2015
9bdab99
Revert "bump up the adal version"
yugangw-msft Feb 6, 2015
a867ebc
Merge pull request #143 from yugangw-msft/nomyget
stankovski Feb 6, 2015
cafa38f
Fixing Sql Server Database Context Test
markcowl Feb 7, 2015
0df9a19
Merge pull request #148 from markcowl/newprofile
markcowl Feb 9, 2015
8bb370f
Added test infrastructure for profile cmdlets
stankovski Feb 11, 2015
44531e7
Removed code for access token and fixed certificate test
stankovski Feb 11, 2015
10bb365
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
stankovski Feb 11, 2015
662a811
Fixed merge issues
stankovski Feb 11, 2015
8678554
Updated to Authentication package 1.0.7
stankovski Feb 11, 2015
a9601ac
Added tests for token and user based new profile cmdlet
stankovski Feb 12, 2015
ea109dc
Updated to latest version of Azure.Common and Authentication
stankovski Feb 12, 2015
8dda7e1
Fixed null ref exception in MockClientFactory.CreateClient method
stankovski Feb 12, 2015
fbf56ed
Fixed MockClientFactory behavior
stankovski Feb 12, 2015
9ca8de6
Update wxi
jianghaolu Feb 12, 2015
96b62ba
Merge pull request #165 from ljhljh235/profile
markcowl Feb 14, 2015
3ecdbf7
Merge branch 'dev' of github.com:Azure/azure-powershell into profile
Feb 17, 2015
bdef7d5
Regenerate MSI
Feb 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 2 additions & 14 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,12 @@
<!-- Delete NuGet cache-->
<Delete Files="@(NuGetCache)" />

<Delete Files="$(NuGetRestoreConfigFile)" />
<WriteLinesToFile File="$(NuGetRestoreConfigFile)" Lines="&lt;configuration&gt;&lt;/configuration&gt;" Overwrite="true" Encoding="UTF-8" />
<!-- Create config for user name and password for private feed access -->
<Exec Command="$(NuGetCommand) sources add -Name AzureSdkInternal -Source &quot;https://www.myget.org/F/azure-sdk-internal/&quot; $(NuGetRestoreConfigSwitch)" />
<CallTarget Targets="ForceRestorePackagesFromPrivateFeed"/>
<!-- Restore packages -->
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
<!-- delete config file, don't want to leave passwords hanging around on the build server file system -->
<Delete Files="$(NuGetRestoreConfigFile)" />
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln" ContinueOnError="false" />

<!--Restore the xunit runner needed to run unit tests-->
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
</Target>

<Target Name="ForceRestorePackagesFromPrivateFeed" Condition="'$(PRIVATE_FEED_PASSWORD)' != ''">
<Exec Command="$(NuGetCommand) sources add -Name Hydra -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" />
<Exec Command="$(NuGetCommand) sources Update -Name Hydra -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)"
EchoOff="true" />
</Target>

<!-- Build all flavors of the Cmdlets -->
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
Expand Down
252 changes: 88 additions & 164 deletions setup/azurecmdfiles.wxi
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@
<ItemGroup>
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Hyak.Common.1.0.1\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
<HintPath>..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.Extensions, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Common.Authentication">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Extensions.0.14.0-preview\lib\net45\Microsoft.Azure.Common.Extensions.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.8-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -77,12 +77,12 @@
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
8 changes: 4 additions & 4 deletions src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
using System;
using System.Collections.Generic;
using Microsoft.WindowsAzure.Commands.Common;
using Microsoft.Azure.Common.Extensions.Models;
using Microsoft.Azure.Common.Authentication.Models;
using Microsoft.WindowsAzure.Commands.Common.Storage;
using Microsoft.WindowsAzure.Management.Storage;
using Microsoft.WindowsAzure.Storage;
using Microsoft.Azure.Common.Extensions;
using Microsoft.Azure.Common.Authentication;

namespace Microsoft.WindowsAzure.Commands.Utilities.Common
{
public static class WindowsAzureSubscriptionExtensions
{
private static Dictionary<Guid, CloudStorageAccount> storageAccountCache = new Dictionary<Guid,CloudStorageAccount>();

public static CloudStorageAccount GetCloudStorageAccount(this AzureSubscription subscription)
public static CloudStorageAccount GetCloudStorageAccount(this AzureSubscription subscription, AzureProfile profile)
{
if (subscription == null)
{
return null;
}

using (var storageClient = AzureSession.ClientFactory.CreateClient<StorageManagementClient>(subscription, AzureEnvironment.Endpoint.ServiceManagement))
using (var storageClient = AzureSession.ClientFactory.CreateClient<StorageManagementClient>(profile, subscription, AzureEnvironment.Endpoint.ServiceManagement))
{
return StorageUtilities.GenerateCloudStorageAccount(
storageClient, subscription.GetProperty(AzureSubscription.Property.StorageAccount));
Expand Down
8 changes: 4 additions & 4 deletions src/Common/Commands.Common.Storage/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Hyak.Common" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.0.1" targetFramework="net45" />
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
Expand Down
21 changes: 10 additions & 11 deletions src/Common/Commands.Common.Test/Commands.Common.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,24 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Hyak.Common">
<HintPath>..\..\packages\Hyak.Common.1.0.1\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
<HintPath>..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common">
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.Extensions, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Common.Authentication">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Common.Extensions.0.14.0-preview\lib\net45\Microsoft.Azure.Common.Extensions.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.8-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.1\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.2\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5486.28526-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5513.27084-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
Expand All @@ -77,13 +77,13 @@
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -156,7 +156,6 @@
<ItemGroup>
<Compile Include="Common\AuthenticationFactoryTests.cs" />
<Compile Include="Common\ProfileCmdltsTests.cs" />
<Compile Include="Common\ProfileClientTests.cs" />
<Compile Include="Common\ServicePrincipalStoreTests.cs" />
<Compile Include="Common\GeneralUtilitiesTests.cs" />
<Compile Include="Common\Data.cs" />
Expand Down
31 changes: 15 additions & 16 deletions src/Common/Commands.Common.Test/Common/AuthenticationFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
using System.Collections.Generic;
using Xunit;
using System;
using Microsoft.Azure.Common.Extensions.Factories;
using Microsoft.Azure.Common.Authentication.Factories;
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
using Microsoft.Azure.Common.Extensions.Authentication;
using Microsoft.Azure.Common.Extensions.Models;
using Microsoft.Azure.Common.Authentication;
using Microsoft.Azure.Common.Authentication.Models;

namespace Microsoft.WindowsAzure.Commands.Common.Test.Common
{
Expand All @@ -34,10 +34,16 @@ public void VerifySubscriptionTokenCacheRemove()

var subscriptionId = Guid.NewGuid();

var credential = authFactory.GetSubscriptionCloudCredentials(new AzureContext
{
Environment = AzureEnvironment.PublicEnvironments["AzureCloud"],
Account = new AzureAccount
var credential = authFactory.GetSubscriptionCloudCredentials(new AzureContext(
new AzureSubscription
{
Id = subscriptionId,
Properties = new Dictionary<AzureSubscription.Property, string>
{
{ AzureSubscription.Property.Tenants, "123"}
}
},
new AzureAccount
{
Id = "testuser",
Type = AzureAccount.AccountType.User,
Expand All @@ -46,16 +52,9 @@ public void VerifySubscriptionTokenCacheRemove()
{ AzureAccount.Property.Tenants, "123" }
}
},
Subscription = new AzureSubscription
{
Id = subscriptionId,
Properties = new Dictionary<AzureSubscription.Property, string>
{
{ AzureSubscription.Property.Tenants, "123"}
}
}
AzureEnvironment.PublicEnvironments["AzureCloud"]

});
));

Assert.True(credential is AccessTokenCredential);
Assert.Equal(subscriptionId, new Guid(((AccessTokenCredential)credential).SubscriptionId));
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Test/Common/ConversionUtilitiesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using System.Collections.Generic;
using Microsoft.WindowsAzure.Commands.Utilities.Common;
using Xunit;
using Microsoft.Azure.Common.Extensions;
using Microsoft.Azure.Common.Authentication;

namespace Microsoft.WindowsAzure.Commands.Common.Test
{
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common.Test/Common/Data.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
using Microsoft.WindowsAzure.Commands.Utilities.Common;
using Microsoft.WindowsAzure.Commands.Common;
using Microsoft.Azure.Common.Extensions;
using Microsoft.Azure.Common.Authentication;

namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common
{
Expand Down Expand Up @@ -66,7 +66,7 @@ public static class Data

static Data()
{
AzureAppDir = Path.Combine(Directory.GetCurrentDirectory(), Resources.AzureDirectoryName);
AzureAppDir = AzureSession.ProfileDirectory;
AzureSdkAppDir = Path.Combine(Directory.GetCurrentDirectory(), "Microsoft Azure PowerShell");
TestResultDirectory = FileUtilities.GetAssemblyDirectory();

Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Test/Common/GeneralTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using System.IO;
using Microsoft.WindowsAzure.Commands.Utilities.Common;
using Xunit;
using Microsoft.Azure.Common.Extensions;
using Microsoft.Azure.Common.Authentication;

namespace Microsoft.WindowsAzure.Commands.Common.Test.Common
{
Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commands.Common.Test/Common/JsonUtilitiesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Xunit;
using Microsoft.Azure.Common.Extensions;
using Microsoft.Azure.Common.Authentication;

namespace Microsoft.WindowsAzure.Commands.Common.Test.Common
{
Expand Down
Loading