Skip to content

Commit b7ff41e

Browse files
author
jasper-schneider
committed
Merge remote-tracking branch 'upstream/dev' into getTaskFile
2 parents 4f273e6 + 8ab89e0 commit b7ff41e

File tree

262 files changed

+13436
-3709
lines changed

Some content is hidden

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

262 files changed

+13436
-3709
lines changed

AzurePowershell.Test.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<StreamAnalyticsManagerTestDebug>.\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll</StreamAnalyticsManagerTestDebug>
1818
<BatchTestDebug>.\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll</BatchTestDebug>
1919
<WebsitesTestDebug>.\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll</WebsitesTestDebug>
20+
<RemoteAppTestDebug>.\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll</RemoteAppTestDebug>
2021
<ServiceManagementTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</ServiceManagementTestDebug>
2122
<ServiceManagementExtensionsTestDebug>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Extensions.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Extensions.Test.dll</ServiceManagementExtensionsTestDebug>
2223
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
@@ -44,6 +45,7 @@
4445
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
4546
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
4647
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
48+
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
4749
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
4850
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
4951
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
@@ -93,6 +95,11 @@
9395
</Target>
9496

9597

98+
<Target Name="TestRemoteApp">
99+
<Xunit.Runner.MSBuild.xunit Assemblies="$(RemoteAppTestDebug)" Html="$(TestOutputDirectory)\RemoteAppTestDebug.xunit.dll.html" Verbose="false"
100+
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
101+
</Target>
102+
96103
<Target Name="TestWebsites">
97104
<Xunit.Runner.MSBuild.xunit Assemblies="$(WebsitesTestDebug)" Html="$(TestOutputDirectory)\WebsitesTestDebug.xunit.dll.html" Verbose="false"
98105
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
44

