|
236 | 236 | <!-- Everything except Publish -->
|
237 | 237 | <Target Name="Full" DependsOnTargets="Clean;Build;OnPremChecks;CopyAboutTopics;GenerateHelp;StaticAnalysis;Test" />
|
238 | 238 |
|
239 |
| - <Target Name="StaticAnalysisBreakingChange" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build"> |
| 239 | + <Target Name="StaticAnalysisBreakingChange" Condition="'$(RunStaticAnalysis)' == 'true'"> |
240 | 240 | <Message Importance="high" Text="Running static analysis for breaking change..." />
|
241 | 241 | <MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
|
242 | 242 |
|
243 |
| - <Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers breaking-change -u -m '%(FilterTaskResult.breaking-change)'" /> |
| 243 | + <Exec Command="$(PowerShellCoreCommandPrefix) ".\tools\ExecuteCIStep.ps1 -StaticAnalysisBreakingChange -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)"" /> |
244 | 244 | </Target>
|
245 | 245 |
|
246 |
| - <Target Name="StaticAnalysisDependency" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build"> |
| 246 | + <Target Name="StaticAnalysisDependency" Condition="'$(RunStaticAnalysis)' == 'true'"> |
247 | 247 | <Message Importance="high" Text="Running static analysis for dependency..." />
|
248 | 248 | <MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
|
249 | 249 |
|
250 |
| - <Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers dependency -u -m '%(FilterTaskResult.breaking-change)'" /> |
| 250 | + <Exec Command="$(PowerShellCoreCommandPrefix) ".\tools\ExecuteCIStep.ps1 -StaticAnalysisDependency -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)"" /> |
251 | 251 | </Target>
|
252 | 252 |
|
253 |
| - <Target Name="StaticAnalysisSignature" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build"> |
| 253 | + <Target Name="StaticAnalysisSignature" Condition="'$(RunStaticAnalysis)' == 'true'"> |
254 | 254 | <Message Importance="high" Text="Running static analysis for signature..." />
|
255 | 255 | <MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
|
256 |
| - |
257 |
| - <Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers signature -u -m '%(FilterTaskResult.signature)'" /> |
| 256 | + <Exec Command="$(PowerShellCoreCommandPrefix) ".\tools\ExecuteCIStep.ps1 -StaticAnalysisSignature -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)"" /> |
258 | 257 | </Target>
|
259 | 258 |
|
260 |
| - <Target Name="StaticAnalysisHelp" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build"> |
| 259 | + <Target Name="StaticAnalysisHelp" Condition="'$(RunStaticAnalysis)' == 'true'"> |
261 | 260 | <Message Importance="high" Text="Running static analysis for help..." />
|
262 | 261 | <MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
|
263 | 262 |
|
264 |
| - <Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers help -u -m '%(FilterTaskResult.help)'" /> |
| 263 | + <Exec Command="$(PowerShellCoreCommandPrefix) ".\tools\ExecuteCIStep.ps1 -StaticAnalysisHelp -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -StaticAnalysisOutputDirectory $(StaticAnalysisOutputDirectory)"" /> |
265 | 264 | </Target>
|
266 | 265 |
|
267 |
| - <Target Name="StaticAnalysisExample" Condition="'$(RunStaticAnalysis)' == 'true'" DependsOnTargets="Build" AfterTargets="StaticAnalysisHelp"> |
| 266 | + <Target Name="StaticAnalysisExample" Condition="'$(RunStaticAnalysis)' == 'true'" AfterTargets="StaticAnalysisHelp"> |
268 | 267 | <Message Importance="high" Text="Running static analysis for PowerShell examples..." />
|
269 | 268 | <Exec Command="$(PowerShellCoreCommandPrefix) ". $(RepoTools)/StaticAnalysis/ExampleAnalyzer/Measure-MarkdownOrScript.ps1 -MarkdownPaths $(RepoArtifacts)/FilesChanged.txt -RulePaths $(RepoTools)/StaticAnalysis/ExampleAnalyzer/AnalyzeRules/*.psm1 ""/>
|
270 | 269 | </Target>
|
|
318 | 317 | <Exec Command="$(PowerShellCoreCommandPrefix) ". $(DockerTools)/CleanArtifacts.ps1 -Docker $(DockerRoot) "" />
|
319 | 318 | </Target>
|
320 | 319 |
|
321 |
| - <Target Name="Test" DependsOnTargets="FilterBuild" Condition="'$(IsGenerateBased)' == 'false'"> |
| 320 | + <Target Name="Test" Condition="'$(IsGenerateBased)' == 'false'"> |
322 | 321 | <Message Importance="high" Text="Running check in tests..." />
|
323 | 322 | <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
|
324 | 323 | <!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
|
325 | 324 | <!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
|
326 |
| - <Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter "AcceptanceType=CheckIn%26RunType!=DesktopOnly" --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory "$(TestOutputDirectory)"" Condition="'$(TestCsprojList)' != ''" /> |
| 325 | + <Exec Command="$(PowerShellCoreCommandPrefix) ".\tools\ExecuteCIStep.ps1 -Test -RepoArtifacts $(RepoArtifacts) -Configuration $(Configuration) -TestFramework $(TestFramework) -TestOutputDirectory $(TestOutputDirectory)"" /> |
327 | 326 | <Message Importance="high" Text="Finish running tests..." />
|
328 | 327 | <OnError ExecuteTargets="TestFailureErrorMessage" />
|
329 | 328 | </Target>
|
|
0 commit comments