Skip to content

Commit f337217

Browse files
author
Hovsep Mkrtchyan
committed
Bumped up ASM.HDInsight reference of WindowsAzure.Storage to version 6.0
1 parent fdafd00 commit f337217

File tree

5 files changed

+19
-5
lines changed

5 files changed

+19
-5
lines changed

setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3277,6 +3277,9 @@
32773277
<Component Id="cmp524E28243CC9788C41819437014F3F7D" Guid="*">
32783278
<File Id="fil6BD7B8BB425C2B1E0D24EEEDD1C1FDD8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.Common.NetFramework.dll" />
32793279
</Component>
3280+
<Component Id="cmp0165D93E848BF589D3E0D3863617F9F0" Guid="*">
3281+
<File Id="fil55AE55B88AC94CD6CC79AD1D084BF659" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.KeyVault.Core.dll" />
3282+
</Component>
32803283
<Component Id="cmp63E7146E10A0CADBB072FDBAAEC2FDB2" Guid="*">
32813284
<File Id="fil92D5EE3C92A0580B16CAF05E40354F28" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.ResourceManager.dll" />
32823285
</Component>
@@ -5915,6 +5918,7 @@
59155918
<ComponentRef Id="cmp430193C6FCC710357C2AD0A4D74B05CB" />
59165919
<ComponentRef Id="cmp42B92586860E12CFF7E8A202F62CA257" />
59175920
<ComponentRef Id="cmp524E28243CC9788C41819437014F3F7D" />
5921+
<ComponentRef Id="cmp0165D93E848BF589D3E0D3863617F9F0" />
59185922
<ComponentRef Id="cmp63E7146E10A0CADBB072FDBAAEC2FDB2" />
59195923
<ComponentRef Id="cmpF2A2CF41D51D7B7599694EC16CFEB929" />
59205924
<ComponentRef Id="cmpFC1978EF7F3366DA07E6556C3996E222" />

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,13 @@
138138
<SpecificVersion>False</SpecificVersion>
139139
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.11\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
140140
</Reference>
141-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
141+
<Reference Include="Microsoft.WindowsAzure.Storage">
142142
<SpecificVersion>False</SpecificVersion>
143-
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
143+
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
144+
</Reference>
145+
<Reference Include="Microsoft.Azure.KeyVault.Core">
146+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
147+
<Private>True</Private>
144148
</Reference>
145149
<Reference Include="Moq">
146150
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2626
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2727
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
28-
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
28+
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
2929
<package id="xunit" version="1.9.2" targetFramework="net45" />
3030
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
3131
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,13 @@
137137
<SpecificVersion>False</SpecificVersion>
138138
<HintPath>..\..\..\packages\Microsoft.Hadoop.Client.1.5.11\lib\net45\Microsoft.WindowsAzure.Management.HDInsight.Framework.Core.dll</HintPath>
139139
</Reference>
140-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=3.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140+
<Reference Include="Microsoft.WindowsAzure.Storage">
141141
<SpecificVersion>False</SpecificVersion>
142-
<HintPath>..\..\..\packages\WindowsAzure.Storage.3.0.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
142+
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
143+
</Reference>
144+
<Reference Include="Microsoft.Azure.KeyVault.Core">
145+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
146+
<Private>True</Private>
143147
</Reference>
144148
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
145149
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2525
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
26+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
27+
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
2628
</packages>

0 commit comments

Comments
 (0)