Skip to content

Commit ef4fb6f

Browse files
stankovskistankovski
committed
Merge pull request #374 from vhamine/dev
Updating references to use latest HDInsight SDK
2 parents da0d34e + 0d535cd commit ef4fb6f

File tree

4 files changed

+25
-24
lines changed

4 files changed

+25
-24
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
7474
</Reference>
7575
<Reference Include="Microsoft.Hadoop.Client">
76-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
76+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
7777
</Reference>
7878
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting">
79-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
79+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
8080
</Reference>
8181
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8282
<SpecificVersion>False</SpecificVersion>
@@ -104,16 +104,16 @@
104104
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
105105
</Reference>
106106
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight">
107-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
107+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts">
110-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
110+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework">
113-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
113+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
114114
</Reference>
115115
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core">
116-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
116+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
117117
</Reference>
118118
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119119
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
1313
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
1414
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
15-
<package id="Microsoft.Hadoop.Client" version="1.5.6" targetFramework="net45" />
15+
<package id="Microsoft.Hadoop.Client" version="1.5.8" targetFramework="net45" />
1616
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.6" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.8" targetFramework="net45" />
2121
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<Prefer32Bit>false</Prefer32Bit>
4848
</PropertyGroup>
4949
<ItemGroup>
50-
<Reference Include="BouncyCastle.Crypto">
50+
<Reference Include="BouncyCastle.Crypto, Version=1.7.4137.9688, Culture=neutral, PublicKeyToken=a4292a325f69b123, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
5152
<HintPath>..\..\..\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
5253
</Reference>
5354
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -79,13 +80,13 @@
7980
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8081
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8182
</Reference>
82-
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8384
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
85+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
8586
</Reference>
86-
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.5.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8788
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
89+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
8990
</Reference>
9091
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
9192
<SpecificVersion>False</SpecificVersion>
@@ -112,21 +113,21 @@
112113
<SpecificVersion>False</SpecificVersion>
113114
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
114115
</Reference>
115-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.5.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
116117
<SpecificVersion>False</SpecificVersion>
117-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
118+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
118119
</Reference>
119-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.5.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
120+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
120121
<SpecificVersion>False</SpecificVersion>
121-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
122+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
122123
</Reference>
123-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.5.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124125
<SpecificVersion>False</SpecificVersion>
125-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
126+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
126127
</Reference>
127-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core">
128-
<SpecificVersion>False</SpecificVersion>
129-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.6\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
128+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.5.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129+
<SpecificVersion>False</SpecificVersion>
130+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.8\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
130131
</Reference>
131132
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
132133
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
1313
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
1414
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
15-
<package id="Microsoft.Hadoop.Client" version="1.5.6" targetFramework="net45" />
15+
<package id="Microsoft.Hadoop.Client" version="1.5.8" targetFramework="net45" />
1616
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.6" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.8" targetFramework="net45" />
2121
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2222
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
2323
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />

0 commit comments

Comments
 (0)