|
60 | 60 | Condition=" '$(Scope)' == 'ServiceManagement'"/>
|
61 | 61 | <CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln"
|
62 | 62 | Condition=" '$(Scope)' == 'AzureStorage' "/>
|
| 63 | + <ExperimentalCmdletSolutionsToBuild Include=".\experiments\Websites.Experiments\Microsoft.Azure.Commands.Websites.Experiments.sln"/> |
63 | 64 | <SetupSln Include=".\setup\azurepowershell.sln" />
|
64 | 65 | <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
|
65 | 66 | </ItemGroup>
|
|
138 | 139 | <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
|
139 | 140 | <NuGetRestoreConfigSwitch>-ConfigFile "$(NuGetRestoreConfigFile)"</NuGetRestoreConfigSwitch>
|
140 | 141 | <NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
|
141 |
| - |
| 142 | + <NuGetExperimentalCmdletPackages>-PackagesDirectory ".\experiments\Websites.Experiments\packages" </NuGetExperimentalCmdletPackages> |
142 | 143 | <PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
|
143 | 144 | </PropertyGroup>
|
144 | 145 |
|
|
169 | 170 | <Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
|
170 | 171 | ContinueOnError="false" />
|
171 | 172 |
|
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)" |
173 | 177 | ContinueOnError="false" />
|
174 | 178 |
|
175 | 179 | <!--Restore the xunit runner needed to run unit tests-->
|
|
191 | 195 | Targets="Build"
|
192 | 196 | Properties="Configuration=$(Configuration);Platform=Any CPU"
|
193 | 197 | 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" /> |
195 | 206 |
|
196 | 207 | <Exec Command=""$(PowerShellCommand)" -NonInteractive -NoLogo -NoProfile -Command ". $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) ""
|
197 | 208 | ContinueOnError="false"
|
|
316 | 327 | <Exec Command=""$(PowerShellCommand)" -NonInteractive -NoLogo -NoProfile -Command ". $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) ""/>
|
317 | 328 | <!-- Copying shortcut to be signed -->
|
318 | 329 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
|
319 |
| - DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/> |
| 330 | + DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/> |
320 | 331 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
|
321 | 332 | DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
|
322 | 333 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM.Netcore\AzureRM.Netcore.psd1"
|
|
390 | 401 | DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'false' "/>
|
391 | 402 | <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"
|
392 | 403 | DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'true' "/>
|
| 404 | + |
393 | 405 | </Target>
|
394 | 406 |
|
395 | 407 | <Target Name="CodeSignInstaller">
|
|
453 | 465 | <!-- Run checkin tests for each pull request -->
|
454 | 466 | <Target Name="Test" DependsOnTargets="BeforeRunTests">
|
455 | 467 | <Message Importance="high" Text="Running check in tests..." />
|
| 468 | + <!-- Run unit tests for AppService experimental cmdlets --> |
| 469 | + <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"" |
| 470 | + ContinueOnError="false"/> |
456 | 471 | <CallTarget Targets="InvokeXUnit"/>
|
457 | 472 | </Target>
|
458 | 473 |
|
|
0 commit comments