Skip to content

Commit 7c57eff

Browse files
yaakoviyunyaakoviyun
committed
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
2 parents 10958db + e5b96d7 commit 7c57eff

File tree

48 files changed

+2406
-972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2406
-972
lines changed

‎documentation/Repo-Tasks-Module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###### Usage:
44

55
1. Start .\tools\PS-VSPrompt.lnk (shortcut), this will start VS Dev Prompt in powershell
6-
2. Import-Module .\tools\Repo-Tasks.psd1
6+
2. Import-Module .\Repo-Tasks.psd1
77
1. During import, we allow to load additional functions that users might want to use it in their session.
88
2. If you have any userPreference.ps1 file under %userprofile%/psFiles directory, the module will try to load it by dot sourcing it.
99
2. It will also honor environment variable $env:psuserpreferences and load .ps1 files from the location that is pointed by $env:psuserpreferences

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,10 @@ function Test-VirtualMachine
236236

237237
$vm2 = Get-AzureRmVM -Name $vmname2 -ResourceGroupName $rgname;
238238
Assert-NotNull $vm2;
239-
# Assert-AreEqual $vm2.AvailabilitySetReference.Id $asetId;
240-
# Assert-True { $vm2.ResourceGroupName -eq $rgname }
239+
$vm2_out = $vm2 | Out-String
240+
Assert-True {$vm2_out.Contains("AvailabilitySetReference")};
241+
Assert-AreEqual $vm2.AvailabilitySetReference.Id $asetId;
242+
Assert-True { $vm2.ResourceGroupName -eq $rgname }
241243

242244
# Remove
243245
Remove-AzureRmVM -Name $vmname2 -ResourceGroupName $rgname -Force;

‎src/ResourceManager/Compute/Commands.Compute/VirtualMachine/VirtualMachineBaseCmdlet.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ private static int GetTabLength(Object obj, int max, int depth, List<Tuple<strin
186186
else
187187
{
188188
tupleList.Add(MakeTuple(property.Name, GetChildProperties(childObject), depth));
189+
max = Math.Max(max, property.Name.Length);
189190
}
190191
}
191192
}

‎src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.Management.HDInsight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.2.0.0\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
54+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.2.0.1\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Microsoft.Azure.Management.HDInsight.Job">

‎src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.HDInsight" version="2.0.0" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.HDInsight" version="2.0.1" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.HDInsight.Job" version="2.0.3" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />

‎src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@
128128
<Reference Include="Microsoft.Azure.Graph.RBAC">
129129
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.2.0-preview\lib\net45\Microsoft.Azure.Graph.RBAC.dll</HintPath>
130130
</Reference>
131-
<Reference Include="Microsoft.Azure.Management.HDInsight">
132-
<SpecificVersion>False</SpecificVersion>
133-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.2.0.0\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
131+
<Reference Include="Microsoft.Azure.Management.HDInsight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
132+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.HDInsight.2.0.1\lib\net40\Microsoft.Azure.Management.HDInsight.dll</HintPath>
133+
<Private>True</Private>
134134
</Reference>
135135
<Reference Include="Microsoft.Azure.Management.HDInsight.Job">
136136
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/HDInsight/Commands.HDInsight/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Graph.RBAC" version="3.2.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.HDInsight" version="2.0.0" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.HDInsight" version="2.0.1" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.HDInsight.Job" version="2.0.3" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/VaultManagementClient.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ public PSVault UpdateVault(PSVault existingVault, PSVaultAccessPolicy[] updatedP
167167
parameters: new VaultCreateOrUpdateParameters()
168168
{
169169
Location = existingVault.Location,
170-
Properties = properties
170+
Properties = properties,
171+
Tags = TagsConversionHelper.CreateTagDictionary(existingVault.Tags, validate: true)
171172
}
172173
);
173174
return new PSVault(response, adClient);

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/SslCertificate/AzureApplicationGatewaySslCertificateBase.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
using Microsoft.Azure.Commands.Network.Models;
1616
using System;
17+
using System.IO;
1718
using System.Management.Automation;
1819
using System.Security.Cryptography.X509Certificates;
1920

@@ -41,12 +42,10 @@ public class AzureApplicationGatewaySslCertificateBase : NetworkBaseCmdlet
4142

4243
public PSApplicationGatewaySslCertificate NewObject()
4344
{
44-
X509Certificate2 cert = new X509Certificate2(CertificateFile, Password, X509KeyStorageFlags.Exportable);
45-
4645
var sslCertificate = new PSApplicationGatewaySslCertificate();
4746

4847
sslCertificate.Name = this.Name;
49-
sslCertificate.Data = Convert.ToBase64String(cert.Export(X509ContentType.Pfx, Password));
48+
sslCertificate.Data = Convert.ToBase64String(File.ReadAllBytes(CertificateFile));
5049
sslCertificate.Password = this.Password;
5150
sslCertificate.Id =
5251
ApplicationGatewayChildResourceHelper.GetResourceNotSetId(

0 commit comments

Comments
 (0)