@@ -259,7 +259,8 @@ jobs:
259
259
- template : templates/e2e-setup.yml
260
260
parameters :
261
261
sourceDir : $(Build.SourcesDirectory)
262
- localhostWebServerArgs : ' -BuildRoot $(artifactsDir)\E2ETests\LocalhostWebServer -StaticFileRoot $(Agent.TempDirectory)\TestLocalIndex -LocalSourceJson $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData\localsource.json -TestDataPath $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData -SourceCert $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData\AppInstallerTest.cer -ExitBeforeRun'
262
+ localhostWebServerArgs : ' -BuildRoot $(artifactsDir)\E2ETests\LocalhostWebServer -StaticFileRoot $(Agent.TempDirectory)\TestLocalIndex -LocalSourceJson $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData\localsource.json -TestDataPath $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData -ExitBeforeRun'
263
+ signingCertOutDir : $(artifactsDir)\E2ETests
263
264
264
265
- task : CopyFiles@2
265
266
displayName : ' Copy TestLocalIndex'
@@ -302,28 +303,6 @@ jobs:
302
303
verbosity : ' Verbose'
303
304
alertWarningLevel : ' High'
304
305
305
- # Run BimSkim for all the binaries
306
- - task : BinSkim@4
307
- displayName : ' Run BinSkim '
308
- inputs :
309
- arguments : ' analyze
310
- "$(buildOutDir)\AppInstallerCLI\winget.exe"
311
- "$(buildOutDir)\WinGetUtil\WinGetUtil.dll"
312
- "$(buildOutDir)\WindowsPackageManager\WindowsPackageManager.dll"
313
- "$(buildOutDir)\Microsoft.Management.Deployment.InProc\Microsoft.Management.Deployment.InProc.dll"
314
- "$(Build.SourcesDirectory)\src\WinGetUtilInterop\bin\WinGetUtil*Interop.dll"
315
- "$(buildOutDir)\UndockedRegFreeWinRT\winrtact.dll"
316
- "$(buildOutDir)\Microsoft.WinGet.Client.Cmdlets\Microsoft.WinGet.Client*.dll"
317
- "$(buildOutDir)\ConfigurationRemotingServer\ConfigurationRemoting*Server.dll"
318
- "$(buildOutDir)\ConfigurationRemotingServer\ConfigurationRemoting*Server.exe"
319
- "$(buildOutDir)\ConfigurationRemotingServer\Microsoft.Management.Configuration*.dll"
320
- "$(buildOutDir)\Microsoft.Management.Configuration\Microsoft.Management.Configuration*.dll"
321
- "$(buildOutDir)\Microsoft.Management.Configuration.OutOfProc\Microsoft.Management.Configuration*.dll"
322
- --config default --recurse'
323
-
324
- - task : securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
325
- displayName : ' Publish Security Analysis Logs'
326
-
327
306
# Test job runs tests using build artifacts
328
307
329
308
- job : ' Test'
@@ -431,7 +410,7 @@ jobs:
431
410
- template : templates/e2e-setup.yml
432
411
parameters :
433
412
sourceDir : $(Build.SourcesDirectory)
434
- localhostWebServerArgs : ' -BuildRoot $(buildOutDir)\E2ETests\LocalhostWebServer -StaticFileRoot $(buildOutDir)\E2ETests\TestLocalIndex -SourceCert $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData\AppInstallerTest .cer'
413
+ localhostWebServerArgs : ' -BuildRoot $(buildOutDir)\E2ETests\LocalhostWebServer -StaticFileRoot $(buildOutDir)\E2ETests\TestLocalIndex -SourceCert $(buildOutDir)\E2ETests\TestSigningCert .cer'
435
414
436
415
- template : templates/e2e-test.template.yml
437
416
parameters :
@@ -511,6 +490,10 @@ jobs:
511
490
arguments : ' -TargetLocation $(artifactsDir)\ConfigOOPTestsLog'
512
491
condition : succeededOrFailed()
513
492
493
+ - powershell : Get-Process LocalhostWebServer | Stop-Process
494
+ displayName : Stop LocalhostWebServer
495
+ condition : succeededOrFailed()
496
+
514
497
- task : PublishPipelineArtifact@1
515
498
displayName : Publish Pipeline Artifacts
516
499
inputs :
@@ -524,6 +507,8 @@ jobs:
524
507
timeoutInMinutes : 120
525
508
dependsOn : ' Build'
526
509
condition : succeeded('Build')
510
+ variables :
511
+ buildOutDir : $(Pipeline.Workspace)\Build.x64Release
527
512
528
513
steps :
529
514
- task : DownloadPipelineArtifact@2
@@ -532,7 +517,7 @@ jobs:
532
517
- task : CopyFiles@2
533
518
displayName : ' Copy x64 PowerShell Binaries to Output'
534
519
inputs :
535
- SourceFolder : ' $(Pipeline.Workspace)\Build.x64release \PowerShell'
520
+ SourceFolder : ' $(buildOutDir) \PowerShell'
536
521
Contents : ' **\*'
537
522
TargetFolder : ' $(Build.ArtifactStagingDirectory)'
538
523
@@ -566,14 +551,14 @@ jobs:
566
551
targetType : ' inline'
567
552
script : |
568
553
Get-ChildItem AppxPackages\AppInstallerCLIPackage_0.0.2.0_Test\Dependencies\x64 -Filter *.appx | %{ Add-AppxPackage $_.FullName }
569
- workingDirectory : $(Pipeline.Workspace)\Build.x64release\
554
+ workingDirectory : $(buildOutDir)
570
555
571
556
- template : templates/e2e-setup.yml
572
557
parameters :
573
558
sourceDir : $(Build.SourcesDirectory)
574
- localhostWebServerArgs : ' -BuildRoot $(Pipeline.Workspace)\Build.x64release\ E2ETests\LocalhostWebServer -StaticFileRoot $(Pipeline.Workspace)\Build.x64release\ E2ETests\TestLocalIndex -SourceCert $(Build.SourcesDirectory)\src\AppInstallerCLIE2ETests\TestData\AppInstallerTest .cer'
559
+ localhostWebServerArgs : ' -BuildRoot $(buildOutDir)\ E2ETests\LocalhostWebServer -StaticFileRoot $(buildOutDir)\ E2ETests\TestLocalIndex -SourceCert $(buildOutDir)\E2ETests\TestSigningCert .cer'
575
560
576
- - pwsh : .\RunTests.ps1 -testModulesPath $(Build.ArtifactStagingDirectory) -outputPath $(Pipeline.Workspace)\PesterTest -packageLayoutPath $(Pipeline.Workspace)\Build.x64release \DevPackage
561
+ - pwsh : .\RunTests.ps1 -testModulesPath $(Build.ArtifactStagingDirectory) -outputPath $(Pipeline.Workspace)\PesterTest -packageLayoutPath $(buildOutDir) \DevPackage
577
562
workingDirectory : $(Build.SourcesDirectory)\src\PowerShell\tests\
578
563
displayName : Run PowerShell 7 Tests
579
564
@@ -582,6 +567,10 @@ jobs:
582
567
displayName : Run Windows PowerShell Tests
583
568
condition : succeededOrFailed()
584
569
570
+ - powershell : Get-Process LocalhostWebServer | Stop-Process
571
+ displayName : Stop LocalhostWebServer
572
+ condition : succeededOrFailed()
573
+
585
574
- task : PublishTestResults@2
586
575
displayName : Publish Pester Test Results PowerShell 7
587
576
inputs :
0 commit comments