Skip to content

Commit 9d24f51

Browse files
committed
Merge pull request #7 from Azure/dev
merge from azure/azure-powershell/dev
2 parents 159c740 + 4b461b2 commit 9d24f51

27 files changed

+2869
-7655
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.16.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Management.DataFactories">
64-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.14.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
64+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.ResourceManager">
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests/TestCreateDataFactoryGateway.json

Lines changed: 232 additions & 196 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests/TestCreateDataFactoryGatewayWithDataFactoryParameter.json

Lines changed: 184 additions & 271 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryGatewayTests/TestGetNonExistingDataFactoryGateway.json

Lines changed: 84 additions & 156 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestCreateDataFactory.json

Lines changed: 101 additions & 110 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestDataFactoryPiping.json

Lines changed: 108 additions & 117 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestDeleteDataFactoryWithDataFactoryParameter.json

Lines changed: 92 additions & 101 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetDataFactoryWithEmptyName.json

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

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetDataFactoryWithWhiteSpaceName.json

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

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetNonExistingDataFactory.json

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

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHub.json

Lines changed: 140 additions & 605 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHubPiping.json

Lines changed: 149 additions & 230 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHubWithDataFactoryParameter.json

Lines changed: 145 additions & 163 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestGetLinkedServiceWithEmptyName.json

Lines changed: 94 additions & 169 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestGetLinkedServiceWithWhiteSpaceName.json

Lines changed: 88 additions & 163 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedService.json

Lines changed: 137 additions & 221 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedServicePiping.json

Lines changed: 145 additions & 292 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedServiceWithDataFactoryParameter.json

Lines changed: 144 additions & 165 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.PipelineTests/TestWikipediaSamplePipeline.json

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

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestGetTableWithEmptyName.json

Lines changed: 94 additions & 106 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestGetTableWithWhiteSpaceName.json

Lines changed: 84 additions & 156 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTable.json

Lines changed: 249 additions & 225 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTablePiping.json

Lines changed: 264 additions & 243 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTableWithDataFactoryParameter.json

Lines changed: 194 additions & 359 deletions
Large diffs are not rendered by default.

src/ResourceManager/DataFactories/Commands.DataFactories.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.Common.Extensions" version="0.13.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.16.0-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.DataFactories" version="0.14.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.DataFactories" version="0.15.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5486.28526-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5486.28526-prerelease" targetFramework="net45" />

src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</Reference>
6464
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.14.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.15.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6969
<SpecificVersion>False</SpecificVersion>

src/ResourceManager/DataFactories/Commands.DataFactories/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.0.1" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Extensions" version="0.13.0-preview" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.DataFactories" version="0.14.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.DataFactories" version="0.15.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

0 commit comments

Comments
 (0)