Skip to content

Commit 417ed60

Browse files
yoavrubinyoavrubin
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents e933dfb + 01d0588 commit 417ed60

File tree

200 files changed

+19630
-10444
lines changed

Some content is hidden

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

200 files changed

+19630
-10444
lines changed

‎ChangeLog.txt

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
2015.07.16 version 0.9.5
2+
* Azure RedisCache cmdlets
3+
* Set-AzureRedisCache - Bug fix done in management API that fixes bug here as well
24
* Azure Network Resource Provider cmdlets
35
* Added Application Gateway cmdlets
46
* New-AzureApplicationGateway
@@ -59,9 +61,21 @@
5961
* Set-AzureApplicationGatewaySslCertificate
6062
* Get-AzureApplicationGatewaySslCertificate
6163
* Remove-AzureApplicationGatewaySslCertificate
62-
*Azure Network cmdlets
63-
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
64-
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
64+
* Fixed minor bugs AzureLoadbalancer
65+
* Renamed Get-AzureCheckDnsAvailablity to Test-AzureDnsAvailability
66+
* Added cmdlets to RouteTables and Routes
67+
* New-AzureRouteTable
68+
* Get-AzureRouteTable
69+
* Set-AzureRouteTable
70+
* Remove-AzureRouteTable
71+
* New-AzureRouteConfig
72+
* Add-AzureRouteConfig
73+
* Set-AzureRouteConfig
74+
* Get-AzureRouteConfig
75+
* Remove-AzureRouteConfig
76+
*Azure Network cmdlets
77+
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
78+
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
6579

6680
2015.07.10 version 1.0.0
6781
* Azure Backup cmdlets
@@ -74,6 +88,10 @@
7488
* Fixed formatting of output for Get-UsageAggregates
7589
* Fixed executing Get-UsageAggregates when first cmdlet being called.
7690

91+
* Azure Data Factory cmdlets
92+
* Upgraded management library to 1.0.0 with breaking JSON format change.
93+
* Updated list operation paging support in cmdlets.
94+
7795
2015.06.26 version 0.9.4
7896
* Azure Compute cmdlets
7997
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
@@ -111,6 +129,12 @@
111129
* Get-AzureSqlDatabaseRestorePoints
112130
* Changed cmdlets:
113131
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
132+
* Azure Recovery Services
133+
* Fixed Storage and Network mapping issues
134+
* Added encryption support for failover changes
135+
* Added Delete vault support
136+
* Provisioned to update VM properties
137+
* Few bug fixes
114138

115139
2015.06.05 version 0.9.3
116140
* Fixed bug in Websites cmdlets related to slots #454

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -768,9 +768,6 @@
768768
<Component Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" Guid="*">
769769
<File Id="filBD789B715F4C6F58DFFACC4839072346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Services.Client.dll" />
770770
</Component>
771-
<Component Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" Guid="*">
772-
<File Id="filF8F961D8FC629431B44B43A76538C334" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataFactories.Runtime.dll" />
773-
</Component>
774771
<Component Id="cmp2E106693251FC564A4D03DA3778E26F7" Guid="*">
775772
<File Id="fil3F27EAE226BD87840D5E9CE662DE26F9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataTransfer.Gateway.Encryption.dll" />
776773
</Component>
@@ -3089,6 +3086,9 @@
30893086
<Component Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" Guid="*">
30903087
<File Id="fil7BC44111780DA333D7D3C421E0660012" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.dll-help.xml" />
30913088
</Component>
3089+
<Component Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" Guid="*">
3090+
<File Id="fil91A18D6C24D483473C8F08BC5DCED268" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Commands.RecoveryServices.format.ps1xml" />
3091+
</Component>
30923092
<Component Id="cmpF2406A263F1B403C803ACB70D2468624" Guid="*">
30933093
<File Id="fil2AB9A3CCA503D5D983784642C1F8E4F4" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.Azure.Common.Authentication.dll" />
30943094
</Component>
@@ -4305,7 +4305,6 @@
43054305
<ComponentRef Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" />
43064306
<ComponentRef Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" />
43074307
<ComponentRef Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" />
4308-
<ComponentRef Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" />
43094308
<ComponentRef Id="cmp2E106693251FC564A4D03DA3778E26F7" />
43104309
<ComponentRef Id="cmp7BF776718E3154F969306B3FB853D175" />
43114310
<ComponentRef Id="cmp4F6E42879531C2B7A830BA3B4FF4033B" />
@@ -5052,6 +5051,7 @@
50525051
<ComponentRef Id="cmp5FB7157FEA8EDC9D2D10814DA15518AE" />
50535052
<ComponentRef Id="cmpCA80C6C0F5670291AF2F3560D36B1EA3" />
50545053
<ComponentRef Id="cmp1E1EACEE941A7D7B9B2649BB3AC9ABC3" />
5054+
<ComponentRef Id="cmp9C20E0942BCFF51F8948DDE7E47043F9" />
50555055
<ComponentRef Id="cmpF2406A263F1B403C803ACB70D2468624" />
50565056
<ComponentRef Id="cmp8BF1C84B7C0D6D25264BEF64FD945354" />
50575057
<ComponentRef Id="cmp18ED74EDB82DE2351B9655ED86ACA19A" />

