Skip to content

Commit f3ef478

Browse files
huangpfhuangpf
committed
Merge pull request #350 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents 4a35702 + cd26014 commit f3ef478

File tree

31 files changed

+174
-86
lines changed

31 files changed

+174
-86
lines changed

‎ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## 2016.02.02 version 1.1.1
2-
2+
* Azure RemoteApp: Organizational Unit in Azure RemoteApp RDFE cmdlets now accepts Unicode characters.
33
## 2016.01.12 version 1.1.0
44
* Azure SQL Database: Threat Detection policies:
55
* Using new Threat Detection Types

‎setup/azurecmd.wxs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

88
<?define version="1.1.0" ?>
9-
<?define versionedStartMenuFolder="Microsoft Azure" ?>
10-
<?define staleStartMenuFolder="Windows Azure" ?>
119

1210
<Product Id="*"
1311
Name="$(var.productName)"
@@ -63,10 +61,6 @@
6361
</Directory>
6462
</Directory>
6563
</Directory>
66-
<Directory Id="ProgramMenuFolder">
67-
<Directory Id="AzureSdkMenu" Name="$(var.versionedStartMenuFolder)"/>
68-
<Directory Id="StaleAzureSdkMenu" Name="$(var.staleStartMenuFolder)"/>
69-
</Directory>
7064
</Directory>
7165

7266
<Property Id="POWERSHELLPATH">
@@ -97,41 +91,17 @@
9791
</Component>
9892
</DirectoryRef>
9993

100-
<DirectoryRef Id="AzureSdkMenu">
101-
<Component Id="AzureSdkShortcut" Guid="A9B58A22-F746-451D-8840-F887D8014C3C">
102-
<Shortcut Id="AzureSdkStartMenuShortcut"
103-
Name="Microsoft Azure PowerShell"
104-
Description="Microsoft PowerShell cmdlets"
105-
Target="[POWERSHELLPATH]\powershell.exe"
106-
Arguments="-NoExit -ExecutionPolicy Bypass -File &quot;[PowerShellFolder]ServiceManagement\Azure\Services\ShortcutStartup.ps1&quot;"/>
107-
<RemoveFolder Id="AzureSdkMenu" On="uninstall"/>
108-
<RemoveFile Id="RemoveStaleFiles" Directory="StaleAzureSdkMenu" Name="Windows Azure PowerShell.lnk" On="both"/>
109-
<RegistryValue Root="HKCU" Key="SOFTWARE\Microsoft\Microsoft SDKs\WindowsAzure\$(var.version)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
110-
</Component>
111-
</DirectoryRef>
112-
11394
<Feature Id="azurecmd" Title="Microsoft Azure PowerShell" Level="1" Description="Windows PowerShell commandlets">
11495
<ComponentGroupRef Id="azurecmdfiles" />
11596
<ComponentRef Id="PSModulePath.System" />
116-
<ComponentRef Id="AzureSdkShortcut" />
11797
<ComponentRef Id="AzureSdkExecutionPolicyScript" />
11898
<ComponentRef Id="AzureSdkRemoveModulesScript" />
11999
</Feature>
120100

121101
<Binary Id="CustomActions" SourceFile="$(var.caSourceDir)\Microsoft.WindowsAzure.Setup.CA.dll"/>
122-
<CustomAction Id="UpdatePSShortcut" BinaryKey="CustomActions" DllEntry="UpdatePSShortcut" Execute ="deferred" Impersonate="no"/>
123-
<CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
124-
Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
125102
<CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]SetExecutionPolicy.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
126103
<CustomAction Id="RemoveGalleryModules" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -WindowStyle Hidden -NonInteractive -ExecutionPolicy Bypass -Command &quot;. \&quot;[PowerShellFolder]RemoveGalleryModules.ps1\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
127104

128-
<InstallExecuteSequence>
129-
<Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
130-
<Custom Action="RemoveGalleryModules" After="SetCustomActionDataValue">NOT Installed</Custom>
131-
<Custom Action="UpdatePSShortcut" After="RemoveGalleryModules">NOT Installed</Custom>
132-
<Custom Action="SetExecutionPolicy" After="UpdatePSShortcut">NOT Installed</Custom>
133-
</InstallExecuteSequence>
134-
135105
<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\media\License.rtf" />
136106
<UIRef Id="WixUI_Minimal" />
137107
<WixVariable Id="WixUIBannerBmp" Value="media\bannrbmp.bmp" />

