Skip to content

Commit ea96a7f

Browse files
markcowlmarkcowl
committed
Merge pull request #799 from shefaliv/dev
Hotfix PR: Fixing dependency break for HDInsight
2 parents db4abf4 + 9acf88f commit ea96a7f

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

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

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
<Prefer32Bit>false</Prefer32Bit>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="BouncyCastle.Crypto">
46+
<Reference Include="BouncyCastle.Crypto, Version=1.7.4137.9688, Culture=neutral, PublicKeyToken=a4292a325f69b123, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
4748
<HintPath>..\..\..\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
4849
</Reference>
4950
<Reference Include="Hyak.Common">
@@ -67,23 +68,22 @@
6768
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5687.28567-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
6869
<Private>True</Private>
6970
</Reference>
70-
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
71+
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
74+
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
7776
</Reference>
78-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
77+
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8179
</Reference>
82-
<Reference Include="Microsoft.Hadoop.Client">
83-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
80+
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
82+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
8483
</Reference>
85-
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting">
86-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
84+
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
8787
</Reference>
8888
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8989
<SpecificVersion>False</SpecificVersion>
@@ -118,20 +118,25 @@
118118
<Reference Include="Microsoft.WindowsAzure.Management">
119119
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
120120
</Reference>
121-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight">
122-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
121+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122+
<SpecificVersion>False</SpecificVersion>
123+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
123124
</Reference>
124-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts">
125-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
125+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126+
<SpecificVersion>False</SpecificVersion>
127+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
126128
</Reference>
127-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework">
128-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
129+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130+
<SpecificVersion>False</SpecificVersion>
131+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
129132
</Reference>
130-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core">
131-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
133+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<SpecificVersion>False</SpecificVersion>
135+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
132136
</Reference>
133-
<Reference Include="Microsoft.WindowsAzure.Storage">
134-
<HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
137+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138+
<SpecificVersion>False</SpecificVersion>
139+
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
135140
</Reference>
136141
<Reference Include="Moq">
137142
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
@@ -156,9 +161,8 @@
156161
<Reference Include="System.Net.Http.WebRequest" />
157162
<Reference Include="System.Runtime.Serialization" />
158163
<Reference Include="System.ServiceModel" />
159-
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
160-
<SpecificVersion>False</SpecificVersion>
161-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
164+
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
165+
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
162166
</Reference>
163167
<Reference Include="System.Xml.Linq" />
164168
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1212
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
13-
<package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
14-
<package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
15-
<package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
16-
<package id="Microsoft.Hadoop.Client" version="1.5.9" targetFramework="net45" />
13+
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
14+
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
15+
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
16+
<package id="Microsoft.Hadoop.Client" version="1.5.10" targetFramework="net45" />
1717
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1818
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1919
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
23-
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.9" targetFramework="net45" />
23+
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.10" targetFramework="net45" />
2424
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2525
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
26-
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
27-
<package id="WindowsAzure.Storage" version="5.0.0" targetFramework="net45" />
26+
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
27+
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
2828
<package id="xunit" version="1.9.2" targetFramework="net45" />
2929
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
3030
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />

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

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,22 @@
7171
<SpecificVersion>False</SpecificVersion>
7272
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7373
</Reference>
74-
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
74+
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75+
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
7776
</Reference>
78-
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
77+
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78+
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
8179
</Reference>
82-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
80+
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8582
</Reference>
86-
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8784
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
85+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.Hadoop.Client.dll</HintPath>
8986
</Reference>
90-
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<Reference Include="Microsoft.HDInsight.Net.Http.Formatting, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9188
<SpecificVersion>False</SpecificVersion>
92-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
89+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.HDInsight.Net.Http.Formatting.dll</HintPath>
9390
</Reference>
9491
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9592
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -124,25 +121,25 @@
124121
<SpecificVersion>False</SpecificVersion>
125122
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
126123
</Reference>
127-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128125
<SpecificVersion>False</SpecificVersion>
129-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
126+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.dll</HintPath>
130127
</Reference>
131-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Contracts, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
132129
<SpecificVersion>False</SpecificVersion>
133-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
130+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.HDInsight.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Contracts.dll</HintPath>
134131
</Reference>
135-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
132+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136133
<SpecificVersion>False</SpecificVersion>
137-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
134+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.dll</HintPath>
138135
</Reference>
139-
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.5.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136+
<Reference Include="Microsoft.WindowsAzure.Management.HDInsight.Framework.Core, Version=1.5.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140137
<SpecificVersion>False</SpecificVersion>
141-
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.9\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
138+
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.10\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
142139
</Reference>
143-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
144141
<SpecificVersion>False</SpecificVersion>
145-
<HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
142+
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
146143
</Reference>
147144
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
148145
<SpecificVersion>False</SpecificVersion>
@@ -163,9 +160,8 @@
163160
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
164161
</Reference>
165162
<Reference Include="System.Net.Http.WebRequest" />
166-
<Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
167-
<SpecificVersion>False</SpecificVersion>
168-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
163+
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
164+
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
169165
</Reference>
170166
<Reference Include="System.Xml.Linq" />
171167
<Reference Include="System.Data.DataSetExtensions" />

0 commit comments

Comments
 (0)