Skip to content

Commit 884d00a

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#2892 from begoldsm/dev
ADL Updates to latest Package
2 parents baeb2a9 + 1284a74 commit 884d00a

File tree

41 files changed

+6679
-3750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+6679
-3750
lines changed

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@
6262
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
65+
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.12.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
6867
<Private>True</Private>
6968
</Reference>
7069
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
7371
<Private>True</Private>
7472
</Reference>
7573
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -258,4 +256,4 @@
258256
<ItemGroup />
259257
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
260258
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
261-
</Project>
259+
</Project>

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@
4545
<Reference Include="Microsoft.Azure.Common.NetFramework">
4646
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
48+
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.12.0-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
5150
<Private>True</Private>
5251
</Reference>
5352
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -193,4 +192,4 @@
193192
</ItemGroup>
194193
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
195194
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
196-
</Project>
195+
</Project>

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/GetAzureRmDataLakeAnalyticsDataSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class GetAzureDataLakeAnalyticsDataSource : DataLakeAnalyticsCmdletBase
2626
{
2727
internal const string DataLakeParameterSetName = "Get a Data Lake Store account";
2828
internal const string BlobParameterSetName = "Get a Blob storage account";
29-
internal const string ListStorageParameterSetName = "List a data source";
29+
internal const string ListStorageParameterSetName = "List all data sources";
3030

3131
[Parameter(ValueFromPipelineByPropertyName = true, Position = 0, Mandatory = true,
3232
ParameterSetName = DataLakeParameterSetName, HelpMessage = "Name of the account to add the data source to.")

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/NewAzureRmDataLakeAnalyticsCatalogSecret.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public class NewAzureDataLakeAnalyticsCatalogSecret : DataLakeAnalyticsCmdletBas
5555

5656
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = BaseParameterSetName, Position = 3,
5757
Mandatory = true, HelpMessage = "The host of the database to connect to in the format 'myhost.dns.com'.")]
58-
public string Host { get; set; }
58+
[Alias("Host")]
59+
public string DatabaseHost { get; set; }
5960

6061
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = BaseParameterSetName, Position = 4,
6162
Mandatory = true, HelpMessage = "The Port associated with the host for the database to connect to.")]
@@ -68,7 +69,7 @@ public override void ExecuteCmdlet()
6869
WriteWarning(string.Format(Resources.NoPortSpecified, Uri));
6970
}
7071

71-
var toUse = Uri ?? new Uri(string.Format("https://{0}:{1}", Host, Port));
72+
var toUse = Uri ?? new Uri(string.Format("https://{0}:{1}", DatabaseHost, Port));
7273

7374
WriteObject(DataLakeAnalyticsClient.CreateSecret(Account, DatabaseName, Secret.UserName,
7475
Secret.GetNetworkCredential().Password, toUse.AbsoluteUri));

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/SetAzureRmDataLakeAnalyticsCatalogSecret.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public class SetAzureDataLakeAnalyticsCatalogSecret : DataLakeAnalyticsCmdletBas
5555

5656
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = BaseParameterSetName, Position = 3,
5757
Mandatory = true, HelpMessage = "The host of the database to connect to in the format 'myhost.dns.com'.")]
58-
public string Host { get; set; }
58+
[Alias("Host")]
59+
public string DatabaseHost { get; set; }
5960

6061
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = BaseParameterSetName, Position = 4,
6162
Mandatory = true, HelpMessage = "The Port associated with the host for the database to connect to.")]
@@ -68,7 +69,7 @@ public override void ExecuteCmdlet()
6869
WriteWarning(string.Format(Resources.NoPortSpecified, Uri));
6970
}
7071

71-
var toUse = Uri ?? new Uri(string.Format("https://{0}:{1}", Host, Port));
72+
var toUse = Uri ?? new Uri(string.Format("https://{0}:{1}", DatabaseHost, Port));
7273

7374
WriteObject(DataLakeAnalyticsClient.UpdateSecret(Account, DatabaseName, Secret.UserName,
7475
Secret.GetNetworkCredential().Password, toUse.AbsoluteUri));

0 commit comments

Comments
 (0)