Skip to content

Commit a7a15c9

Browse files
author
Vlad Cananau
committed
Merge branch 'ignite' of https://github.com/Azure/azure-powershell-pr into ignite_updatedns
2 parents 757c0cd + d1dc32f commit a7a15c9

File tree

224 files changed

+7202
-1878
lines changed

Some content is hidden

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

224 files changed

+7202
-1878
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ This repository contains a set of PowerShell cmdlets for developers and administ
2828
* Log streaming
2929
* Save log
3030
* Cloud Services
31-
* Create scaffolding for cloud service and role. Role support includes Node.js, PHP, Django and Cache.
31+
* Create scaffolding for cloud service and role. Role support includes Node.js and PHP.
3232
* Manage cloud service and role, such as CRUD, start and stop.
33-
* Manage extension
33+
* Manage extension.
3434
* Start/Stop Azure emulator.
3535
* Manage certificate.
3636
* Manage cloud service extensions
@@ -294,4 +294,4 @@ If you encounter any bugs with the library please file an issue in the [Issues](
294294

295295
# Learn More
296296

297-
* [Microsoft Azure Script Center](http://www.azure.microsoft.com/en-us/documentation/scripts/)
297+
* [Microsoft Azure Script Center](http://www.azure.microsoft.com/en-us/documentation/scripts/)

‎setup/azurecmd.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.16" ?>
8+
<?define version="0.8.16.1" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎setup/azurecmdfiles.wxi

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@
118118
<Component Id="cmp1D51F57A02A3C8949E02ED001784388C" Guid="*">
119119
<File Id="fil1D9D6C76E1B943389910123884F80E38" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Azure.ResourceManager.dll" />
120120
</Component>
121+
<Component Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" Guid="*">
122+
<File Id="fil0114E75108ED068529C5ADCBB1BFD9DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Edm.dll" />
123+
</Component>
124+
<Component Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" Guid="*">
125+
<File Id="filF058DF83A3C7D1C1E4C33B68B512C589" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.OData.dll" />
126+
</Component>
127+
<Component Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" Guid="*">
128+
<File Id="filBD789B715F4C6F58DFFACC4839072346" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.Data.Services.Client.dll" />
129+
</Component>
121130
<Component Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" Guid="*">
122131
<File Id="filF8F961D8FC629431B44B43A76538C334" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\DataFactories\Microsoft.DataFactories.Runtime.dll" />
123132
</Component>
@@ -257,6 +266,15 @@
257266
<Component Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" Guid="*">
258267
<File Id="fil25472A8FA7FA8AD458FF3DD90F113F8A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Azure.ResourceManager.dll" />
259268
</Component>
269+
<Component Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" Guid="*">
270+
<File Id="fil026AC17EB4E84AFA3C77F14CA14F4EF8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.Edm.dll" />
271+
</Component>
272+
<Component Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" Guid="*">
273+
<File Id="filEC137547A5F97E0CEB774FDE22C6D0BE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.OData.dll" />
274+
</Component>
275+
<Component Id="cmp27231928A2D67FBC8D981AB504BD21F1" Guid="*">
276+
<File Id="fil469AB2B99910FBDB757FB64FAA43EEF2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.Data.Services.Client.dll" />
277+
</Component>
260278
<Component Id="cmpE4D93F3591A5E0258D9F3BC7B60DAB6A" Guid="*">
261279
<File Id="fil080BD0B87E23FB9630A97BC7403CF375" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
262280
</Component>
@@ -278,6 +296,9 @@
278296
<Component Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" Guid="*">
279297
<File Id="filC27FF716D5D45BE809FDF4A013ED221B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\System.Net.Http.Formatting.dll" />
280298
</Component>
299+
<Component Id="cmp0BBA12BCAEC94783EC690D768E1A9476" Guid="*">
300+
<File Id="fil1AD7EC261964401DA187C10AFD95DF02" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Insights\System.Spatial.dll" />
301+
</Component>
281302
</Directory>
282303
<Directory Id="dirF32F5B70B51A29EED3B6A42F959BE600" Name="KeyVault">
283304
<Component Id="cmpF691ECE2E61383DFBF997C509D946386" Guid="*">
@@ -346,6 +367,9 @@
346367
<Component Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" Guid="*">
347368
<File Id="fil3208D4A9BD36690D97F5BC942D634247" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Net.Http.Primitives.dll" />
348369
</Component>
370+
<Component Id="cmp03F452B7335FA9F557105A7C423D8695" Guid="*">
371+
<File Id="filA1447FC0D40ED88A76676B51C5DCD116" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\KeyVault\System.Spatial.dll" />
372+
</Component>
349373
</Directory>
350374
<Directory Id="dir8CC0FAD05155C42F124B6D0BCA0E7D61" Name="RedisCache">
351375
<Component Id="cmp69C36860BD8B6FC1A4C57B49FD96943F" Guid="*">
@@ -606,6 +630,15 @@
606630
<Component Id="cmp455BD6804E7AFF3C169D8BBEA142F350" Guid="*">
607631
<File Id="filB6DAF827AA3819E3724603968C47E81B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Azure.ResourceManager.dll" />
608632
</Component>
633+
<Component Id="cmpBB7EA343079FE26FE38927CF77F2C51A" Guid="*">
634+
<File Id="fil19775EBEA08FEB2645E093B3FB5DF062" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Data.Edm.dll" />
635+
</Component>
636+
<Component Id="cmp85D01ED2294B536D8472C9A5B5491A95" Guid="*">
637+
<File Id="filF8E63A75266C8CB45DFCCC0A0F1DC92E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Data.OData.dll" />
638+
</Component>
639+
<Component Id="cmp0A8A301216E191E94F3BCB9F34E1AF69" Guid="*">
640+
<File Id="filC2B7D5513C8D5D1E0A7DD3F14874E7B7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.Data.Services.Client.dll" />
641+
</Component>
609642
<Component Id="cmpFA850AB1FD136DBF5C2B996258D7951E" Guid="*">
610643
<File Id="fil9F13D09ABC703F20DA1AF7819335EE2A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
611644
</Component>
@@ -651,6 +684,9 @@
651684
<Component Id="cmp50F7BE65E6B760565BEA45A1FD026E5A" Guid="*">
652685
<File Id="fil58ECD5D8224B64964939E2B6FFF6CEAC" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\System.Net.Http.Primitives.dll" />
653686
</Component>
687+
<Component Id="cmp39C80C84537D91210F1CD95CE24DDD6D" Guid="*">
688+
<File Id="fil32E37469BB7EA0E12E1503A1B5B901F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\StreamAnalytics\System.Spatial.dll" />
689+
</Component>
654690
</Directory>
655691
<Directory Id="dirB7A521425BBDC8EB5AA06380BBC1E2B3" Name="Tags">
656692
<Component Id="cmp4AC5851471CC40284384D744CCDD8C50" Guid="*">
@@ -1534,11 +1570,8 @@
15341570
<Component Id="cmp8CDB44BA783FF24C94CDFC5D12066BB1" Guid="*">
15351571
<File Id="fil2C73256F76E79B695523A2B3C4C845E9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Commands.Common.dll" />
15361572
</Component>
1537-
<Component Id="cmpA0A697DEB7822A0EC30F3D359EE930A6" Guid="*">
1538-
<File Id="fil528A48BB87B57E0D131C279CAD156D2B" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Common.dll" />
1539-
</Component>
1540-
<Component Id="cmpBE209ED6509A7E857FD9F9078051DC6A" Guid="*">
1541-
<File Id="fil96FD7FA0CBEE96E0C0239408CD5651A9" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Common.NetFramework.dll" />
1573+
<Component Id="cmpD7A9F76B2346156CA8F83F41A302B714" Guid="*">
1574+
<File Id="fil0218D7505353104A9DB742A55A839351" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.dll" />
15421575
</Component>
15431576
<Component Id="cmp4D3E383B38EF4392E70E981B7CA033D7" Guid="*">
15441577
<File Id="fil3D6B846AC421D38C5A9CB40A58B058B6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\RecoveryServices\Microsoft.WindowsAzure.Management.SiteRecovery.dll" />
@@ -2486,6 +2519,9 @@
24862519
<ComponentRef Id="cmp17C8052411378D4FBD409F0DBF5A3AAB" />
24872520
<ComponentRef Id="cmp951B200A49755FC237755AA2C77A0E32" />
24882521
<ComponentRef Id="cmp1D51F57A02A3C8949E02ED001784388C" />
2522+
<ComponentRef Id="cmp0E60A03D189105D6E7A23E5B6943A5C4" />
2523+
<ComponentRef Id="cmp0EE9B6E82BF354ED584258F3D7524FCC" />
2524+
<ComponentRef Id="cmp3EF2308A3A5D4416CF0A37CF350381A2" />
24892525
<ComponentRef Id="cmp8549E2CC25A35DDCAD1C042F4E80E254" />
24902526
<ComponentRef Id="cmp2E106693251FC564A4D03DA3778E26F7" />
24912527
<ComponentRef Id="cmp7BF776718E3154F969306B3FB853D175" />
@@ -2531,13 +2567,17 @@
25312567
<ComponentRef Id="cmpB6D50CCF3757EBDA9602AA570BCE0D1E" />
25322568
<ComponentRef Id="cmp04F046DCD3C191FC98D9F1338855F823" />
25332569
<ComponentRef Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" />
2570+
<ComponentRef Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" />
2571+
<ComponentRef Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" />
2572+
<ComponentRef Id="cmp27231928A2D67FBC8D981AB504BD21F1" />
25342573
<ComponentRef Id="cmpE4D93F3591A5E0258D9F3BC7B60DAB6A" />
25352574
<ComponentRef Id="cmp969D3C7FCFB07B7318A8A57FCD133108" />
25362575
<ComponentRef Id="cmp209CCEE0DCF9E72717C6DEDE4C8984E1" />
25372576
<ComponentRef Id="cmp7BECB13532E43A81AFC0959E29FF1F56" />
25382577
<ComponentRef Id="cmp5CEBB63124C5833CCFA24A6D28E11CC9" />
25392578
<ComponentRef Id="cmpF5AF8CEC5E3C01F32D02BF852FD840AC" />
25402579
<ComponentRef Id="cmp5D4BF2AFED5DA226237313E9C2F8099B" />
2580+
<ComponentRef Id="cmp0BBA12BCAEC94783EC690D768E1A9476" />
25412581
<ComponentRef Id="cmpF691ECE2E61383DFBF997C509D946386" />
25422582
<ComponentRef Id="cmp4384DC163B139D10A7988F6DCE10A880" />
25432583
<ComponentRef Id="cmp0635B54B2B3E0564FEA476E0C9A701C7" />
@@ -2560,6 +2600,7 @@
25602600
<ComponentRef Id="cmp5CDCB0785A318F614D9422554B3F4ED2" />
25612601
<ComponentRef Id="cmpE90D51E3A3C747163C7F1D6DC5409800" />
25622602
<ComponentRef Id="cmpAD51B1C903B9CB0DB18004F97CD8ADBA" />
2603+
<ComponentRef Id="cmp03F452B7335FA9F557105A7C423D8695" />
25632604
<ComponentRef Id="cmp69C36860BD8B6FC1A4C57B49FD96943F" />
25642605
<ComponentRef Id="cmp7D5E86930E84748A0DD514885305713B" />
25652606
<ComponentRef Id="cmpB7F69E2328CC8CB1B9E69DAE4C52B988" />
@@ -2644,6 +2685,9 @@
26442685
<ComponentRef Id="cmp4C4A177B8EA12C43941AF159F0A16E07" />
26452686
<ComponentRef Id="cmpDE1CE796EE504A069B56DCA4A16FD2D7" />
26462687
<ComponentRef Id="cmp455BD6804E7AFF3C169D8BBEA142F350" />
2688+
<ComponentRef Id="cmpBB7EA343079FE26FE38927CF77F2C51A" />
2689+
<ComponentRef Id="cmp85D01ED2294B536D8472C9A5B5491A95" />
2690+
<ComponentRef Id="cmp0A8A301216E191E94F3BCB9F34E1AF69" />
26472691
<ComponentRef Id="cmpFA850AB1FD136DBF5C2B996258D7951E" />
26482692
<ComponentRef Id="cmpB5D013974F5418F70273380DBDD9266F" />
26492693
<ComponentRef Id="cmp13BB804F8DBF8DC64F33621628AE0FEA" />
@@ -2659,6 +2703,7 @@
26592703
<ComponentRef Id="cmp79186A81BC669D6024CCF1A09E2E2C5A" />
26602704
<ComponentRef Id="cmp5A3BD827A14F986178D0A9A181EF2AA5" />
26612705
<ComponentRef Id="cmp50F7BE65E6B760565BEA45A1FD026E5A" />
2706+
<ComponentRef Id="cmp39C80C84537D91210F1CD95CE24DDD6D" />
26622707
<ComponentRef Id="cmp4AC5851471CC40284384D744CCDD8C50" />
26632708
<ComponentRef Id="cmpE1EF08FBA8BC9006E225B9DD83DF428F" />
26642709
<ComponentRef Id="cmp019CEEDFCC1D69922E8F00B5A76B7560" />
@@ -2946,8 +2991,7 @@
29462991
<ComponentRef Id="cmpFFEE4D9645AEA846AF41897FD2135E02" />
29472992
<ComponentRef Id="cmp2F6E4C6B8006898EFE87C88921C1B6BA" />
29482993
<ComponentRef Id="cmp8CDB44BA783FF24C94CDFC5D12066BB1" />
2949-
<ComponentRef Id="cmpA0A697DEB7822A0EC30F3D359EE930A6" />
2950-
<ComponentRef Id="cmpBE209ED6509A7E857FD9F9078051DC6A" />
2994+
<ComponentRef Id="cmpD7A9F76B2346156CA8F83F41A302B714" />
29512995
<ComponentRef Id="cmp4D3E383B38EF4392E70E981B7CA033D7" />
29522996
<ComponentRef Id="cmp50D44814DFFEA762A53D9DEDCE48F689" />
29532997
<ComponentRef Id="cmp439E7C155DEEFC3877653E4ED11F66AC" />

‎src/.nuget/NuGet.Config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
6+
<activePackageSource>
7+
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
8+
<add key="internal share" value="\\aaptfile01\adxsdk\nuget\binaries\packages" />
9+
</activePackageSource>
610
</configuration>

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@
5454
</Reference>
5555
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.dll</HintPath>
57+
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Common.Authentication">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.17-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.0.21-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>
65-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.0.4\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
65+
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.14.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
69+
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
@@ -77,12 +77,13 @@
7777
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7878
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
7979
</Reference>
80-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
80+
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8181
<SpecificVersion>False</SpecificVersion>
82-
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
82+
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
8383
</Reference>
8484
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms">
85-
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.12.111071459\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
85+
<SpecificVersion>False</SpecificVersion>
86+
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
8687
</Reference>
8788
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
8889
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)