Bump up ADF nuget to 4.0.0

Yitao Zhang · Yitao Zhang · commit 1cc2b3bb04be · 2015-10-02T13:43:40.000-07:00
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj
@@ -67,9 +67,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.DataFactories, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.3.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/Common.ps1 b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/Common.ps1
@@ -37,7 +37,7 @@ Gets the default location for a provider
 function Get-ProviderLocation($provider)
 {
     # A Dogfood data center for ADF cmdlet mock testing
-    "East US 2"
+    "Brazil South"
 }
 
 <#
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDatasetTests.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDatasetTests.cs
@@ -74,10 +74,10 @@ public NewDatasetTests()
         public void CanCreateDataset()
         {
             // Arrange
-            Table expected = new Table()
+            Dataset expected = new Dataset()
             {
                 Name = datasetName,
-                Properties = new TableProperties()
+                Properties = new DatasetProperties()
             };
 
             dataFactoriesClientMock.Setup(c => c.ReadJsonFileContent(It.IsAny<string>()))
@@ -125,10 +125,10 @@ public void CanCreateDataset()
         public void CanThrowIfDatasetProvisioningFailed()
         {
             // Arrange
-            Table expected = new Table()
+            Dataset expected = new Dataset()
             {
                 Name = datasetName,
-                Properties = new TableProperties()
+                Properties = new DatasetProperties()
             };
 
             dataFactoriesClientMock.Setup(c => c.ReadJsonFileContent(It.IsAny<string>()))
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.DataFactories" version="3.0.0" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.DataFactories" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5715.36130-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
@@ -65,9 +65,9 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.DataFactories, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.3.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.DataFactories, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.4.0.0\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Datasets.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Datasets.cs
@@ -27,29 +27,29 @@ namespace Microsoft.Azure.Commands.DataFactories
 {
     public partial class DataFactoryClient
     {
-        public virtual Table CreateOrUpdateDataset(string resourceGroupName, string dataFactoryName, string datasetName, string rawJsonContent)
+        public virtual Dataset CreateOrUpdateDataset(string resourceGroupName, string dataFactoryName, string datasetName, string rawJsonContent)
         {
             if (string.IsNullOrWhiteSpace(rawJsonContent))
             {
                 throw new ArgumentNullException("rawJsonContent");
             }
 
             // If create or update failed, the current behavior is to throw
-            var response = DataPipelineManagementClient.Tables.CreateOrUpdateWithRawJsonContent(
+            var response = DataPipelineManagementClient.Datasets.CreateOrUpdateWithRawJsonContent(
                 resourceGroupName,
                 dataFactoryName,
                 datasetName,
-                new TableCreateOrUpdateWithRawJsonContentParameters() { Content = rawJsonContent });
+                new DatasetCreateOrUpdateWithRawJsonContentParameters() { Content = rawJsonContent });
 
-            return response.Table;
+            return response.Dataset;
         }
 
         public virtual PSDataset GetDataset(string resourceGroupName, string dataFactoryName, string datasetName)
         {
-            var response = DataPipelineManagementClient.Tables.Get(
+            var response = DataPipelineManagementClient.Datasets.Get(
                 resourceGroupName, dataFactoryName, datasetName);
 
-            return new PSDataset(response.Table)
+            return new PSDataset(response.Dataset)
             {
                 ResourceGroupName = resourceGroupName,
                 DataFactoryName = dataFactoryName
@@ -60,20 +60,20 @@ public virtual List<PSDataset> ListDatasets(DatasetFilterOptions filterOptions)
         {
             List<PSDataset> datasets = new List<PSDataset>();
 
-            TableListResponse response;
+            DatasetListResponse response;
             if (filterOptions.NextLink.IsNextPageLink())
             {
-                response = DataPipelineManagementClient.Tables.ListNext(filterOptions.NextLink);
+                response = DataPipelineManagementClient.Datasets.ListNext(filterOptions.NextLink);
             }
             else
             {
-                response = DataPipelineManagementClient.Tables.List(filterOptions.ResourceGroupName, filterOptions.DataFactoryName);
+                response = DataPipelineManagementClient.Datasets.List(filterOptions.ResourceGroupName, filterOptions.DataFactoryName);
             }
             filterOptions.NextLink = response != null ? response.NextLink : null;
 
-            if (response != null && response.Tables != null)
+            if (response != null && response.Datasets != null)
             {
-                foreach (var dataset in response.Tables)
+                foreach (var dataset in response.Datasets)
                 {
                     datasets.Add(
                         new PSDataset(dataset)
@@ -89,7 +89,7 @@ public virtual List<PSDataset> ListDatasets(DatasetFilterOptions filterOptions)
 
         public virtual HttpStatusCode DeleteDataset(string resourceGroupName, string dataFactoryName, string datasetName)
         {
-            AzureOperationResponse response = DataPipelineManagementClient.Tables.Delete(resourceGroupName, dataFactoryName, datasetName);
+            AzureOperationResponse response = DataPipelineManagementClient.Datasets.Delete(resourceGroupName, dataFactoryName, datasetName);
             return response.StatusCode;
         }
 
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataset.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataset.cs
@@ -21,14 +21,14 @@ namespace Microsoft.Azure.Commands.DataFactories.Models
 {
     public class PSDataset
     {
-        private Table dataset;
+        private Dataset dataset;
 
         public PSDataset()
         {
-            this.dataset = new Table() {Properties = new TableProperties()};
+            this.dataset = new Dataset() { Properties = new DatasetProperties() };
         }
 
-        public PSDataset(Table dataset)
+        public PSDataset(Dataset dataset)
         {
             if (dataset == null)
             {
@@ -37,7 +37,7 @@ public PSDataset(Table dataset)
 
             if (dataset.Properties == null)
             {
-                dataset.Properties = new TableProperties();
+                dataset.Properties = new DatasetProperties();
             }
 
             this.dataset = dataset;
@@ -71,7 +71,7 @@ public Availability Availability
             }
         }
 
-        public TableTypeProperties Location
+        public DatasetTypeProperties Location
         {
             get
             {
@@ -107,7 +107,7 @@ public IList<DataElement> Structure
             }
         }
 
-        public TableProperties Properties
+        public DatasetProperties Properties
         {
             get
             {
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.DataFactories" version="3.0.0" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.DataFactories" version="4.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ Gets the default location for a provider`
`37`	`37`	`function Get-ProviderLocation($provider)`
`38`	`38`	`{`
`39`	`39`	`# A Dogfood data center for ADF cmdlet mock testing`
`40`		`- "East US 2"`
	`40`	`+ "Brazil South"`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`<#`
Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,10 @@ public NewDatasetTests()`
`74`	`74`	`public void CanCreateDataset()`
`75`	`75`	`{`
`76`	`76`	`// Arrange`
`77`		`- Table expected = new Table()`
	`77`	`+ Dataset expected = new Dataset()`
`78`	`78`	`{`
`79`	`79`	`Name = datasetName,`
`80`		`- Properties = new TableProperties()`
	`80`	`+ Properties = new DatasetProperties()`
`81`	`81`	`};`
`82`	`82`
`83`	`83`	`dataFactoriesClientMock.Setup(c => c.ReadJsonFileContent(It.IsAny<string>()))`
`@@ -125,10 +125,10 @@ public void CanCreateDataset()`
`125`	`125`	`public void CanThrowIfDatasetProvisioningFailed()`
`126`	`126`	`{`
`127`	`127`	`// Arrange`
`128`		`- Table expected = new Table()`
	`128`	`+ Dataset expected = new Dataset()`
`129`	`129`	`{`
`130`	`130`	`Name = datasetName,`
`131`		`- Properties = new TableProperties()`
	`131`	`+ Properties = new DatasetProperties()`
`132`	`132`	`};`
`133`	`133`
`134`	`134`	`dataFactoriesClientMock.Setup(c => c.ReadJsonFileContent(It.IsAny<string>()))`
Original file line number	Diff line number	Diff line change
`@@ -27,29 +27,29 @@ namespace Microsoft.Azure.Commands.DataFactories`
`27`	`27`	`{`
`28`	`28`	`public partial class DataFactoryClient`
`29`	`29`	`{`
`30`		`- public virtual Table CreateOrUpdateDataset(string resourceGroupName, string dataFactoryName, string datasetName, string rawJsonContent)`
	`30`	`+ public virtual Dataset CreateOrUpdateDataset(string resourceGroupName, string dataFactoryName, string datasetName, string rawJsonContent)`
`31`	`31`	`{`
`32`	`32`	`if (string.IsNullOrWhiteSpace(rawJsonContent))`
`33`	`33`	`{`
`34`	`34`	`throw new ArgumentNullException("rawJsonContent");`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// If create or update failed, the current behavior is to throw`
`38`		`- var response = DataPipelineManagementClient.Tables.CreateOrUpdateWithRawJsonContent(`
	`38`	`+ var response = DataPipelineManagementClient.Datasets.CreateOrUpdateWithRawJsonContent(`
`39`	`39`	`resourceGroupName,`
`40`	`40`	`dataFactoryName,`
`41`	`41`	`datasetName,`
`42`		`- new TableCreateOrUpdateWithRawJsonContentParameters() { Content = rawJsonContent });`
	`42`	`+ new DatasetCreateOrUpdateWithRawJsonContentParameters() { Content = rawJsonContent });`
`43`	`43`
`44`		`- return response.Table;`
	`44`	`+ return response.Dataset;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public virtual PSDataset GetDataset(string resourceGroupName, string dataFactoryName, string datasetName)`
`48`	`48`	`{`
`49`		`- var response = DataPipelineManagementClient.Tables.Get(`
	`49`	`+ var response = DataPipelineManagementClient.Datasets.Get(`
`50`	`50`	`resourceGroupName, dataFactoryName, datasetName);`
`51`	`51`
`52`		`- return new PSDataset(response.Table)`
	`52`	`+ return new PSDataset(response.Dataset)`
`53`	`53`	`{`
`54`	`54`	`ResourceGroupName = resourceGroupName,`
`55`	`55`	`DataFactoryName = dataFactoryName`
`@@ -60,20 +60,20 @@ public virtual List<PSDataset> ListDatasets(DatasetFilterOptions filterOptions)`
`60`	`60`	`{`
`61`	`61`	`List<PSDataset> datasets = new List<PSDataset>();`
`62`	`62`
`63`		`- TableListResponse response;`
	`63`	`+ DatasetListResponse response;`
`64`	`64`	`if (filterOptions.NextLink.IsNextPageLink())`
`65`	`65`	`{`
`66`		`- response = DataPipelineManagementClient.Tables.ListNext(filterOptions.NextLink);`
	`66`	`+ response = DataPipelineManagementClient.Datasets.ListNext(filterOptions.NextLink);`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`
`70`		`- response = DataPipelineManagementClient.Tables.List(filterOptions.ResourceGroupName, filterOptions.DataFactoryName);`
	`70`	`+ response = DataPipelineManagementClient.Datasets.List(filterOptions.ResourceGroupName, filterOptions.DataFactoryName);`
`71`	`71`	`}`
`72`	`72`	`filterOptions.NextLink = response != null ? response.NextLink : null;`
`73`	`73`
`74`		`- if (response != null && response.Tables != null)`
	`74`	`+ if (response != null && response.Datasets != null)`
`75`	`75`	`{`
`76`		`- foreach (var dataset in response.Tables)`
	`76`	`+ foreach (var dataset in response.Datasets)`
`77`	`77`	`{`
`78`	`78`	`datasets.Add(`
`79`	`79`	`new PSDataset(dataset)`
`@@ -89,7 +89,7 @@ public virtual List<PSDataset> ListDatasets(DatasetFilterOptions filterOptions)`
`89`	`89`
`90`	`90`	`public virtual HttpStatusCode DeleteDataset(string resourceGroupName, string dataFactoryName, string datasetName)`
`91`	`91`	`{`
`92`		`- AzureOperationResponse response = DataPipelineManagementClient.Tables.Delete(resourceGroupName, dataFactoryName, datasetName);`
	`92`	`+ AzureOperationResponse response = DataPipelineManagementClient.Datasets.Delete(resourceGroupName, dataFactoryName, datasetName);`
`93`	`93`	`return response.StatusCode;`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ namespace Microsoft.Azure.Commands.DataFactories.Models`
`21`	`21`	`{`
`22`	`22`	`public class PSDataset`
`23`	`23`	`{`
`24`		`- private Table dataset;`
	`24`	`+ private Dataset dataset;`
`25`	`25`
`26`	`26`	`public PSDataset()`
`27`	`27`	`{`
`28`		`- this.dataset = new Table() {Properties = new TableProperties()};`
	`28`	`+ this.dataset = new Dataset() { Properties = new DatasetProperties() };`
`29`	`29`	`}`
`30`	`30`
`31`		`- public PSDataset(Table dataset)`
	`31`	`+ public PSDataset(Dataset dataset)`
`32`	`32`	`{`
`33`	`33`	`if (dataset == null)`
`34`	`34`	`{`
`@@ -37,7 +37,7 @@ public PSDataset(Table dataset)`
`37`	`37`
`38`	`38`	`if (dataset.Properties == null)`
`39`	`39`	`{`
`40`		`- dataset.Properties = new TableProperties();`
	`40`	`+ dataset.Properties = new DatasetProperties();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`this.dataset = dataset;`
`@@ -71,7 +71,7 @@ public Availability Availability`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- public TableTypeProperties Location`
	`74`	`+ public DatasetTypeProperties Location`
`75`	`75`	`{`
`76`	`76`	`get`
`77`	`77`	`{`
`@@ -107,7 +107,7 @@ public IList<DataElement> Structure`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- public TableProperties Properties`
	`110`	`+ public DatasetProperties Properties`
`111`	`111`	`{`
`112`	`112`	`get`
`113`	`113`	`{`