Skip to content

. #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Jul 14, 2015
Merged

. #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4e6ad3a
Initial merge with the latest Sdk.
Jul 10, 2015
05cf2e7
Get run log change.
Jul 10, 2015
daaa5ea
Fixed the common script bug.
Jul 10, 2015
8567bcf
Updated with new session records and bump up ADF MAML nuget version.
Jul 10, 2015
5b91cee
Fix the slicer change.
Jul 11, 2015
001c454
Updated installer wxi and changelog.txt
Jul 11, 2015
b1ba3e7
Fixed not copying three json in ADF mock tests.
Jul 11, 2015
5dbc7a9
Fix the ADF scenario Common.ps1
Jul 11, 2015
5e75b06
Added new session records.
Jul 11, 2015
91faa0d
Fix ADF mock test issue.
Jul 11, 2015
267331d
Update NuGet dependency on management API
Jul 13, 2015
7e1f9fe
Allow nic to accept multiple inbound and backend pool while create
deepakswifty Jul 13, 2015
0f28f0b
Added test for bugfix
Jul 13, 2015
8ab3d26
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jul 13, 2015
782af4d
Updated ChangeLog with related details
Jul 13, 2015
62c859e
Reorder child resource output
deepakswifty Jul 13, 2015
b1b4cd7
Merge pull request #588 from yitao-zhang/adfmerge
markcowl Jul 13, 2015
1e63ebd
Fix slow mocked tests for service management networking
markcowl Jul 13, 2015
ab3c944
Merge branch 'dev' of github.com:Azure/azure-powershell into signing
markcowl Jul 13, 2015
597b8f7
Merge pull request #594 from SiddharthChatrolaMs/dev
markcowl Jul 13, 2015
e8f24be
Fix mock clients
markcowl Jul 13, 2015
0d479bd
Merge pull request #593 from DeepakRajendranMsft/nicbugfix
markcowl Jul 13, 2015
257ada5
Responding to review feedback
markcowl Jul 14, 2015
9ad69a4
Merge pull request #597 from markcowl/signing
markcowl Jul 14, 2015
01d0588
Merge pull request #596 from DeepakRajendranMsft/ReorderChildOutput
markcowl Jul 14, 2015
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
6 changes: 6 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
2015.07.16 version 0.9.5
* Azure RedisCache cmdlets
* Set-AzureRedisCache - Bug fix done in management API that fixes bug here as well
* Azure Network Resource Provider cmdlets
* Added Application Gateway cmdlets
* New-AzureApplicationGateway
Expand Down Expand Up @@ -86,6 +88,10 @@
* Fixed formatting of output for Get-UsageAggregates
* Fixed executing Get-UsageAggregates when first cmdlet being called.

* Azure Data Factory cmdlets
* Upgraded management library to 1.0.0 with breaking JSON format change.
* Updated list operation paging support in cmdlets.

2015.06.26 version 0.9.4
* Azure Compute cmdlets
* Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
Expand Down
4 changes: 0 additions & 4 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,6 @@
<Component Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" Guid="*">
<File Id="filBD789B715F4C6F58DFFACC4839072346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Services.Client.dll" />
</Component>
<Component Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" Guid="*">
<File Id="filF8F961D8FC629431B44B43A76538C334" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataFactories.Runtime.dll" />
</Component>
<Component Id="cmp2E106693251FC564A4D03DA3778E26F7" Guid="*">
<File Id="fil3F27EAE226BD87840D5E9CE662DE26F9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataTransfer.Gateway.Encryption.dll" />
</Component>
Expand Down Expand Up @@ -4308,7 +4305,6 @@
<ComponentRef Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" />
<ComponentRef Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" />
<ComponentRef Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" />
<ComponentRef Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" />
<ComponentRef Id="cmp2E106693251FC564A4D03DA3778E26F7" />
<ComponentRef Id="cmp7BF776718E3154F969306B3FB853D175" />
<ComponentRef Id="cmp4F6E42879531C2B7A830BA3B4FF4033B" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
using Hyak.Common;
using Microsoft.Azure.Test.HttpRecorder;
using Microsoft.Azure.Common;
Expand Down Expand Up @@ -96,7 +98,7 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
{
throw new ArgumentException(
string.Format("TestManagementClientHelper class wasn't initialized with the {0} client.",
typeof(TClient).Name));
typeof (TClient).Name));
}
else
{
Expand All @@ -107,6 +109,13 @@ public TClient CreateCustomClient<TClient>(params object[] parameters) where TCl
return newRealClient;
}
}
else
{
// Use the WithHandler method to create an extra reference to the http client
// this will prevent the httpClient from being disposed in a long-running test using
// the same client for multiple cmdlets
client = client.WithHandler(new PassThroughDelegatingHandler());
}

return client;
}
Expand Down Expand Up @@ -162,5 +171,17 @@ public void AddUserAgent(string productName)
}

public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }

/// <summary>
/// This class exists to allow adding an additional reference to the httpClient to prevent the client
/// from being disposed. Should not be used execpt in this mocked context.
/// </summary>
class PassThroughDelegatingHandler : DelegatingHandler
{
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
return base.SendAsync(request, cancellationToken);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataFactories">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.12-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
Expand All @@ -77,9 +77,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5571.32271-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
</Reference>
<Reference Include="Microsoft.DataFactories.Runtime">
<HintPath>..\..\..\packages\Microsoft.DataFactories.Runtime.0.11.1-preview\lib\net45\Microsoft.DataFactories.Runtime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -208,53 +205,53 @@
<None Include="ScenarioTests\DataFactoryTests.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGateway.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestCreateDataFactoryGatewayWithDataFactoryParameter.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests\TestGetNonExistingDataFactoryGateway.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestCreateDataFactory.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDataFactoryPiping.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestDeleteDataFactoryWithDataFactoryParameter.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests\TestGetNonExistingDataFactory.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHub.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubPiping.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.HubTests\TestHubWithDataFactoryParameter.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedService.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServicePiping.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServiceWithDataFactoryParameter.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTable.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTablePiping.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestTableWithDataFactoryParameter.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
name: "foo2",
properties:
{
type: "CustomLinkedService",
extendedProperties:
{
PropertyBagPropertyName1: "PropertyBagPropertyValue1",
propertyBagPropertyName2: "PropertyBagPropertyValue2"
properties: {
type: "AzureStorage",
typeProperties: {
connectionString: "myfakeconnectionstring"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
outputs: [ {name: "outputTable"} ],
linkedServiceName: "foo2",
type: "DotNetActivity",
transformation:
typeProperties:
{
assemblyName: "mycode.dll",
entryPoint: "myclassname",
Expand Down
Loading