Skip to content

Commit 0d51101

Browse files
yoavrubinyoavrubin
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents ded5e23 + 7e05149 commit 0d51101

File tree

246 files changed

+13108
-8102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+13108
-8102
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 20 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@
210210
<Component Id="cmp04F046DCD3C191FC98D9F1338855F823" Guid="*">
211211
<File Id="fil2726BF25C508F620D514549EED9C51DB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Azure.Insights.dll" />
212212
</Component>
213+
<Component Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" Guid="*">
214+
<File Id="fil25472A8FA7FA8AD458FF3DD90F113F8A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Azure.ResourceManager.dll" />
215+
</Component>
213216
<Component Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" Guid="*">
214217
<File Id="fil026AC17EB4E84AFA3C77F14CA14F4EF8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.Edm.dll" />
215218
</Component>
@@ -555,6 +558,9 @@
555558
<Component Id="cmp324B90D4B088D87E4F11B86F299C1C4A" Guid="*">
556559
<File Id="fil4258BBFD2F3134F91EC449D577FADD4F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Commands.StorSimple.dll-help.xml" />
557560
</Component>
561+
<Component Id="cmpC5EDAFBD54A26120BADCFFA83EFE4D8D" Guid="*">
562+
<File Id="filD898BD06855BCA3BC672942E6D234D27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Commands.WebSites.format.ps1xml" />
563+
</Component>
558564
<Component Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" Guid="*">
559565
<File Id="filBA8A6C454E13EDED5C76A72DF055C141" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.Compute.dll" />
560566
</Component>
@@ -893,6 +899,9 @@
893899
<Component Id="cmpD1207E6C71B252DEA35A0F21BD18C739" Guid="*">
894900
<File Id="filAB602D03DC2C505D7E6A30F218B1E357" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Microsoft.WindowsAzure.Commands.Common.dll" />
895901
</Component>
902+
<Component Id="cmpF1C3AE30B7D2067AD8CC88BBEAB4E9D6" Guid="*">
903+
<File Id="fil1E2F266347128635E44D533122EAB3B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Microsoft.WindowsAzure.Commands.WebSites.format.ps1xml" />
904+
</Component>
896905
<Component Id="cmpEF310754D1C69EB41F0EA968BF00DBB9" Guid="*">
897906
<File Id="fil375767A5125510DB24B62A452A56A6B1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Microsoft.WindowsAzure.Management.dll" />
898907
</Component>
@@ -1283,6 +1292,9 @@
12831292
</Component>
12841293
</Directory>
12851294
<Directory Id="dir59C91A8ADAEBA190A387BD9805945B5D" Name="HDInsight">
1295+
<Component Id="cmpE649532D45F37D54928D095F9FA83399" Guid="*">
1296+
<File Id="fil8FB3B64E67BEECBD33C8362E7253C687" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\BouncyCastle.Crypto.dll" />
1297+
</Component>
12861298
<Component Id="cmp96153B9C1921EF93C9484B51120C392D" Guid="*">
12871299
<File Id="filEA0D0D08D5D99E96498236DC6A2E7DC1" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\HDInsight\Hyak.Common.dll" />
12881300
</Component>
@@ -2241,52 +2253,6 @@
22412253
</Component>
22422254
</Directory>
22432255
</Directory>
2244-
<Directory Id="dirE5EA14CE73A6C72D22D108D9497DF74C" Name="Python">
2245-
<Directory Id="dirCDAC5B8A642AC456869167EAE2A10C93" Name="WebRole">
2246-
<Component Id="cmp1A43AEA8E47DF46A363C5FA3B6EE14DE" Guid="*">
2247-
<File Id="filE6C0D9B69028476CEF9107E1347CA861" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\AzureSetup.cfg" />
2248-
</Component>
2249-
<Component Id="cmp5D8936EABB5A2DB970A0AB381C73830D" Guid="*">
2250-
<File Id="filE2A6F752B86D2DFA0959B90BD41DA77C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.config" />
2251-
</Component>
2252-
<Component Id="cmp1F5C71A2DDA57D948B24B19D145ADE56" Guid="*">
2253-
<File Id="fil22FCD09649F038F981DDB84F67167316" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.AzureSetup.exe.content" />
2254-
</Component>
2255-
<Component Id="cmp021B29446C062B1149132B85E2459720" Guid="*">
2256-
<File Id="filF3D8A3E762DD13F9FFD7B2B0BB339070" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.PythonTools.WebRole.dll.content" />
2257-
</Component>
2258-
<Component Id="cmpA69B6C11506C243CDE56D867B794AC9F" Guid="*">
2259-
<File Id="fil848958AA95168855F8FE3E93358C2B76" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.Deployment.dll.content" />
2260-
</Component>
2261-
<Component Id="cmp8B904F97CEDA97F7D1A68BDBC2259AB4" Guid="*">
2262-
<File Id="filD732F0BF33579E271040FE1DE0AB979E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.dll.content" />
2263-
</Component>
2264-
<Component Id="cmp0F225B9A1229479E467639080599E9D1" Guid="*">
2265-
<File Id="fil92F43807E9714346A87AFB7D901AE389" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Microsoft.Web.PlatformInstaller.UI.dll.content" />
2266-
</Component>
2267-
<Component Id="cmpB20DE8E10E242EDCAFEBEAEECD60CDD3" Guid="*">
2268-
<File Id="fil7615C0F35ED9D985DD0C6EADB7E910CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\RoleSettings.xml" />
2269-
</Component>
2270-
<Component Id="cmpC252A869692E36346E5A3771DD27D205" Guid="*">
2271-
<File Id="fil7846CF7AD904A172B671C85CDF5CC0E6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Scaffold.xml" />
2272-
</Component>
2273-
<Component Id="cmp9F463ADD333B57253F89EE9E82167637" Guid="*">
2274-
<File Id="filB84BA051D600909C743652ECF66D8B51" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\web.cloud.config" />
2275-
</Component>
2276-
<Component Id="cmp43BD3F229DAE64FEDBC8155FEF158956" Guid="*">
2277-
<File Id="fil30EB96553E136D5AAA0C61DD1A9776F7" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\Web.config" />
2278-
</Component>
2279-
<Component Id="cmpA02D6608F19F40B64C14E402AD8E622B" Guid="*">
2280-
<File Id="filF4535711345CAACEFE8F95EB9C91C691" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\WebPICmdLine.exe.content" />
2281-
</Component>
2282-
<Component Id="cmp878544C3BBE474849E893E400314D586" Guid="*">
2283-
<File Id="fil56D79CA1DCB21C2716FF96E6BB48B5CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\WebRole.xml" />
2284-
</Component>
2285-
<Component Id="cmp70473B6477B7086BBB4B792180BF8925" Guid="*">
2286-
<File Id="fil3CB79929DB0097DEE79F047B38A9C19A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Services\Resources\Scaffolding\Python\WebRole\wfastcgi.py" />
2287-
</Component>
2288-
</Directory>
2289-
</Directory>
22902256
</Directory>
22912257
</Directory>
22922258
</Directory>
@@ -2619,6 +2585,9 @@
26192585
<Component Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" Guid="*">
26202586
<File Id="filBD421847424CAE48F72C74C69770D8C0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Common.NetFramework.dll" />
26212587
</Component>
2588+
<Component Id="cmpF584FEE91889D98A4299209A1B9B1B94" Guid="*">
2589+
<File Id="fil1E84C52FC3BA4FCD7D38DF81574031BC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.ResourceManager.dll" />
2590+
</Component>
26222591
<Component Id="cmp9E03AAB684EA41B087D79346AE6C1073" Guid="*">
26232592
<File Id="fil501FE0FB963E03A9292BE5CC5A895CBB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
26242593
</Component>
@@ -2812,6 +2781,7 @@
28122781
<ComponentRef Id="cmp3720A4CCA2E5F4D2EC35291198D4BEE3" />
28132782
<ComponentRef Id="cmpB6D50CCF3757EBDA9602AA570BCE0D1E" />
28142783
<ComponentRef Id="cmp04F046DCD3C191FC98D9F1338855F823" />
2784+
<ComponentRef Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" />
28152785
<ComponentRef Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" />
28162786
<ComponentRef Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" />
28172787
<ComponentRef Id="cmp27231928A2D67FBC8D981AB504BD21F1" />
@@ -2925,6 +2895,7 @@
29252895
<ComponentRef Id="cmpFC3EB6ABEC249B231E7692A65B39E121" />
29262896
<ComponentRef Id="cmp41DD99937FCAACD05C1E4E7BE3A04532" />
29272897
<ComponentRef Id="cmp324B90D4B088D87E4F11B86F299C1C4A" />
2898+
<ComponentRef Id="cmpC5EDAFBD54A26120BADCFFA83EFE4D8D" />
29282899
<ComponentRef Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" />
29292900
<ComponentRef Id="cmp820458093C358621EA214A7362ACCE1D" />
29302901
<ComponentRef Id="cmpE231A51CC41F80C051BC0663E08339BC" />
@@ -3035,6 +3006,7 @@
30353006
<ComponentRef Id="cmpFFFCD58A5DB0E19A9E2609FBE2410C09" />
30363007
<ComponentRef Id="cmp4ABAE69FE7F32B747C276E27CBD08B11" />
30373008
<ComponentRef Id="cmpD1207E6C71B252DEA35A0F21BD18C739" />
3009+
<ComponentRef Id="cmpF1C3AE30B7D2067AD8CC88BBEAB4E9D6" />
30383010
<ComponentRef Id="cmpEF310754D1C69EB41F0EA968BF00DBB9" />
30393011
<ComponentRef Id="cmp4DA3B101B35F9FABD0EC784559AC44A2" />
30403012
<ComponentRef Id="cmpFE7DE66BD1CE262C145D66A0E7250779" />
@@ -3161,6 +3133,7 @@
31613133
<ComponentRef Id="cmpCCC5976D4AE7141FB6D3C6650AD0C40E" />
31623134
<ComponentRef Id="cmp1D3D3FE8D3C4513B1536EB8B0AACEBE1" />
31633135
<ComponentRef Id="cmpB0718E71D7A15CCA7375389A12F7D568" />
3136+
<ComponentRef Id="cmpE649532D45F37D54928D095F9FA83399" />
31643137
<ComponentRef Id="cmp96153B9C1921EF93C9484B51120C392D" />
31653138
<ComponentRef Id="cmp430193C6FCC710357C2AD0A4D74B05CB" />
31663139
<ComponentRef Id="cmp42B92586860E12CFF7E8A202F62CA257" />
@@ -3467,20 +3440,6 @@
34673440
<ComponentRef Id="cmp080181B4207E414501C622783B794CA8" />
34683441
<ComponentRef Id="cmpE4F565792794EACEBFA721815AE3957C" />
34693442
<ComponentRef Id="cmpAC5F70011A33DAC18EE39F5D5BB9840B" />
3470-
<ComponentRef Id="cmp1A43AEA8E47DF46A363C5FA3B6EE14DE" />
3471-
<ComponentRef Id="cmp5D8936EABB5A2DB970A0AB381C73830D" />
3472-
<ComponentRef Id="cmp1F5C71A2DDA57D948B24B19D145ADE56" />
3473-
<ComponentRef Id="cmp021B29446C062B1149132B85E2459720" />
3474-
<ComponentRef Id="cmpA69B6C11506C243CDE56D867B794AC9F" />
3475-
<ComponentRef Id="cmp8B904F97CEDA97F7D1A68BDBC2259AB4" />
3476-
<ComponentRef Id="cmp0F225B9A1229479E467639080599E9D1" />
3477-
<ComponentRef Id="cmpB20DE8E10E242EDCAFEBEAEECD60CDD3" />
3478-
<ComponentRef Id="cmpC252A869692E36346E5A3771DD27D205" />
3479-
<ComponentRef Id="cmp9F463ADD333B57253F89EE9E82167637" />
3480-
<ComponentRef Id="cmp43BD3F229DAE64FEDBC8155FEF158956" />
3481-
<ComponentRef Id="cmpA02D6608F19F40B64C14E402AD8E622B" />
3482-
<ComponentRef Id="cmp878544C3BBE474849E893E400314D586" />
3483-
<ComponentRef Id="cmp70473B6477B7086BBB4B792180BF8925" />
34843443
<ComponentRef Id="cmp5C3F4FE4E92F090F22B371444CEFA7FB" />
34853444
<ComponentRef Id="cmp65991ADC169007028A31A4F049E069EF" />
34863445
<ComponentRef Id="cmp221C334CE6510BD95538F285D482251F" />
@@ -3589,6 +3548,7 @@
35893548
<ComponentRef Id="cmp844CE71A108EFCC5B93A410D5205E6DB" />
35903549
<ComponentRef Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" />
35913550
<ComponentRef Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" />
3551+
<ComponentRef Id="cmpF584FEE91889D98A4299209A1B9B1B94" />
35923552
<ComponentRef Id="cmp9E03AAB684EA41B087D79346AE6C1073" />
35933553
<ComponentRef Id="cmpEC794DBE4822765C546A06D80EAA3292" />
35943554
<ComponentRef Id="cmpB48F1BD4D2E8307615F7E22174FF4E6D" />

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -58,7 +58,7 @@
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Common.Authentication">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.15-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.17-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>

‎src/Common/Commands.Common.Storage/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.15-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.17-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -56,7 +56,7 @@
5656
</Reference>
5757
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.15-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
59+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.17-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Common.NetFramework">
6262
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>

‎src/Common/Commands.Common.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
44
<package id="Microsoft.Azure.Common" version="2.0.4" targetFramework="net45" />
5-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.15-preview" targetFramework="net45" />
5+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.17-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />

‎src/Common/Commands.Common/Commands.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -60,7 +60,7 @@
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.Common.Authentication">
6262
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.15-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
63+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.17-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6666
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)