5-
If you encounter any bugs with Microsoft Azure PowerShell please file an issue in the [Issues](https://github.com/WindowsAzure/azure-sdk-tools/issues) section of the project.
5+
If you encounter any bugs with Microsoft Azure PowerShell please file an issue in the [Issues](https://github.com/Azure/azure-powershell/issues) section of the project.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ For detail descriptions and examples of the cmdlets, type
139139
2. Open Microsoft Web Platform Installer and search for __Microsoft Azure PowerShell__.
140140
3. Install.
141141

142-
You can also find the standalone installers for all the versions at [Downloads](https://github.com/Azure/azure-sdk-tools/releases)
142+
You can also find the standalone installers for all the versions at [Downloads](https://github.com/Azure/azure-powershell/releases)
143143

144144
### Source Code
145145

146146
1. Download the source code from GitHub repo
147-
2. Follow the [Microsoft Azure PowerShell Developer Guide](https://github.com/Azure/azure-sdk-tools/wiki/Windows-Azure-PowerShell-Developer-Guide)
147+
2. Follow the [Microsoft Azure PowerShell Developer Guide](https://github.com/Azure/azure-powershell/wiki/Microsoft-Azure-PowerShell-Developer-Guide)
148148

149149
### Supported PowerShell Versions
150150

@@ -290,8 +290,8 @@ Be sure to check out the [Microsoft Azure Developer Forums on Stack Overflow](ht
290290

291291
If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
292292

293-
If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-sdk-tools/issues) section of the project.
293+
If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-powershell/issues) section of the project.
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/azurecmdfiles.wxi

Lines changed: 20 additions & 0 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>
@@ -2619,6 +2631,9 @@
26192631
<Component Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" Guid="*">
26202632
<File Id="filBD421847424CAE48F72C74C69770D8C0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Common.NetFramework.dll" />
26212633
</Component>
2634+
<Component Id="cmpF584FEE91889D98A4299209A1B9B1B94" Guid="*">
2635+
<File Id="fil1E84C52FC3BA4FCD7D38DF81574031BC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.ResourceManager.dll" />
2636+
</Component>
26222637
<Component Id="cmp9E03AAB684EA41B087D79346AE6C1073" Guid="*">
26232638
<File Id="fil501FE0FB963E03A9292BE5CC5A895CBB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
26242639
</Component>
@@ -2812,6 +2827,7 @@
28122827
<ComponentRef Id="cmp3720A4CCA2E5F4D2EC35291198D4BEE3" />
28132828
<ComponentRef Id="cmpB6D50CCF3757EBDA9602AA570BCE0D1E" />
28142829
<ComponentRef Id="cmp04F046DCD3C191FC98D9F1338855F823" />
2830+
<ComponentRef Id="cmp3B09E1BDCA0B52F9EA656CCC45BD9719" />
28152831
<ComponentRef Id="cmp2591E42374FAC2E1ECB763DEBCAD6CA6" />
28162832
<ComponentRef Id="cmp32AF78F6912DCA522A0FFAC8FD603B2F" />
28172833
<ComponentRef Id="cmp27231928A2D67FBC8D981AB504BD21F1" />
@@ -2925,6 +2941,7 @@
29252941
<ComponentRef Id="cmpFC3EB6ABEC249B231E7692A65B39E121" />
29262942
<ComponentRef Id="cmp41DD99937FCAACD05C1E4E7BE3A04532" />
29272943
<ComponentRef Id="cmp324B90D4B088D87E4F11B86F299C1C4A" />
2944+
<ComponentRef Id="cmpC5EDAFBD54A26120BADCFFA83EFE4D8D" />
29282945
<ComponentRef Id="cmpA2D0B95472DAC9EEDEC0CC473F3138B6" />
29292946
<ComponentRef Id="cmp820458093C358621EA214A7362ACCE1D" />
29302947
<ComponentRef Id="cmpE231A51CC41F80C051BC0663E08339BC" />
@@ -3035,6 +3052,7 @@
30353052
<ComponentRef Id="cmpFFFCD58A5DB0E19A9E2609FBE2410C09" />
30363053
<ComponentRef Id="cmp4ABAE69FE7F32B747C276E27CBD08B11" />
30373054
<ComponentRef Id="cmpD1207E6C71B252DEA35A0F21BD18C739" />
3055+
<ComponentRef Id="cmpF1C3AE30B7D2067AD8CC88BBEAB4E9D6" />
30383056
<ComponentRef Id="cmpEF310754D1C69EB41F0EA968BF00DBB9" />
30393057
<ComponentRef Id="cmp4DA3B101B35F9FABD0EC784559AC44A2" />
30403058
<ComponentRef Id="cmpFE7DE66BD1CE262C145D66A0E7250779" />
@@ -3161,6 +3179,7 @@
31613179
<ComponentRef Id="cmpCCC5976D4AE7141FB6D3C6650AD0C40E" />
31623180
<ComponentRef Id="cmp1D3D3FE8D3C4513B1536EB8B0AACEBE1" />
31633181
<ComponentRef Id="cmpB0718E71D7A15CCA7375389A12F7D568" />
3182+
<ComponentRef Id="cmpE649532D45F37D54928D095F9FA83399" />
31643183
<ComponentRef Id="cmp96153B9C1921EF93C9484B51120C392D" />
31653184
<ComponentRef Id="cmp430193C6FCC710357C2AD0A4D74B05CB" />
31663185
<ComponentRef Id="cmp42B92586860E12CFF7E8A202F62CA257" />
@@ -3589,6 +3608,7 @@
35893608
<ComponentRef Id="cmp844CE71A108EFCC5B93A410D5205E6DB" />
35903609
<ComponentRef Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" />
35913610
<ComponentRef Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" />
3611+
<ComponentRef Id="cmpF584FEE91889D98A4299209A1B9B1B94" />
35923612
<ComponentRef Id="cmp9E03AAB684EA41B087D79346AE6C1073" />
35933613
<ComponentRef Id="cmpEC794DBE4822765C546A06D80EAA3292" />
35943614
<ComponentRef Id="cmpB48F1BD4D2E8307615F7E22174FF4E6D" />

src/AzurePowershell.sln

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0MinimumVisualStudioVersion = 10.0.40219.1
3+
VisualStudioVersion = 12.0.31101.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
45
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
56
ProjectSection(SolutionItems) = preProject
67
local.runsettings = local.runsettings
@@ -168,6 +169,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "R
168169
EndProject
169170
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp", "ServiceManagement\RemoteApp\Commands.RemoteApp\Commands.RemoteApp.csproj", "{492D2AF2-950B-4F2E-8079-8794305313FD}"
170171
EndProject
172+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp.Test", "ServiceManagement\RemoteApp\Commands.RemoteApp.Test\Commands.RemoteApp.Test.csproj", "{CA82D500-1940-4068-A076-D7A8AD459FB0}"
173+
EndProject
171174
Global
172175
GlobalSection(SolutionConfigurationPlatforms) = preSolution
173176
Debug|Any CPU = Debug|Any CPU
@@ -406,19 +409,24 @@ Global
406409
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
407410
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
408411
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.Build.0 = Release|Any CPU
409-
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
410-
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
411-
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
412-
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.Build.0 = Release|Any CPU
413412
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
414413
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
415414
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
416415
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.Build.0 = Release|Any CPU
416+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
417+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
418+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
419+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.Build.0 = Release|Any CPU
420+
{CA82D500-1940-4068-A076-D7A8AD459FB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
421+
{CA82D500-1940-4068-A076-D7A8AD459FB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
422+
{CA82D500-1940-4068-A076-D7A8AD459FB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
423+
{CA82D500-1940-4068-A076-D7A8AD459FB0}.Release|Any CPU.Build.0 = Release|Any CPU
417424
EndGlobalSection
418425
GlobalSection(SolutionProperties) = preSolution
419426
HideSolutionNode = FALSE
420427
EndGlobalSection
421428
GlobalSection(NestedProjects) = preSolution
429+
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
422430
{37455286-D8A7-4E0C-8B4D-C517D20C641A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
423431
{D6F470A6-7395-4B8B-9D29-44DF0EC8F624} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
424432
{A3965B66-5A3E-4B8C-9574-28E5958D4828} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -429,7 +437,6 @@ Global
429437
{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
430438
{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
431439
{3B48A77B-5956-4A62-9081-92BA04B02B27} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
432-
{B7FD03F6-98BC-4F54-9A14-0455E579FCD4} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
433440
{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
434441
{374D4000-DEDE-4995-9B63-E3B9FE0C4D29} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
435442
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
@@ -448,5 +455,6 @@ Global
448455
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
449456
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
450457
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
458+
{CA82D500-1940-4068-A076-D7A8AD459FB0} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
451459
EndGlobalSection
452460
EndGlobal

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.16-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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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.16-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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.16-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/Mocks/MockCommandRuntime.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,18 @@ public void WriteError(ErrorRecord errorRecord)
102102

103103
public void WriteObject(object sendToPipeline, bool enumerateCollection)
104104
{
105-
OutputPipeline.Add(sendToPipeline);
105+
System.Collections.IEnumerable enumerable = LanguagePrimitives.GetEnumerable(sendToPipeline);
106+
if (enumerable != null && enumerateCollection)
107+
{
108+
foreach (object o in enumerable)
109+
{
110+
OutputPipeline.Add(o);
111+
}
112+
}
113+
else
114+
{
115+
OutputPipeline.Add(sendToPipeline);
116+
}
106117
}
107118

108119
public void WriteObject(object sendToPipeline)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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.16-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" />

0 commit comments

Comments
 (0)