‎src/Common/Commands.ScenarioTests.Common/Mocks/MockClientFactory.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
using System.Net;
2020
using System.Net.Http;
2121
using System.Net.Http.Headers;
22+
using System.Threading;
23+
using System.Threading.Tasks;
2224
using Hyak.Common;
2325
using Microsoft.Azure.Test.HttpRecorder;
2426
using Microsoft.Azure.Common;
@@ -96,7 +98,7 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
9698
{
9799
throw new ArgumentException(
98100
string.Format("TestManagementClientHelper class wasn't initialized with the {0} client.",
99-
typeof(TClient).Name));
101+
typeof (TClient).Name));
100102
}
101103
else
102104
{
@@ -107,6 +109,13 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
107109
return newRealClient;
108110
}
109111
}
112+
else
113+
{
114+
// Use the WithHandler method to create an extra reference to the http client
115+
// this will prevent the httpClient from being disposed in a long-running test using
116+
// the same client for multiple cmdlets
117+
client = client.WithHandler(new PassThroughDelegatingHandler());
118+
}
110119

111120
return client;
112121
}
@@ -162,5 +171,17 @@ public void AddUserAgent(string productName)
162171
}
163172

164173
public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
174+
175+
/// <summary>
176+
/// This class exists to allow adding an additional reference to the httpClient to prevent the client
177+
/// from being disposed. Should not be used execpt in this mocked context.
178+
/// </summary>
179+
class PassThroughDelegatingHandler : DelegatingHandler
180+
{
181+
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
182+
{
183+
return base.SendAsync(request, cancellationToken);
184+
}
185+
}
165186
}
166187
}

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.DataFactories">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.12-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.ResourceManager">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -77,9 +77,6 @@
7777
<SpecificVersion>False</SpecificVersion>
7878
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.DataFactories.Runtime">
81-
<HintPath>..\..\..\packages\Microsoft.DataFactories.Runtime.0.11.1-preview\lib\net45\Microsoft.DataFactories.Runtime.dll</HintPath>
82-
</Reference>
8380
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8481
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
8582
</Reference>
@@ -208,53 +205,53 @@
208205
<None Include="ScenarioTests\DataFactoryTests.ps1">
209206
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
210207
</None>
211-
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
212-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
213-
</None>
214208
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGateway.json">
215-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
209+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
216210
</None>
217211
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGatewayWithDataFactoryParameter.json">
218-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
212+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
213+
</None>
214+
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
215+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
219216
</None>
220217
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestCreateDataFactory.json">
221-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
218+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
222219
</None>
223220
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDataFactoryPiping.json">
224-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
221+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
225222
</None>
226223
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDeleteDataFactoryWithDataFactoryParameter.json">
227-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
224+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
228225
</None>
229226
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestGetNonExistingDataFactory.json">
230-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
227+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
231228
</None>
232229
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHub.json">
233-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
230+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
234231
</None>
235232
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubPiping.json">
236-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
233+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
237234
</None>
238235
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubWithDataFactoryParameter.json">
239-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
236+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
240237
</None>
241238
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedService.json">
242-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
239+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
243240
</None>
244241
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServicePiping.json">
245-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
242+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
246243
</None>
247244
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServiceWithDataFactoryParameter.json">
248-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
245+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
249246
</None>
250247
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTable.json">
251-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
248+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
252249
</None>
253250
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTablePiping.json">
254-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
251+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
255252
</None>
256253
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTableWithDataFactoryParameter.json">
257-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
254+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
258255
</None>
259256
</ItemGroup>
260257
<ItemGroup>

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DA_CuratedUncycloData.json

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DA_UncycloAggregatedData.json

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DA_UncyclopediaClickEvents.json

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/DP_Uncyclosamplev2json.json

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/UncycloSamplePipeline/LinkedService_CuratedUncycloData.json

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

0 commit comments

Comments
 (0)