|
1 | 1 | <?xml version="1.0" encoding="utf-8"?>
|
2 | 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
3 | 3 |
|
4 |
| - |
5 | 4 | <!--
|
6 | 5 | Available Targets:
|
7 | 6 |
|
|
68 | 67 | </PropertyGroup>
|
69 | 68 |
|
70 | 69 | <PropertyGroup Condition="$(NetCore) == 'true' ">
|
71 |
| - <Scope>NetCore</Scope> |
| 70 | + <Scope>Netcore</Scope> |
72 | 71 | </PropertyGroup>
|
73 | 72 |
|
74 | 73 | <!-- Set Skips -->
|
|
85 | 84 | <SkipDependencyAnalysis>true</SkipDependencyAnalysis>
|
86 | 85 | </PropertyGroup>
|
87 | 86 |
|
88 |
| - |
89 | 87 | <ItemGroup>
|
90 | 88 | <LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
|
91 | 89 | <StackSolution Include="$(LibrarySourceFolder)\StackAdmin\Stack.sln" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
|
|
112 | 110 | <![CDATA[System.Environment.SetEnvironmentVariable(EnvName, EnvValue);]]>
|
113 | 111 | </Code>
|
114 | 112 | </Task>
|
115 |
| - </UsingTask> <!-- |
116 |
| - CI build related |
117 |
| - --> |
| 113 | + </UsingTask> |
| 114 | + |
| 115 | + <!-- CI build related --> |
118 | 116 | <PropertyGroup>
|
119 | 117 | <!--OnPremiseBuildTasks is not a good name, but CI server is using that, will update across soon-->
|
120 | 118 | <CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
|
|
298 | 296 | Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
|
299 | 297 | </Target>
|
300 | 298 |
|
301 |
| - |
302 |
| - |
303 | 299 | <!--
|
304 | 300 | Build .Net Core Cmdlets
|
305 | 301 | Fully self contained
|
306 | 302 | -->
|
307 | 303 | <Target Name="BuildNetCore">
|
308 | 304 | <Message Importance="high" Text="Building Cmdlets..." />
|
| 305 | + <PropertyGroup> |
| 306 | + <Scope>Netcore</Scope> |
| 307 | + </PropertyGroup> |
309 | 308 |
|
310 | 309 | <Exec Command="$(PowerShellCoreCommandPrefix) "$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\CreateAliasMapping.ps1 ""/>
|
311 | 310 |
|
|
356 | 355 | <Delete Files="@(ExtraPsdFiles->'%(FullPath)')"/>
|
357 | 356 |
|
358 | 357 | <!-- Update module manifests. -->
|
359 |
| - <Exec Command="$(PowerShellCoreCommandPrefix) ". $(LibraryToolsFolder)\UpdateModules.ps1 -BuildConfig $(Configuration) -Scope Netcore " " |
| 358 | + <Exec Command="$(PowerShellCoreCommandPrefix) ". $(LibraryToolsFolder)\UpdateModules.ps1 -BuildConfig $(Configuration) -Scope $(Scope) " " |
360 | 359 | Condition="'$(CodeSign)' == 'false'"
|
361 | 360 | ContinueOnError="false" />
|
362 | 361 | <!-- Generate the Help -->
|
|
370 | 369 | <Exec Command="$(PowerShellCoreCommandPrefix) ". $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) "" />
|
371 | 370 | </Target>
|
372 | 371 |
|
373 |
| - |
374 | 372 | <!-- Do everything possible except Publish -->
|
375 | 373 | <Target Name="Full" DependsOnTargets="Clean;Build;Test" />
|
376 | 374 |
|
377 |
| - |
378 | 375 | <Target Name="BuildMsBuildTask" DependsOnTargets="RestoreNugetPackages">
|
379 | 376 | <Message Importance="high" Text="Building RepoTasks" />
|
380 | 377 | <MSBuild Projects="@(LocalBuildTasks)"
|
|
440 | 437 |
|
441 | 438 | <!-- Copying shortcut to be signed -->
|
442 | 439 | <Copy SourceFiles="$(LibraryRoot)tools\Az\Az.psm1"
|
443 |
| - DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Netcore'" /> |
| 440 | + DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'Netcore'" /> |
444 | 441 | <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
|
445 | 442 | DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
|
446 | 443 | <Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
|
|
485 | 482 |
|
486 | 483 | <!-- Copy files back after signing -->
|
487 | 484 | <Copy SourceFiles="$(PackageDirectory)\$(Configuration)\Az.psm1"
|
488 |
| - DestinationFolder="$(LibraryRoot)tools\Az" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Netcore'" /> |
| 485 | + DestinationFolder="$(LibraryRoot)tools\Az" Condition="'$(Scope)' == 'Netcore'" /> |
489 | 486 | <Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psm1"
|
490 | 487 | DestinationFolder="$(LibraryRoot)tools\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
|
491 | 488 | <Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psm1"
|
|
494 | 491 | DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
|
495 | 492 | </Target>
|
496 | 493 |
|
497 |
| - |
498 |
| - |
499 | 494 | <Target Name="BuildInstaller" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'">
|
500 | 495 | <Exec Command="$(PowerShellCommandPrefix) ". Register-PSRepository -Name MSIcreationrepository -SourceLocation $(PackageDirectory) -InstallationPolicy Trusted " "/>
|
501 | 496 | <Exec Command="$(PowerShellCommandPrefix) ". $(LibraryRoot)\setup\generate.ps1 -repository MSIcreationrepository " "/>
|
502 | 497 | <Exec Command="$(PowerShellCommandPrefix) ". Unregister-PSRepository -Name MSIcreationrepository " "/>
|
503 | 498 | <CallTarget Targets="CodeSignInstaller" Condition=" '$(CodeSign)' == 'true'" />
|
504 | 499 | </Target>
|
505 | 500 |
|
506 |
| - |
507 |
| - |
508 | 501 | <Target Name="CodeSignInstaller">
|
509 | 502 | <PropertyGroup>
|
510 | 503 | <!--public token associated with MSSharedLibKey.snk-->
|
|
536 | 529 | <SetEnvVar EnvName="SignedMsiDir" EnvValue="$(SignedOutputRootDir)" />
|
537 | 530 | </Target>
|
538 | 531 |
|
539 |
| - |
540 |
| - |
541 | 532 | <!-- Run Validation -->
|
542 | 533 | <Target Name="DependencyAnalysis"
|
543 | 534 | Condition="'$(SkipDependencyAnalysis)' == 'false'">
|
|
562 | 553 | <OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
|
563 | 554 | </Target>
|
564 | 555 |
|
565 |
| - |
566 |
| - <Target Name="StaticAnalysisErrorMessage"> |
| 556 | + <Target Name="StaticAnalysisErrorMessage"> |
567 | 557 | <Error Text="StaticAnalysis has failed. Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md"/>
|
568 | 558 | </Target>
|
569 | 559 |
|
|
593 | 583 | ContinueOnError="false"/>
|
594 | 584 |
|
595 | 585 | <CallTarget Targets="BuildInstaller" Condition="'$(Scope)' =='All'" />
|
596 |
| - </Target> |
| 586 | + </Target> |
597 | 587 |
|
598 | 588 | <PropertyGroup>
|
599 | 589 | <RunTestLive Condition="'$(RunTestLive)' == ''">false</RunTestLive>
|
|
653 | 643 | DependsOnTargets="Clean;Build;Test;RunOneSDKCIT" />
|
654 | 644 |
|
655 | 645 | <!-- Run live tests and record mocks -->
|
656 |
| - <Target |
657 |
| - Name="RunLiveTests" |
658 |
| - DependsOnTargets="Clean;Build;LiveTestsFilter" /> |
659 |
| - |
| 646 | + <Target Name="RunLiveTests" DependsOnTargets="Clean;Build;LiveTestsFilter" /> |
660 | 647 |
|
661 | 648 | <Target Name="LiveTestsFilter" DependsOnTargets="Build;BeforeRunTests">
|
662 | 649 | <Message Importance="high" Text="Running live tests..." />
|
|
0 commit comments