Skip to content

Commit 23b6bb7

Browse files
author
Siddharth Chatrola
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Conflicts: src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs
2 parents bf9213f + 876ee46 commit 23b6bb7

File tree

1,039 files changed

+34554
-33373
lines changed

Some content is hidden

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

1,039 files changed

+34554
-33373
lines changed

‎AzurePowershell.Test.targets

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,52 +42,64 @@
4242
<TestTimeout Condition=" '$(TestTimeout)' == '' ">100000000</TestTimeout>
4343
</PropertyGroup>
4444

45-
<ItemGroup>
46-
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
47-
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
48-
<XUnitTests Include=".\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
49-
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
50-
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
51-
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
52-
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
53-
<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
54-
<XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll"/>
55-
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
56-
<XUnitTests Include=".\src\ResourceManager\Dns\Commands.Dns.Test\bin\Debug\Microsoft.Azure.Commands.Dns.Test.dll"/>
57-
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
58-
<XUnitTests Include=".\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll"/>
59-
<XUnitTests Include=".\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
60-
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
61-
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
62-
<XUnitTests Include=".\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
63-
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
64-
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
65-
<XUnitTests Include=".\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
66-
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
67-
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
68-
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
69-
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
70-
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
71-
</ItemGroup>
72-
45+
7346
<Target Name="InvokeMSTest">
7447
<!--Remove existing test result; otherwise mstest will error-->
7548
<Delete Files="$(_testResult)"/>
7649
<Exec
7750
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
7851
ContinueOnError="false" />
7952
</Target>
53+
54+
<Target Name="DeclareXunitTests">
55+
<ItemGroup>
56+
<AsmXUnitTests Include=".\src\ServiceManagement\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
57+
<AsmXUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
58+
<AsmXUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
59+
<AsmXUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
60+
<AsmXUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
61+
<AsmXUnitTests Include=".\src\ServiceManagement\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
62+
<AsmXUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
63+
<AsmXUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
64+
</ItemGroup>
65+
<ItemGroup Condition=" '$(scope)' == '' ">
66+
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
67+
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
68+
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
69+
<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
70+
<XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll"/>
71+
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
72+
<XUnitTests Include=".\src\ResourceManager\Dns\Commands.Dns.Test\bin\Debug\Microsoft.Azure.Commands.Dns.Test.dll"/>
73+
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
74+
<XUnitTests Include=".\src\ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\bin\Debug\Microsoft.Azure.Commands.OperationalInsights.Test.dll"/>
75+
<XUnitTests Include=".\src\ResourceManager\AzureBatch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
76+
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
77+
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
78+
<XUnitTests Include=".\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
79+
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
80+
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
81+
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
82+
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
83+
<XUnitTests Include="@(AsmXUnitTests)"/>
84+
</ItemGroup>
85+
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
86+
<XUnitTests Include="@(AsmXUnitTests)"/>
87+
</ItemGroup>
88+
<ItemGroup Condition=" '$(scope)' !='' and '$(scope)' != 'ServiceManagement' ">
89+
<XUnitTests Include="$(MSBuildProjectDirectory)\src\ResourceManager\$(scope)\*\bin\Debug\*.Test.dll"/>
90+
</ItemGroup>
91+
</Target>
8092

81-
<Target Name="InvokeXUnit">
93+
<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
8294
<Message Importance="high" Text="Running XUnit tests" />
8395
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
8496
<Exec
8597
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -parallel none -maxthreads 0 -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
86-
Timeout="$(TestTimeout)" ContinueOnError="false"/>
98+
Timeout="$(TestTimeout)" ContinueOnError="false" Condition=" @(XUnitTests) != '' "/>
8799
<OnError ExecuteTargets="TimeoutErrorHandler"/>
88100
</Target>
89101

90-
<Target Name="InvokeXUnitAll">
102+
<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
91103
<Message Importance="high" Text="Running XUnit tests" />
92104
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
93105
<Exec
@@ -101,7 +113,6 @@
101113
</Target>
102114

103115
<Target Name="BeforeRunTests">
104-
<Message Importance="high" Text="You are required to have installed a version of Visual Studio with support for MSTest (and MSTest on your path)." />
105116
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
106117
</Target>
107118

