Skip to content

Commit 4af3d5c

Browse files
committed
Added experimental cmdlets for webapp creation scenarios for webapps.
1 parent b6203d6 commit 4af3d5c

17 files changed

+3464
-4
lines changed

build.proj

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
Condition=" '$(Scope)' == 'ServiceManagement'"/>
6161
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln"
6262
Condition=" '$(Scope)' == 'AzureStorage' "/>
63+
<ExperimentalCmdletSolutionsToBuild Include=".\experiments\Websites.Experiments\Microsoft.Azure.Commands.Websites.Experiments.sln"/>
6364
<SetupSln Include=".\setup\azurepowershell.sln" />
6465
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
6566
</ItemGroup>
@@ -138,7 +139,7 @@
138139
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
139140
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
140141
<NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
141-
142+
<NuGetExperimentalCmdletPackages>-PackagesDirectory ".\experiments\Websites.Experiments\packages" </NuGetExperimentalCmdletPackages>
142143
<PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
143144
</PropertyGroup>
144145

@@ -169,7 +170,10 @@
169170
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
170171
ContinueOnError="false" />
171172

172-
<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
173+
<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
174+
ContinueOnError="false" />
175+
176+
<Exec Command="$(NuGetCommand) restore %(ExperimentalCmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetExperimentalCmdletPackages)"
173177
ContinueOnError="false" />
174178

175179
<!--Restore the xunit runner needed to run unit tests-->
@@ -191,7 +195,14 @@
191195
Targets="Build"
192196
Properties="Configuration=$(Configuration);Platform=Any CPU"
193197
BuildInParallel="$(BuildInParallel)"
194-
ContinueOnError="false" />
198+
ContinueOnError="false" />
199+
200+
<MSBuild
201+
Projects="@(ExperimentalCmdletSolutionsToBuild)"
202+
Targets="Build"
203+
Properties="Configuration=$(Configuration);Platform=Any CPU"
204+
BuildInParallel="$(BuildInParallel)"
205+
ContinueOnError="false" />
195206

196207
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
197208
ContinueOnError="false"
@@ -316,7 +327,7 @@
316327
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) &quot;"/>
317328
<!-- Copying shortcut to be signed -->
318329
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
319-
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
330+
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
320331
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
321332
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
322333
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM.Netcore\AzureRM.Netcore.psd1"
@@ -390,6 +401,7 @@
390401
DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'false' "/>
391402
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"
392403
DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'true' "/>
404+
393405
</Target>
394406

395407
<Target Name="CodeSignInstaller">
@@ -453,6 +465,9 @@
453465
<!-- Run checkin tests for each pull request -->
454466
<Target Name="Test" DependsOnTargets="BeforeRunTests">
455467
<Message Importance="high" Text="Running check in tests..." />
468+
<!-- Run unit tests for AppService experimental cmdlets -->
469+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;Import-Module $(MSBuildProjectDirectory)\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1; Import-Module $(MSBuildProjectDirectory)\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1; Import-Module $(MSBuildProjectDirectory)\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Websites\AzureRM.Websites.psd1; Import-Module $(MSBuildProjectDirectory)\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Websites.Experiments\AzureRM.Websites.Experiments.psd1; $(MSBuildProjectDirectory)\src\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Websites.Experiments\Run-UnitTests.ps1&quot;"
470+
ContinueOnError="false"/>
456471
<CallTarget Targets="InvokeXUnit"/>
457472
</Target>
458473

0 commit comments

Comments
 (0)