|
61 | 61 | Condition=" '$(Scope)' == 'ServiceManagement'"/>
|
62 | 62 | <CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln"
|
63 | 63 | Condition=" '$(Scope)' == 'AzureStorage' "/>
|
| 64 | + <ExperimentalCmdletSolutionsToBuild Include=".\experiments\Websites.Experiments\Microsoft.Azure.Commands.Websites.Experiments.sln"/> |
64 | 65 | <SetupSln Include=".\setup\azurepowershell.sln" />
|
65 | 66 | <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
|
66 | 67 | <LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
|
|
140 | 141 | <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
|
141 | 142 | <NuGetRestoreConfigSwitch>-ConfigFile "$(NuGetRestoreConfigFile)"</NuGetRestoreConfigSwitch>
|
142 | 143 | <NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
|
| 144 | + <NuGetExperimentalCmdletPackages>-PackagesDirectory ".\experiments\Websites.Experiments\packages" </NuGetExperimentalCmdletPackages> |
143 | 145 | <NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>
|
144 |
| - |
145 | 146 | <PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
|
146 | 147 | </PropertyGroup>
|
147 | 148 |
|
|
171 | 172 | <!-- Restore packages for static analysis-->
|
172 | 173 | <Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
|
173 | 174 | ContinueOnError="false" />
|
| 175 | + <Exec Command="$(NuGetCommand) restore %(ExperimentalCmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetExperimentalCmdletPackages)" |
| 176 | + ContinueOnError="false" /> |
174 | 177 | <!-- Restore packages for local build tasks-->
|
175 | 178 | <Exec Command="$(NuGetCommand) restore %(LocalBuildTasks.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetLocalBuildTaskPackages)"
|
176 | 179 | ContinueOnError="false" />
|
|
196 | 199 | Targets="Build"
|
197 | 200 | Properties="Configuration=$(Configuration);Platform=Any CPU"
|
198 | 201 | BuildInParallel="$(BuildInParallel)"
|
199 |
| - ContinueOnError="false" /> |
| 202 | + ContinueOnError="false" /> |
| 203 | + |
| 204 | + <MSBuild |
| 205 | + Projects="@(ExperimentalCmdletSolutionsToBuild)" |
| 206 | + Targets="Build" |
| 207 | + Properties="Configuration=$(Configuration);Platform=Any CPU" |
| 208 | + BuildInParallel="$(BuildInParallel)" |
| 209 | + ContinueOnError="false" /> |
| 210 | + |
| 211 | + <Exec Command=""$(PowerShellCommand)" -NonInteractive -NoLogo -NoProfile -Command " $(LibraryRoot)\experiments\Compute.Experiments\copy-dev.ps1 -Config $(Configuration) "" |
| 212 | + ContinueOnError="ErrorAndContinue" /> |
200 | 213 |
|
201 | 214 | <Exec Command=""$(PowerShellCommand)" -NonInteractive -NoLogo -NoProfile -Command ". $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) ""
|
202 | 215 | ContinueOnError="false"
|
|
322 | 335 | <Exec Command=""$(PowerShellCommand)" -NonInteractive -NoLogo -NoProfile -Command ". $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) ""/>
|
323 | 336 | <!-- Copying shortcut to be signed -->
|
324 | 337 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
|
325 |
| - DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/> |
| 338 | + DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/> |
326 | 339 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
|
327 | 340 | DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
|
328 | 341 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM.Netcore\AzureRM.Netcore.psd1"
|
|
397 | 410 | DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'false' "/>
|
398 | 411 | <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"
|
399 | 412 | DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'true' "/>
|
| 413 | + |
400 | 414 | </Target>
|
401 | 415 |
|
402 | 416 | <Target Name="CodeSignInstaller">
|
|
460 | 474 | <!-- Run checkin tests for each pull request -->
|
461 | 475 | <Target Name="Test" DependsOnTargets="BeforeRunTests">
|
462 | 476 | <Message Importance="high" Text="Running check in tests..." />
|
| 477 | + <!-- Run unit tests for AppService experimental cmdlets --> |
| 478 | + <Exec Command=""$(PowerShellCommand)" -NonInteractive -NoLogo -NoProfile -Command "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"" |
| 479 | + ContinueOnError="false"/> |
463 | 480 | <CallTarget Targets="InvokeXUnit"/>
|
464 | 481 | </Target>
|
465 | 482 |
|
|
0 commit comments