‎build.proj

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
1919
/p:CodeSign=True;DelaySign=True
2020
Test the code sign workflow locally.
21-
21+
22+
/p:Scope
23+
'Azure': service management
24+
'AzureStorage': storage data plane cmdlets
25+
'Subfolder under src\ResourceManager': An individual cmdlet module
26+
By default, it builds all
2227
-->
2328

2429
<!-- Define build properties -->
@@ -36,10 +41,13 @@
3641
<SetupOutputDirectory>$(PublishDirectory)\Setup</SetupOutputDirectory>
3742
<TestOutputDirectory>$(PublishDirectory)\TestResults</TestOutputDirectory>
3843
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
44+
<NuGetPublishingSource Condition=" '$(NuGetPublishingSource)' == '' ">http://psget/PSGallery/api/v2/</NuGetPublishingSource>
3945
</PropertyGroup>
4046
<ItemGroup>
41-
<AzureResourceManagerSln Include=".\src\ResourceManager.sln" />
42-
<AzureServiceManagementSln Include=".\src\ServiceManagement.sln" />
47+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln" Condition=" '$(Scope)' == '' "/>
48+
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln" Condition=" '$(Scope)' != '' and '$(Scope)' != 'ServiceManagement' "/>
49+
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
50+
Condition=" '$(Scope)' != '' and ('$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage') "/>
4351
<SetupSln Include=".\setup\azurepowershell.sln" />
4452
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
4553
</ItemGroup>
@@ -63,28 +71,19 @@
6371

6472
<!-- Clean the build in all configurations -->
6573
<Target Name="Clean">
66-
<!-- Clean the solutions -->
6774
<Message Importance="high" Text="Cleaning Cmdlets..." ContinueOnError="false" />
6875
<MSBuild
69-
Projects="@(AzureResourceManagerSln)"
70-
Targets="Clean"
71-
Properties="Configuration=$(Configuration);Platform=Any CPU"
72-
ContinueOnError="false" />
73-
<MSBuild
74-
Projects="@(AzureServiceManagementSln)"
75-
Targets="Clean"
76-
Properties="Configuration=$(Configuration);Platform=Any CPU"
77-
ContinueOnError="false" />
78-
<MSBuild
79-
Projects="@(SetupSln)"
76+
Projects="@(CmdletSolutionsToBuild)"
8077
Targets="Clean"
8178
Properties="Configuration=$(Configuration);Platform=Any CPU"
8279
ContinueOnError="false" />
80+
8381
<MSBuild
8482
Projects="@(SetupPowershellGetSln)"
8583
Targets="Clean"
8684
Properties="Configuration=$(Configuration);Platform=Any CPU"
87-
ContinueOnError="false" />
85+
ContinueOnError="false"
86+
Condition=" '$(Scope)' == '' "/>
8887

8988
<!-- Delete the publish files -->
9089
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
@@ -112,9 +111,10 @@
112111
</Target>
113112

114113
<PropertyGroup>
115-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
114+
<NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
116115
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
117116
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
117+
<PowerShellCommand>C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
118118
</PropertyGroup>
119119

120120
<!--
@@ -138,9 +138,9 @@
138138
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
139139

140140
<!-- Restore packages -->
141-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ResourceManager.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
142-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ServiceManagement.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
143-
141+
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch)"
142+
ContinueOnError="false" />
143+
144144
<!--Restore the xunit runner needed to run unit tests-->
145145
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
146146

@@ -151,15 +151,11 @@
151151
<Target Name="Build" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask">
152152
<Message Importance="high" Text="Building Cmdlets..." />
153153
<MSBuild
154-
Projects="@(AzureResourceManagerSln)"
155-
Targets="Build"
156-
Properties="Configuration=$(Configuration);Platform=Any CPU"
157-
BuildInParallel="$(BuildInParallel)" ContinueOnError="false" />
158-
<MSBuild
159-
Projects="@(AzureServiceManagementSln)"
154+
Projects="@(CmdletSolutionsToBuild)"
160155
Targets="Build"
161156
Properties="Configuration=$(Configuration);Platform=Any CPU"
162-
BuildInParallel="$(BuildInParallel)" ContinueOnError="false" />
157+
BuildInParallel="$(BuildInParallel)"
158+
ContinueOnError="false" />
163159

164160
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
165161

