Skip to content

Commit 5aa2cb1

Browse files
vhaminevhamine
committed
Adding reference to latest HDInsight SDK
1 parent ac8eec4 commit 5aa2cb1

File tree

5 files changed

+58
-34
lines changed

5 files changed

+58
-34
lines changed

‎src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<Prefer32Bit>false</Prefer32Bit>
4242
</PropertyGroup>
4343
<ItemGroup>
44+
<Reference Include="BouncyCastle.Crypto">
45+
<HintPath>..\..\..\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
46+
</Reference>
4447
<Reference Include="Hyak.Common">
4548
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
4649
</Reference>
@@ -66,13 +69,11 @@
6669
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6770
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
6871
</Reference>
69-
<Reference Include="Microsoft.Hadoop.Client, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
71-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
72+
<Reference Include="Microsoft.Hadoop.Client">
73+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
7274
</Reference>
73-
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
74-
<SpecificVersion>False</SpecificVersion>
75-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
75+
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting">
76+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
7677
</Reference>
7778
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
7879
<SpecificVersion>False</SpecificVersion>
@@ -92,27 +93,24 @@
9293
</Reference>
9394
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
9495
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<SpecificVersion>False</SpecificVersion>
9597
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
9698
</Reference>
9799
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98100
<SpecificVersion>False</SpecificVersion>
99101
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
100102
</Reference>
101-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
102-
<SpecificVersion>False</SpecificVersion>
103-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
103+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight">
104+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
104105
</Reference>
105-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
106-
<SpecificVersion>False</SpecificVersion>
107-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
106+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts">
107+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
110-
<SpecificVersion>False</SpecificVersion>
111-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
109+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework">
110+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
112111
</Reference>
113-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
114-
<SpecificVersion>False</SpecificVersion>
115-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
112+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core">
113+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
116114
</Reference>
117115
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118116
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

‎src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightClusterManagementClientSimulator.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,16 @@ public async Task DisableHttpAsync(string dnsName, string location)
279279
Clusters.Add(new SimulatorClusterContainer { Cluster = cluster });
280280
}
281281

282+
public void DisableRdp(string dnsName, string location)
283+
{
284+
this.DisableRdpAsync(dnsName, location).Wait();
285+
}
286+
287+
public async Task DisableRdpAsync(string dnsName, string location)
288+
{
289+
throw new NotImplementedException();
290+
}
291+
282292
public void EnableHttp(string dnsName, string location, string httpUserName, string httpPassword)
283293
{
284294
this.EnableHttpAsync(dnsName, location, httpUserName, httpPassword).Wait();
@@ -293,6 +303,16 @@ public async Task EnableHttpAsync(string dnsName, string location, string httpUs
293303
Clusters.Add(new SimulatorClusterContainer { Cluster = cluster });
294304
}
295305

306+
public void EnableRdp(string dnsName, string location, string rdpUserName, string rdpPassword, DateTime expiryDate)
307+
{
308+
this.EnableRdpAsync(dnsName, location, rdpUserName, rdpPassword, expiryDate).Wait();
309+
}
310+
311+
public async Task EnableRdpAsync(string dnsName, string location, string rdpUserName, string rdpPassword, DateTime expiryDate)
312+
{
313+
throw new NotImplementedException();
314+
}
315+
296316
public ClusterDetails GetCluster(string dnsName)
297317
{
298318
Task<ClusterDetails> getTask = this.GetClusterAsync(dnsName);

‎src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="BouncyCastle" version="1.7.0" targetFramework="net45" />
34
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
45
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
56
<package id="Microsoft.Azure.Common.Authentication" version="1.0.14-preview" targetFramework="net45" />
@@ -11,12 +12,12 @@
1112
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
1213
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
1314
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
14-
<package id="Microsoft.Hadoop.Client" version="1.4.5" targetFramework="net45" />
15+
<package id="Microsoft.Hadoop.Client" version="1.5.5" targetFramework="net45" />
1516
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1617
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1718
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
1819
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.4.5" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.5" targetFramework="net45" />
2021
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2122
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2223
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

‎src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50+
<Reference Include="BouncyCastle.Crypto">
51+
<HintPath>..\..\..\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
52+
</Reference>
5053
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5154
<SpecificVersion>False</SpecificVersion>
5255
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
@@ -76,13 +79,13 @@
7679
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7780
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
7881
</Reference>
79-
<Reference Include="Microsoft.Hadoop.Client, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
82+
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8083
<SpecificVersion>False</SpecificVersion>
81-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
84+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
8285
</Reference>
83-
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
86+
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.5.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8487
<SpecificVersion>False</SpecificVersion>
85-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
88+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
8689
</Reference>
8790
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8891
<SpecificVersion>False</SpecificVersion>
@@ -101,27 +104,28 @@
101104
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
102105
</Reference>
103106
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<SpecificVersion>False</SpecificVersion>
104108
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
105109
</Reference>
106110
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107111
<SpecificVersion>False</SpecificVersion>
108112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
109113
</Reference>
110-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
114+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.5.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
111115
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
116+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
113117
</Reference>
114-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
118+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.5.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115119
<SpecificVersion>False</SpecificVersion>
116-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
120+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
117121
</Reference>
118-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
122+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.5.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119123
<SpecificVersion>False</SpecificVersion>
120-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
124+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
121125
</Reference>
122-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c66ce9294aae1300, processorArchitecture=MSIL">
126+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.5.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123127
<SpecificVersion>False</SpecificVersion>
124-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.4.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
128+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.5\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
125129
</Reference>
126130
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127131
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

‎src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="BouncyCastle" version="1.7.0" targetFramework="net45" />
34
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
45
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
56
<package id="Microsoft.Azure.Common.Authentication" version="1.0.14-preview" targetFramework="net45" />
@@ -11,12 +12,12 @@
1112
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
1213
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
1314
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
14-
<package id="Microsoft.Hadoop.Client" version="1.4.5" targetFramework="net45" />
15+
<package id="Microsoft.Hadoop.Client" version="1.5.5" targetFramework="net45" />
1516
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
1617
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1718
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
1819
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.4.5" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.5" targetFramework="net45" />
2021
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2122
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
2223
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />

0 commit comments

Comments
 (0)