Merge pull request #3 from akhadem/dev

merge from akhadm/azure-powershell/dev

Author: jtlibingus

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

@@ -49,7 +49,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.11.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.DataFactories">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.11.4-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.0.12.0-preview\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Monitoring">
       <HintPath>..\..\..\packages\Microsoft.Azure.Monitoring.2.2.0-preview\lib\net40\Microsoft.Azure.Monitoring.dll</HintPath>
@@ -259,9 +259,6 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests\TestLinkedServiceWithDataFactoryParameter.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.PipelineTests\TestPipeline.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.DataFactories.Test.TableTests\TestGetTableWithEmptyName.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/pipeline.json

@@ -10,7 +10,7 @@
                 inputs: [ {name: "inputTable"} ],
                 outputs: [ {name: "outputTable"} ],
                 linkedServiceName: "foo2",
-                type: "CustomActivity",
+                type: "DotNetActivity",
                 transformation:
                 {
 			        assemblyName: "mycode.dll",

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryGatewayTests.ps1

@@ -50,10 +50,9 @@ function Test-DataFactoryGateway
         $gwname = "foo"
         $description = "description"
 
-        $actual = New-AzureDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname -Location $dflocation
+        $actual = New-AzureDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
         $expected = Get-AzureDataFactoryGateway -ResourceGroupName $rgname -DataFactoryName $dfname -Name $gwname
         Assert-AreEqual $actual.Name $expected.Name
-        Assert-AreEqual $actual.Location $expected.Location
 
         $key = New-AzureDataFactoryGatewayKey -ResourceGroupName $rgname -DataFactoryName $dfname -GatewayName $gwname
         Assert-NotNull $key
@@ -91,10 +90,9 @@ function Test-DataFactoryGatewayWithDataFactoryParameter
         $gwname = "foo"
         $description = "description"
 
-        $actual = New-AzureDataFactoryGateway -DataFactory $datafactory -Name $gwname -Location $dflocation
+        $actual = New-AzureDataFactoryGateway -DataFactory $datafactory -Name $gwname
         $expected = Get-AzureDataFactoryGateway -DataFactory $datafactory -Name $gwname
         Assert-AreEqual $actual.Name $expected.Name
-        Assert-AreEqual $actual.Location $expected.Location
 
         $key = New-AzureDataFactoryGatewayKey -DataFactory $datafactory -GatewayName $gwname
         Assert-NotNull $key

src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/PipelineTests.cs

@@ -19,11 +19,12 @@ namespace Microsoft.Azure.Commands.DataFactories.Test
 {
     public class PipelineTests : DataFactoriesScenarioTestsBase
     {
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestPipeline()
-        {
-            RunPowerShellTest("Test-Pipeline");
-        }
+        //Temporarily pending because of server issue. 
+        //[Fact]
+        //[Trait(Category.AcceptanceType, Category.CheckIn)]
+        //public void TestPipeline()
+        //{
+        //    RunPowerShellTest("Test-Pipeline");
+        //}
     }
 }