‎setup/azurecmdfiles.wxi

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,9 @@
415415
<Component Id="cmpC964B4550D9D1C104A224E22B19599BF" Guid="*">
416416
<File Id="filA06EE818F6153FBDA14765A9579B69B8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.Common.NetFramework.dll" />
417417
</Component>
418+
<Component Id="cmp0660CA6282A998031B7B868E7AA9BFFE" Guid="*">
419+
<File Id="filEE3737B01273A4602F76F3ED51EA9676" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.KeyVault.Core.dll" />
420+
</Component>
418421
<Component Id="cmp557AD28EA410808B3805EFE4AA73C977" Guid="*">
419422
<File Id="fil17BDDBDDD5EA9206DCF1499F2AF621D9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Azure.Management.Batch.dll" />
420423
</Component>
@@ -992,6 +995,12 @@
992995
<Component Id="cmp2F8A21B67A574848E46161AF4DBAEAB7" Guid="*">
993996
<File Id="filF14443EF28F6FBDB30559A1428F6CE5A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.Azure.ResourceManager.dll" />
994997
</Component>
998+
<Component Id="cmp44B0766E3627CFEBD6119DBD995E3945" Guid="*">
999+
<File Id="fil38A0F441D7A5352F776C3E75794E10A9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.Data.Edm.dll" />
1000+
</Component>
1001+
<Component Id="cmpC6787B66E3657598F34EB40B7D4A39D9" Guid="*">
1002+
<File Id="fil3BF2E8D1B0E9325D347210C1E69DBA32" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.Data.OData.dll" />
1003+
</Component>
9951004
<Component Id="cmpFD0DE325B243453297C251C92C98245D" Guid="*">
9961005
<File Id="fil4FFFA196C05E15050769FA034FB3EE9E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Dns\Microsoft.Data.Services.Client.dll" />
9971006
</Component>
@@ -1060,6 +1069,9 @@
10601069
<Component Id="cmp7EBE3286268B848A8C4813AC64EA4C34" Guid="*">
10611070
<File Id="fil86BDA115F7354D65E9204115899B1774" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Graph.RBAC.dll" />
10621071
</Component>
1072+
<Component Id="cmp1E5C482880D1BD5A699356E3CFEA33B6" Guid="*">
1073+
<File Id="fil09F0937B46D8B5463D6026189284E841" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.KeyVault.Core.dll" />
1074+
</Component>
10631075
<Component Id="cmp84DA44BC01768FB21E1664FF352CB56B" Guid="*">
10641076
<File Id="fil4A5FD068B0A21617E9A7ABB9BEDC9BBD" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Management.HDInsight.dll" />
10651077
</Component>
@@ -1152,6 +1164,9 @@
11521164
<Component Id="cmp19A1422310791548B2EE9CC01D0E80AB" Guid="*">
11531165
<File Id="fil775FC63E54E73F93CF6A7DD79AA7766F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.Insights.dll" />
11541166
</Component>
1167+
<Component Id="cmpAB0BE651457D19885EE5BD5615E283A9" Guid="*">
1168+
<File Id="fil7C8081F59D42A001771050D89E11D7CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.KeyVault.Core.dll" />
1169+
</Component>
11551170
<Component Id="cmpFB65291F937077CCA80689CFC3727B1A" Guid="*">
11561171
<File Id="fil87446160E4B0238E50AB62B792E935C1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Insights\Microsoft.Azure.ResourceManager.dll" />
11571172
</Component>
@@ -1814,12 +1829,21 @@
18141829
<Component Id="cmpE542A66FF253AB7ECF153BC7F8617497" Guid="*">
18151830
<File Id="fil076A3639A8C23CB436A1A95F071AB968" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Insights.dll" />
18161831
</Component>
1832+
<Component Id="cmp305E4FA8EDCADFD3F98F46056489A372" Guid="*">
1833+
<File Id="fil7E321418CAB25E9F0E49A973C3596851" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.KeyVault.Core.dll" />
1834+
</Component>
18171835
<Component Id="cmp3A5E7F3EA44ACFDD84B8CE1D36DA80C7" Guid="*">
18181836
<File Id="fil9B815D18A217668B9C3F30A088551FEE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Management.Redis.dll" />
18191837
</Component>
18201838
<Component Id="cmpB77BD825E0EE360848A0E312174B8E79" Guid="*">
18211839
<File Id="filC946540561EFB51E32A9A78C9A4C4E4E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.ResourceManager.dll" />
18221840
</Component>
1841+
<Component Id="cmpB1AB5620182396F5055594CB5B71DFF5" Guid="*">
1842+
<File Id="fil927418DCA437A44F331156F1B181B0CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Data.Edm.dll" />
1843+
</Component>
1844+
<Component Id="cmpF3A6E2A588E2828B1141B2B4F2DEE2CA" Guid="*">
1845+
<File Id="fil6885A1C5198BBE4BE218B29F4AF8CD4F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Data.OData.dll" />
1846+
</Component>
18231847
<Component Id="cmpDFF1A711321C50653141E2AE4BB76806" Guid="*">
18241848
<File Id="filF25C5E7B600CD1857B7B71EF4B86B617" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Data.Services.Client.dll" />
18251849
</Component>
@@ -3229,6 +3253,9 @@
32293253
<Component Id="cmp524E28243CC9788C41819437014F3F7D" Guid="*">
32303254
<File Id="fil6BD7B8BB425C2B1E0D24EEEDD1C1FDD8" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.Common.NetFramework.dll" />
32313255
</Component>
3256+
<Component Id="cmp0165D93E848BF589D3E0D3863617F9F0" Guid="*">
3257+
<File Id="fil55AE55B88AC94CD6CC79AD1D084BF659" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.KeyVault.Core.dll" />
3258+
</Component>
32323259
<Component Id="cmp63E7146E10A0CADBB072FDBAAEC2FDB2" Guid="*">
32333260
<File Id="fil92D5EE3C92A0580B16CAF05E40354F28" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Microsoft.Azure.ResourceManager.dll" />
32343261
</Component>
@@ -3941,6 +3968,9 @@
39413968
<Component Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" Guid="*">
39423969
<File Id="fil83B7914462FDE1E5AF770AB859D8B842" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.Common.NetFramework.dll" />
39433970
</Component>
3971+
<Component Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" Guid="*">
3972+
<File Id="fil519585B1FCAB1A8CC6D2358A8ABCAF64" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.KeyVault.Core.dll" />
3973+
</Component>
39443974
<Component Id="cmp20193DF5170BBA9B0BE967155AF5F05C" Guid="*">
39453975
<File Id="filC19FDC44F712388F8C9CE585B3823B3F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RemoteApp\Microsoft.Azure.ResourceManager.dll" />
39463976
</Component>
@@ -4894,6 +4924,7 @@
48944924
<ComponentRef Id="cmpD23F8CB641E890A83A492A99686505AF" />
48954925
<ComponentRef Id="cmpB0584BB55D8714E4CF5E60167B55282E" />
48964926
<ComponentRef Id="cmpC964B4550D9D1C104A224E22B19599BF" />
4927+
<ComponentRef Id="cmp0660CA6282A998031B7B868E7AA9BFFE" />
48974928
<ComponentRef Id="cmp557AD28EA410808B3805EFE4AA73C977" />
48984929
<ComponentRef Id="cmp4B5A611FF761BA928A53E0E56FB58D78" />
48994930
<ComponentRef Id="cmpD762051962F7D3051FBC9CF971AE9325" />
@@ -5083,6 +5114,8 @@
50835114
<ComponentRef Id="cmpB3134BB8ADC109CD66C73AB4AC43FF8A" />
50845115
<ComponentRef Id="cmp23A4C42E03D6ADC61C13AED7A3C5C43D" />
50855116
<ComponentRef Id="cmp2F8A21B67A574848E46161AF4DBAEAB7" />
5117+
<ComponentRef Id="cmp44B0766E3627CFEBD6119DBD995E3945" />
5118+
<ComponentRef Id="cmpC6787B66E3657598F34EB40B7D4A39D9" />
50865119
<ComponentRef Id="cmpFD0DE325B243453297C251C92C98245D" />
50875120
<ComponentRef Id="cmp5B16E8141BC633DB9DEB2A9361AF4C71" />
50885121
<ComponentRef Id="cmp24741C738CAC6E0595C4035CF8FE190A" />
@@ -5105,6 +5138,7 @@
51055138
<ComponentRef Id="cmp327D63D4E47C0C921CB8B578A78012CD" />
51065139
<ComponentRef Id="cmp0A73501EDFCB1876C97F2D4B520F3E35" />
51075140
<ComponentRef Id="cmp7EBE3286268B848A8C4813AC64EA4C34" />
5141+
<ComponentRef Id="cmp1E5C482880D1BD5A699356E3CFEA33B6" />
51085142
<ComponentRef Id="cmp84DA44BC01768FB21E1664FF352CB56B" />
51095143
<ComponentRef Id="cmpA1C271511C8C2910A9ADBC85D928D54C" />
51105144
<ComponentRef Id="cmp8F725CF358AB23BDABE18B5FE9B73BFA" />
@@ -5135,6 +5169,7 @@
51355169
<ComponentRef Id="cmpA848C04563692D93B90821EE8960E3B4" />
51365170
<ComponentRef Id="cmp652574B007D36760A8F3951C8BBCBA73" />
51375171
<ComponentRef Id="cmp19A1422310791548B2EE9CC01D0E80AB" />
5172+
<ComponentRef Id="cmpAB0BE651457D19885EE5BD5615E283A9" />
51385173
<ComponentRef Id="cmpFB65291F937077CCA80689CFC3727B1A" />
51395174
<ComponentRef Id="cmpC9466F4B506234EBA66C4F1204C0CD5D" />
51405175
<ComponentRef Id="cmp734CB1D0853F1EC3CC1EA7E5A0C5D408" />
@@ -5351,8 +5386,11 @@
53515386
<ComponentRef Id="cmp805E82D161288ED9EE4AD5A6CDA1D594" />
53525387
<ComponentRef Id="cmpDB48760E05625FA4A872912DADB76AE8" />
53535388
<ComponentRef Id="cmpE542A66FF253AB7ECF153BC7F8617497" />
5389+
<ComponentRef Id="cmp305E4FA8EDCADFD3F98F46056489A372" />
53545390
<ComponentRef Id="cmp3A5E7F3EA44ACFDD84B8CE1D36DA80C7" />
53555391
<ComponentRef Id="cmpB77BD825E0EE360848A0E312174B8E79" />
5392+
<ComponentRef Id="cmpB1AB5620182396F5055594CB5B71DFF5" />
5393+
<ComponentRef Id="cmpF3A6E2A588E2828B1141B2B4F2DEE2CA" />
53565394
<ComponentRef Id="cmpDFF1A711321C50653141E2AE4BB76806" />
53575395
<ComponentRef Id="cmpD5D6E28B9232D19A4D3FC543B56214DB" />
53585396
<ComponentRef Id="cmp6DCD11F46E1DCE998C423CD0BC09CD15" />
@@ -5812,6 +5850,7 @@
58125850
<ComponentRef Id="cmp430193C6FCC710357C2AD0A4D74B05CB" />
58135851
<ComponentRef Id="cmp42B92586860E12CFF7E8A202F62CA257" />
58145852
<ComponentRef Id="cmp524E28243CC9788C41819437014F3F7D" />
5853+
<ComponentRef Id="cmp0165D93E848BF589D3E0D3863617F9F0" />
58155854
<ComponentRef Id="cmp63E7146E10A0CADBB072FDBAAEC2FDB2" />
58165855
<ComponentRef Id="cmp60E2E53B6F8278E75ED2802429D310E1" />
58175856
<ComponentRef Id="cmpD5B9EE259A4CDEA7EAC00BA0091C1476" />
@@ -6036,6 +6075,7 @@
60366075
<ComponentRef Id="cmp913600C952F3D3D27C7E14B7E72AA774" />
60376076
<ComponentRef Id="cmp545D8CBEAE57C9BE9C9B852D32CB58B3" />
60386077
<ComponentRef Id="cmp5543C526734BEBD6DBA8D3F4CCAC4906" />
6078+
<ComponentRef Id="cmpDA11D2F04D85A50CE393C4C23CCED63F" />
60396079
<ComponentRef Id="cmp20193DF5170BBA9B0BE967155AF5F05C" />
60406080
<ComponentRef Id="cmpB67E98F8DD3717DE55704662D73EB3DC" />
60416081
<ComponentRef Id="cmp645D8B7138F96F1053AB259E37D61D3D" />

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,13 @@
111111
<Reference Include="Microsoft.WindowsAzure.Management">
112112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113113
</Reference>
114-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114+
<Reference Include="Microsoft.WindowsAzure.Storage">
115115
<SpecificVersion>False</SpecificVersion>
116-
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
116+
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
117+
</Reference>
118+
<Reference Include="Microsoft.Azure.KeyVault.Core">
119+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
120+
<Private>True</Private>
117121
</Reference>
118122
<Reference Include="Microsoft.Threading.Tasks">
119123
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2727
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2828
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
29-
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
29+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
30+
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
3031
<package id="xunit" version="1.9.2" targetFramework="net45" />
3132
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
3233
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />

‎src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,12 @@
103103
<Reference Include="Microsoft.WindowsAzure.Configuration">
104104
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
105105
</Reference>
106-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
106+
<Reference Include="Microsoft.WindowsAzure.Storage">
107+
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
108+
<Private>True</Private>
109+
</Reference>
110+
<Reference Include="Microsoft.Azure.KeyVault.Core">
111+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
108112
<Private>True</Private>
109113
</Reference>
110114
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/ResourceManager/AzureBatch/Commands.Batch/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
24-
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
24+
<package id="WindowsAzure.Storage" version="6.0.0" targetFramework="net45" />
25+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
2526
</packages>

0 commit comments

Comments
 (0)