Skip to content

Commit

Permalink
Added experimental cmdlets for webapp creation scenarios for webapps.
Browse files Browse the repository at this point in the history
  • Loading branch information
NelsonDaniel committed Aug 18, 2017
1 parent b6203d6 commit 4af3d5c
Show file tree
Hide file tree
Showing 17 changed files with 3,464 additions and 4 deletions.
23 changes: 19 additions & 4 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
Condition=" '$(Scope)' == 'ServiceManagement'"/>
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln"
Condition=" '$(Scope)' == 'AzureStorage' "/>
<ExperimentalCmdletSolutionsToBuild Include=".\experiments\Websites.Experiments\Microsoft.Azure.Commands.Websites.Experiments.sln"/>
<SetupSln Include=".\setup\azurepowershell.sln" />
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
</ItemGroup>
Expand Down Expand Up @@ -138,7 +139,7 @@
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
<NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>

<NuGetExperimentalCmdletPackages>-PackagesDirectory ".\experiments\Websites.Experiments\packages" </NuGetExperimentalCmdletPackages>
<PowerShellCommand Condition=" '$(PowerShellCommand)' == '' ">C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellCommand>
</PropertyGroup>

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

<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
<Exec Command="$(NuGetCommand) restore %(SetupSln.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
ContinueOnError="false" />

<Exec Command="$(NuGetCommand) restore %(ExperimentalCmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetExperimentalCmdletPackages)"
ContinueOnError="false" />

<!--Restore the xunit runner needed to run unit tests-->
Expand All @@ -191,7 +195,14 @@
Targets="Build"
Properties="Configuration=$(Configuration);Platform=Any CPU"
BuildInParallel="$(BuildInParallel)"
ContinueOnError="false" />
ContinueOnError="false" />

<MSBuild
Projects="@(ExperimentalCmdletSolutionsToBuild)"
Targets="Build"
Properties="Configuration=$(Configuration);Platform=Any CPU"
BuildInParallel="$(BuildInParallel)"
ContinueOnError="false" />

<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
ContinueOnError="false"
Expand Down Expand Up @@ -316,7 +327,7 @@
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) &quot;"/>
<!-- Copying shortcut to be signed -->
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition= " '$(NetCore)' == 'false' "/>
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM.Netcore\AzureRM.Netcore.psd1"
Expand Down Expand Up @@ -390,6 +401,7 @@
DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'false' "/>
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.Netcore.psd1"
DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition= " '$(NetCore)' == 'true' "/>

</Target>

<Target Name="CodeSignInstaller">
Expand Down Expand Up @@ -453,6 +465,9 @@
<!-- Run checkin tests for each pull request -->
<Target Name="Test" DependsOnTargets="BeforeRunTests">
<Message Importance="high" Text="Running check in tests..." />
<!-- Run unit tests for AppService experimental cmdlets -->
<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;"
ContinueOnError="false"/>
<CallTarget Targets="InvokeXUnit"/>
</Target>

Expand Down
Loading

0 comments on commit 4af3d5c

Please sign in to comment.