Skip to content

Commit 62bd8d1

Browse files
sethusrinivasansethusrinivasan
committed
Merge pull request #27 from Azure/dev
PR from parent
2 parents 3c1c9fb + 2afe8b3 commit 62bd8d1

File tree

159 files changed

+17028
-5130
lines changed

Some content is hidden

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

159 files changed

+17028
-5130
lines changed

‎ChangeLog.txt

Lines changed: 21 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.

‎setup/azurecmdfiles.wxi

Lines changed: 0 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>
@@ -4305,7 +4302,6 @@
43054302
<ComponentRef Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" />
43064303
<ComponentRef Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" />
43074304
<ComponentRef Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" />
4308-
<ComponentRef Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" />
43094305
<ComponentRef Id="cmp2E106693251FC564A4D03DA3778E26F7" />
43104306
<ComponentRef Id="cmp7BF776718E3154F969306B3FB853D175" />
43114307
<ComponentRef Id="cmp4F6E42879531C2B7A830BA3B4FF4033B" />

‎src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ function Run-StartAndStopMultipleVirtualMachinesTest
123123
Start-AzureVM -ServiceName $svcName -VM $vmList[0];
124124
Start-AzureVM -ServiceName $svcName -VM $vmList[0],$vmList[1];
125125
Start-AzureVM -ServiceName $svcName -VM $vmList;
126-
}
127-
catch
128-
{
129-
130126
}
131127
finally
132128
{

‎src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunStartAndStopMultipleVirtualMachinesTest.json

Lines changed: 3561 additions & 613 deletions
Large diffs are not rendered by default.

‎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/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,29 @@
2222
<DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<RunCodeAnalysis>true</RunCodeAnalysis>
26+
<UseVSHostingProcess>true</UseVSHostingProcess>
2527
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
<Prefer32Bit>false</Prefer32Bit>
2629
</PropertyGroup>
2730
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2831
<DebugType>pdbonly</DebugType>
2932
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
33+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\ApiManagement\</OutputPath>
34+
<DefineConstants>TRACE;SIGN</DefineConstants>
35+
<PlatformTarget>AnyCPU</PlatformTarget>
36+
<CodeAnalysisLogFile>bin\Release\Management.Automation.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
37+
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
38+
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
3239
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
40+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
41+
<CodeAnalysisRuleSetDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\Rule Sets</CodeAnalysisRuleSetDirectories>
42+
<CodeAnalysisRuleDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\FxCop\Rules</CodeAnalysisRuleDirectories>
43+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
44+
<SignAssembly>true</SignAssembly>
45+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
46+
<DelaySign>true</DelaySign>
47+
<Prefer32Bit>false</Prefer32Bit>
3448
</PropertyGroup>
3549
<ItemGroup>
3650
<Reference Include="AutoMapper">
@@ -222,6 +236,7 @@
222236
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
223237
</Content>
224238
<None Include="packages.config" />
239+
<None Include="MSSharedLibKey.snk" />
225240
</ItemGroup>
226241
<ItemGroup>
227242
<WCFMetadata Include="Service References\" />

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/MSSharedLibKey.snk

160 Bytes
Binary file not shown.

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,27 @@
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
2525
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
26+
<RunCodeAnalysis>true</RunCodeAnalysis>
27+
<UseVSHostingProcess>true</UseVSHostingProcess>
2628
</PropertyGroup>
2729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2830
<DebugType>pdbonly</DebugType>
2931
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32+
<OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\ApiManagement\</OutputPath>
33+
<DefineConstants>TRACE;SIGN</DefineConstants>
34+
<PlatformTarget>AnyCPU</PlatformTarget>
35+
<CodeAnalysisLogFile>bin\Release\Management.Automation.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
36+
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
37+
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
3238
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
39+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
40+
<CodeAnalysisRuleSetDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\Rule Sets</CodeAnalysisRuleSetDirectories>
41+
<CodeAnalysisRuleDirectories>;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\FxCop\Rules</CodeAnalysisRuleDirectories>
42+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
43+
<SignAssembly>true</SignAssembly>
44+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
45+
<DelaySign>true</DelaySign>
46+
<Prefer32Bit>false</Prefer32Bit>
3447
</PropertyGroup>
3548
<ItemGroup>
3649
<Reference Include="AutoMapper">
@@ -184,6 +197,7 @@
184197
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
185198
</Content>
186199
<None Include="packages.config" />
200+
<None Include="MSSharedLibKey.snk" />
187201
</ItemGroup>
188202
<ItemGroup>
189203
<WCFMetadata Include="Service References\" />

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/Security.Cryptography.dll

-49.1 KB
Binary file not shown.

‎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/WikiSamplePipeline/DA_CuratedWikiData.json

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/WikiSamplePipeline/DA_WikiAggregatedData.json

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

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/WikiSamplePipeline/DA_WikipediaClickEvents.json

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

0 commit comments

Comments
 (0)