Skip to content

Commit 80e3683

Browse files
cormacpaynecormacpayne
committed
Merge branch 'dev' of github.com:Azure/azure-powershell-common into enable-certs
2 parents e9656fe + 6f254da commit 80e3683

24 files changed

+776
-53
lines changed

‎Azure.PowerShell.Common.Netcore.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compute.Test.Netcore", "src
4343
EndProject
4444
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strategies.Test.Netcore", "src\Strategies.Test\Strategies.Test.Netcore.csproj", "{6756A7F2-1141-4065-BA23-0C555D2A2BC3}"
4545
EndProject
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFx.Netcore", "src\TestFx\TestFx.Netcore.csproj", "{1E20E5A0-3353-4888-9B29-AE1A2C1C8DD0}"
47+
EndProject
4648
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.Test.Netcore", "src\Authentication.Test\Authentication.Test.Netcore.csproj", "{78D9B754-6A18-4125-80CC-63437BDE3244}"
4749
EndProject
4850
Global
@@ -127,6 +129,10 @@ Global
127129
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
128130
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
129131
{6756A7F2-1141-4065-BA23-0C555D2A2BC3}.Release|Any CPU.Build.0 = Release|Any CPU
132+
{1E20E5A0-3353-4888-9B29-AE1A2C1C8DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{1E20E5A0-3353-4888-9B29-AE1A2C1C8DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{1E20E5A0-3353-4888-9B29-AE1A2C1C8DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
135+
{1E20E5A0-3353-4888-9B29-AE1A2C1C8DD0}.Release|Any CPU.Build.0 = Release|Any CPU
130136
{78D9B754-6A18-4125-80CC-63437BDE3244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131137
{78D9B754-6A18-4125-80CC-63437BDE3244}.Debug|Any CPU.Build.0 = Debug|Any CPU
132138
{78D9B754-6A18-4125-80CC-63437BDE3244}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎Azure.PowerShell.Common.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Strategies.Test", "src\Stra
5151
EndProject
5252
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScenarioTest", "src\ScenarioTest\ScenarioTest.csproj", "{C1BDA476-A5CC-4394-914D-48B0EC31A710}"
5353
EndProject
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFx", "src\TestFx\TestFx.csproj", "{8C625DE3-0067-454A-AF2C-EFD672EEB31A}"
55+
EndProject
5456
Global
5557
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5658
Debug|Any CPU = Debug|Any CPU
@@ -149,6 +151,10 @@ Global
149151
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Debug|Any CPU.Build.0 = Debug|Any CPU
150152
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Release|Any CPU.ActiveCfg = Release|Any CPU
151153
{C1BDA476-A5CC-4394-914D-48B0EC31A710}.Release|Any CPU.Build.0 = Release|Any CPU
154+
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
155+
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Debug|Any CPU.Build.0 = Debug|Any CPU
156+
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Release|Any CPU.ActiveCfg = Release|Any CPU
157+
{8C625DE3-0067-454A-AF2C-EFD672EEB31A}.Release|Any CPU.Build.0 = Release|Any CPU
152158
EndGlobalSection
153159
GlobalSection(SolutionProperties) = preSolution
154160
HideSolutionNode = FALSE

‎build/sign.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<ItemGroup>
2424
<UnsignedFiles Include="$(OutputDir)net452\Microsoft.Azure.Commands*.dll" />
2525
<UnsignedFiles Include="$(OutputDir)net452\Microsoft.WindowsAzure.Commands*.dll" />
26+
<UnsignedFiles Include="$(OutputDir)net452\Microsoft.Azure.PowerShell*.dll" Exclude="$(OutputDir)net452\Microsoft.Azure.PowerShell*.Test.dll" />
2627
</ItemGroup>
2728
</Target>
2829

‎src/Aks/Aks.Netcore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="$(ProjectDir)..\Dependencies.Netcore.targets" />
4-
5-
<PropertyGroup>
4+
5+
<PropertyGroup>
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Aks</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Aks</RootNamespace>

‎src/Authentication.Abstractions/Authentication.Abstractions.Netcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</PropertyGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.4" />
41+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.5" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

‎src/Authentication.Abstractions/AzureEnvironmentConstants.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ public static class AzureEnvironmentConstants
130130
/// <summary>
131131
/// The domain name suffix for Azure DataLake services
132132
/// </summary>
133-
public const string AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "azuredatalakeanalytics.net";
134-
public const string AzureDataLakeStoreFileSystemEndpointSuffix = "azuredatalakestore.net";
133+
public const string AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "azuredatalakeanalytics.net/";
134+
public const string AzureDataLakeStoreFileSystemEndpointSuffix = "azuredatalakestore.net/";
135135

136136
/// <summary>
137137
/// The token audience for authorizing DataLake requests

‎src/Authentication.Abstractions/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.14" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.16" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net452" />
1313
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
1414
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
1515
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net40" />
@@ -19,8 +19,8 @@
1919
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
2020
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
2121
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
22-
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.0" targetFramework="net452" />
23-
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.4" targetFramework="net452" />
22+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.13.1" targetFramework="net452" />
23+
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.5" targetFramework="net452" />
2424
<package id="Microsoft.WindowsAzure.Management.Compute" version="14.0.0" targetFramework="net45" />
2525
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
2626
<package id="Moq" version="4.2.1510.2205" targetFramework="net40" />

‎src/Authentication.ResourceManager/AzureRmProfile.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,11 @@ public bool TryGetContextName(IAzureContext context, out string name)
401401
name = string.Format("{0} ({1}) - {2}", context.Subscription.Name, context.Subscription.Id, context.Account.Id);
402402
result = true;
403403
}
404+
else if (context.Tenant != null && context.Account != null)
405+
{
406+
name = string.Format("{0} - {1}", context.Tenant.Id, context.Account.Id);
407+
result = true;
408+
}
404409
else
405410
{
406411
name = "Default";

‎src/Dependencies.Netcore.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<IncludeSymbols>True</IncludeSymbols>
66
</PropertyGroup>
77
<ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
8-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
8+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.14" />
12-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.16" />
11+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.17" />
12+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.18" />
1313
</ItemGroup>
1414
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1515
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06" PrivateAssets="All" />
1616
</ItemGroup>
1717
<ItemGroup Condition="'$(IncludeHyak)' == 'true'">
1818
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
19-
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.0" />
20-
<PackageReference Include="Hyak.Common" Version="1.2.1" />
19+
<PackageReference Include="Microsoft.Azure.Common" Version="2.2.1" />
20+
<PackageReference Include="Hyak.Common" Version="1.2.2" />
2121
</ItemGroup>
2222
</Project>

‎src/Dependencies.Runtime.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<HintPath>$(PackagesDirectory)Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
1616
</Reference>
1717
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
18-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.14\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
18+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.2.3.17\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
1919
</Reference>
2020
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
21-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.16\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
21+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.3.3.18\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
2222
</Reference>
2323
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
2424
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
@@ -51,10 +51,10 @@
5151
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.Framework.3.0.0\lib\net452\Microsoft.Azure.Test.Framework.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.Test.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.HttpRecorder.1.13.0\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
54+
<HintPath>$(PackagesDirectory)Microsoft.Azure.Test.HttpRecorder.1.13.1\lib\net452\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.4\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
57+
<HintPath>$(PackagesDirectory)Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.5\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
6060
<HintPath>$(PackagesDirectory)Microsoft.WindowsAzure.Management.Storage.6.0.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

0 commit comments

Comments
 (0)