@@ -168,14 +164,18 @@
168164
Projects="@(SetupPowershellGetSln)"
169165
Targets="Build"
170166
Properties="Configuration=$(Configuration);Platform=Any CPU"
171-
ContinueOnError="false" />
167+
ContinueOnError="false"
168+
Condition=" '$(Scope)' == '' "/>
169+
172170
<MSBuild
173171
Projects="@(SetupSln)"
174172
Targets="Build"
175173
Properties="Configuration=$(Configuration);Platform=Any CPU"
176-
ContinueOnError="false" />
174+
ContinueOnError="false"
175+
Condition=" '$(Scope)' == '' "/>
177176

178-
<CallTarget Targets="CodeSignInstaller" Condition=" '$(CodeSign)' == 'true' " />
177+
<CallTarget Targets="CodeSignInstaller"
178+
Condition=" '$(CodeSign)' == 'true' and '$(Scope)' == ''" />
179179
</Target>
180180

181181
<!-- Do everything possible -->
@@ -203,6 +203,10 @@
203203
<!-- Copying shortcut to be signed -->
204204
<Copy SourceFiles="$(LibraryRoot)setup-powershellget\Setup\ShortcutStartup.ps1"
205205
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
206+
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
207+
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
208+
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
209+
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
206210

207211
<ItemGroup>
208212
<DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
@@ -254,6 +258,10 @@
254258
<!-- Copying signed shortcut back -->
255259
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\ShortcutStartup.ps1"
256260
DestinationFolder="$(LibraryRoot)setup-powershellget\Setup" />
261+
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
262+
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
263+
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"
264+
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
257265
</Target>
258266

259267
<Target Name="CodeSignInstaller">
@@ -285,6 +293,13 @@
285293
<!--If we are testing locally then we copy the binaries and do not submit to the code sign server-->
286294
<Copy SourceFiles="@(InstallersToSign)" DestinationFolder="signed" Condition="$(DelaySign)" />
287295
</Target>
296+
297+
<!-- Publish all packages -->
298+
<Target Name="Publish" DependsOnTargets="Build">
299+
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
300+
<Message Importance="high" Text="Publishing Cmdlets..." />
301+
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\PublishModules.ps1 $(Configuration) $(Scope) $(NuGetKey) \&quot;$(NuGetPublishingSource)\&quot; &quot;"/>
302+
</Target>
288303

289304
<PropertyGroup>
290305
<RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
@@ -295,7 +310,7 @@
295310
<Import Project="$(MSBuildThisFileDirectory)AzurePowershell.test.targets"/>
296311

297312
<!-- Run checkin tests for each pull request -->
298-
<Target Name="Test" DependsOnTargets="Build;BeforeRunTests">
313+
<Target Name="Test" DependsOnTargets="BeforeRunTests">
299314
<Message Importance="high" Text="Running check in tests..." />
300315
<CallTarget Targets="InvokeXUnit"/>
301316
</Target>

‎setup-powershellget/Setup/ShortcutStartup.ps1

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,35 @@ Finalizing installation of Azure PowerShell.
2626
Installing Azure Modules from PowerShell Gallery.
2727
This may take some time...
2828
"@
29-
Get-PackageProvider -Name NuGet -ForceBootstrap
30-
Install-Module AzureRM.Installer
31-
Install-AzureRM
29+
$env:PSModulePath = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\"
30+
31+
Import-Module PackageManagement
32+
33+
$result = Get-PackageProvider -Name NuGet -ForceBootstrap
34+
35+
Import-Module PowerShellGet
36+
37+
Install-Module AzureRM
38+
Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
39+
Update-AzureRM
3240
} else {
3341
cd c:\
3442
$welcomeMessage = @"
3543
For a list of all Azure cmdlets type 'help azure'.
3644
For a list of Azure Pack cmdlets type 'Get-Command *wapack*'.
45+
46+
To use Azure Service Management cmdlets please execute the following cmdlet:
47+
Install-Module Azure
3748
"@
3849
Write-Output $welcomeMessage
3950

4051
$VerbosePreference = "Continue"
4152
}
4253
}
43-
catch { Write-Output $error }
44-
if ($error) {
45-
Read-Host -Prompt "An error occured during installation. Press any key..."
54+
catch
55+
{
56+
Write-Output "An error occured during installation."
57+
Write-Output $error
58+
Write-Output "Press any key..."
59+
$host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
4660
}

0 commit comments

Comments
 (0)