Skip to content

ADF cmdlets use breaking new Sdk #588

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 10 commits into from
Jul 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,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
20 changes: 16 additions & 4 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,18 @@
<Component Id="cmp479E4B1EF0A49C9845DB071F542F5392" Guid="*">
<File Id="fil6DD3CFC96544CB343D0C8F22BCFD7433" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml" />
</Component>
<Component Id="cmp1E1B36B9800F076E2AFB73B9F42A0E17" Guid="*">
<File Id="filF4E849EDB3A3866C88A8747FA81D763B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Management.Storage.dll" />
</Component>
<Component Id="cmp0E58F6BE17D369C64821980C4B3DC382" Guid="*">
<File Id="filA580E701B2A63EBC4DE170470CFAF8D1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Management.Storage.dll-Help.psd1" />
</Component>
<Component Id="cmp7E0EBA7EF2A71DE2AD60D9ECC89AF7C8" Guid="*">
<File Id="filA4B29FB64669AEBF95826BE8025ED7E3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Management.Storage.dll-Help.xml" />
</Component>
<Component Id="cmpFEB744C8B2FFF48BE8DB85E63CA8DB2A" Guid="*">
<File Id="fil2FA6083DBD6AC4C374C9A0CDB1D89766" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Management.Storage.format.ps1xml" />
</Component>
<Component Id="cmpDCDC7F34E3D2A51F32765B8C00AE3808" Guid="*">
<File Id="fil8DBE5C6213B46E6DD6AF78238BCA09EB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Compute\Microsoft.Azure.Commands.Network.dll" />
</Component>
Expand Down Expand Up @@ -688,9 +700,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 @@ -4074,6 +4083,10 @@
<ComponentRef Id="cmp2D89D47A52D9C508B335922A76918EE3" />
<ComponentRef Id="cmp62942A24352ADC631A6C9DAE39D62F70" />
<ComponentRef Id="cmp479E4B1EF0A49C9845DB071F542F5392" />
<ComponentRef Id="cmp1E1B36B9800F076E2AFB73B9F42A0E17" />
<ComponentRef Id="cmp0E58F6BE17D369C64821980C4B3DC382" />
<ComponentRef Id="cmp7E0EBA7EF2A71DE2AD60D9ECC89AF7C8" />
<ComponentRef Id="cmpFEB744C8B2FFF48BE8DB85E63CA8DB2A" />
<ComponentRef Id="cmpDCDC7F34E3D2A51F32765B8C00AE3808" />
<ComponentRef Id="cmp3676864950F4983F3A0CFFC865B00E0C" />
<ComponentRef Id="cmp1AA87AE1B3BBFEBD19E17639D49CDA90" />
Expand Down Expand Up @@ -4199,7 +4212,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 @@ -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
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
name: "foo1",
properties:
{
location:
{
type: "CustomLocation",
linkedServiceName: "foo2"
properties: {
type: "CustomDataSet",
typeProperties: {
tableName: "myTable"
},
availability:
{
linkedServiceName: "foo2",
availability: {
frequency: "Hour",
interval: 1
}
Expand Down
Loading