Skip to content
Closed
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
2 changes: 2 additions & 0 deletions src/ResourceManager/Profile/Commands.Profile/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Current Release
* Fix issue with context name clashing for accounts with no subscriptions in tenant
- https://github.com/Azure/azure-powershell/issues/7453
* Fix error message for failed login when providing tenant domain
- https://github.com/Azure/azure-powershell/issues/6936

Expand Down
34 changes: 17 additions & 17 deletions src/ResourceManager/Profile/Commands.Profile/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Aks" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Compute" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Network" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Websites" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Aks" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.ResourceManager" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Compute" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Graph.Rbac" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.KeyVault" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Network" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Strategies" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Websites" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net4522" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.0" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authorization" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ScenarioTest" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ServiceManagement" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage.Management" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net4522" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Commands.Storage/Commands.Storage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Commands.ResourceManager.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.PowerShell.ResourceManager.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Azure.PowerShell.ResourceManager.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Storage/Commands.Storage/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net452" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.1.4-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Authentication.Abstractions" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Common" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.ResourceManager" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.PowerShell.Storage" version="1.0.202-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Storage.DataMovement" version="0.8.1" targetFramework="net452" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
Expand Down
6 changes: 3 additions & 3 deletions tools/Common.Dependencies.Test.targets
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.ScenarioTest.Common, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.ScenarioTest.Common.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.ScenarioTest.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Commands.ServiceManagement.Common, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.1.4-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ServiceManagement.1.0.202-preview\lib\net452\Microsoft.WindowsAzure.Commands.ServiceManagement.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down Expand Up @@ -66,7 +66,7 @@
</Reference>
</ItemGroup>
<PropertyGroup>
<ScenarioTestToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.1.4-preview\tools\</ScenarioTestToolsPath>
<ScenarioTestToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.202-preview\tools\</ScenarioTestToolsPath>
</PropertyGroup>
<ItemGroup>
<None Include="$(ScenarioTestToolsPath)Assert.ps1">
Expand Down
32 changes: 16 additions & 16 deletions tools/Common.Dependencies.targets
Original file line number Diff line number Diff line change
Expand Up @@ -94,67 +94,67 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.Azure.Commands.Common.Aks, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Aks.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Aks.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Aks.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Aks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Authentication, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authentication.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authentication.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Authentication.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authentication.Abstractions.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Authentication.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authentication.ResourceManager.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.ResourceManager.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authentication.ResourceManager.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Authentication.ResourceManager.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Authorization, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authorization.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Authorization.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Authorization.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Authorization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Commands.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Common.1.1.4-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Common.1.0.202-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Compute, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Compute.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Compute.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Compute.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Compute.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Graph.RBAC, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Graph.Rbac.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Graph.RBAC.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Graph.Rbac.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Graph.RBAC.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.KeyVault.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.KeyVault.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.KeyVault.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.KeyVault.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Network, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Network.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Network.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Network.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.ResourceManager.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ResourceManager.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.ResourceManager.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.ResourceManager.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Commands.Common.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Storage.1.1.4-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.Storage.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Storage.1.0.202-preview\lib\net452\Microsoft.WindowsAzure.Commands.Common.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Storage.Management, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Storage.Management.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Storage.Management.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Storage.Management.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Storage.Management.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.Strategies.4, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Strategies.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.Strategies.4.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Strategies.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.Strategies.4.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Commands.Common.WebSites, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Websites.1.1.4-preview\lib\net452\Microsoft.Azure.Commands.Common.WebSites.dll</HintPath>
<HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Websites.1.0.202-preview\lib\net452\Microsoft.Azure.Commands.Common.WebSites.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<PropertyGroup>
<StorageToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Storage.1.1.4-preview\tools\</StorageToolsPath>
<StorageToolsPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.PowerShell.Storage.1.0.202-preview\tools\</StorageToolsPath>
</PropertyGroup>
</Project>
Loading