From e7a7c545f52407128d954cde2ae9b45573001416 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 16:19:33 +0000
Subject: [PATCH 01/35] try using multi-job yaml with different images

---
 .azure-pipelines-ci/ci-unix.yaml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 7e6b679a5..5955adea4 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -2,11 +2,26 @@ variables:
   pwsh: true
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-steps:
-- pwsh: |
-    Import-Module .\tools\appveyor.psm1
-    Invoke-AppveyorInstall
-    ./build.ps1 -Configuration 'Release' -PSVersion 6
-    ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-  displayName: 'Build'
-- template: templates/test.yaml
+jobs:
+  - job: Ubuntu1604
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+    - pwsh: |
+        Import-Module .\tools\appveyor.psm1
+        Invoke-AppveyorInstall
+        ./build.ps1 -Configuration 'Release' -PSVersion 6
+        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+      displayName: 'Build'
+    - template: templates/test.yaml
+  - job: Ubuntu1804
+      pool:
+        vmImage: ubuntu-18.04
+      steps:
+      - pwsh: |
+          Import-Module .\tools\appveyor.psm1
+          Invoke-AppveyorInstall
+          ./build.ps1 -Configuration 'Release' -PSVersion 6
+          ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+        displayName: 'Build'
+      - template: templates/test.yaml
\ No newline at end of file

From 2e4c40300dd535c36b31391c744ef9e32879f8e6 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 16:22:54 +0000
Subject: [PATCH 02/35] fix indentation

---
 .azure-pipelines-ci/ci-unix.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 5955adea4..cb9351561 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -15,13 +15,13 @@ jobs:
       displayName: 'Build'
     - template: templates/test.yaml
   - job: Ubuntu1804
-      pool:
-        vmImage: ubuntu-18.04
-      steps:
-      - pwsh: |
-          Import-Module .\tools\appveyor.psm1
-          Invoke-AppveyorInstall
-          ./build.ps1 -Configuration 'Release' -PSVersion 6
-          ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-        displayName: 'Build'
-      - template: templates/test.yaml
\ No newline at end of file
+    pool:
+      vmImage: ubuntu-18.04
+    steps:
+    - pwsh: |
+        Import-Module .\tools\appveyor.psm1
+        Invoke-AppveyorInstall
+        ./build.ps1 -Configuration 'Release' -PSVersion 6
+        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+      displayName: 'Build'
+    - template: templates/test.yaml
\ No newline at end of file

From e669e48247d41e00f661f291ff52a193f1647c8f Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 16:35:08 +0000
Subject: [PATCH 03/35] add vm images to windows build and templatify unix
 build. Images now are latest ubuntu image

---
 .azure-pipelines-ci/ci-unix.yaml        | 24 ++++++------------------
 .azure-pipelines-ci/ci-windows-ps5.yaml |  2 ++
 .azure-pipelines-ci/ci-windows.yaml     |  2 ++
 .azure-pipelines-ci/templates/unix.yaml |  8 ++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 .azure-pipelines-ci/templates/unix.yaml

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index cb9351561..951b3e9f7 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -3,25 +3,13 @@ variables:
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 jobs:
-  - job: Ubuntu1604
+  - job: Ubuntu
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-latest
     steps:
-    - pwsh: |
-        Import-Module .\tools\appveyor.psm1
-        Invoke-AppveyorInstall
-        ./build.ps1 -Configuration 'Release' -PSVersion 6
-        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-      displayName: 'Build'
-    - template: templates/test.yaml
-  - job: Ubuntu1804
+    - template: templates/unix.yaml
+  - job: macOS
     pool:
-      vmImage: ubuntu-18.04
+      vmImage: macos-latest
     steps:
-    - pwsh: |
-        Import-Module .\tools\appveyor.psm1
-        Invoke-AppveyorInstall
-        ./build.ps1 -Configuration 'Release' -PSVersion 6
-        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-      displayName: 'Build'
-    - template: templates/test.yaml
\ No newline at end of file
+    - template: templates/unix.yaml
\ No newline at end of file
diff --git a/.azure-pipelines-ci/ci-windows-ps5.yaml b/.azure-pipelines-ci/ci-windows-ps5.yaml
index 20648130b..876d55974 100644
--- a/.azure-pipelines-ci/ci-windows-ps5.yaml
+++ b/.azure-pipelines-ci/ci-windows-ps5.yaml
@@ -1,3 +1,5 @@
+pool:
+  vmImage: windows-latest
 variables:
   pwsh: false
     # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
diff --git a/.azure-pipelines-ci/ci-windows.yaml b/.azure-pipelines-ci/ci-windows.yaml
index f394f86c2..88316c3c3 100644
--- a/.azure-pipelines-ci/ci-windows.yaml
+++ b/.azure-pipelines-ci/ci-windows.yaml
@@ -1,3 +1,5 @@
+pool:
+  vmImage: windows-latest
 variables:
   pwsh: true
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
diff --git a/.azure-pipelines-ci/templates/unix.yaml b/.azure-pipelines-ci/templates/unix.yaml
new file mode 100644
index 000000000..7b85abe32
--- /dev/null
+++ b/.azure-pipelines-ci/templates/unix.yaml
@@ -0,0 +1,8 @@
+steps:
+- pwsh: |
+    Import-Module .\tools\appveyor.psm1
+    Invoke-AppveyorInstall
+    ./build.ps1 -Configuration 'Release' -PSVersion 6
+    ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+  displayName: 'Build'
+- template: templates/test.yaml
\ No newline at end of file

From ca51510622a370af3f257f3c55083271902680b9 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 18:24:38 +0000
Subject: [PATCH 04/35] trigger


From ac4894c8e09222728b892e9d459381bd112467d5 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 18:27:46 +0000
Subject: [PATCH 05/35] fix yaml path

---
 .azure-pipelines-ci/templates/unix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines-ci/templates/unix.yaml b/.azure-pipelines-ci/templates/unix.yaml
index 7b85abe32..6d4ba43b9 100644
--- a/.azure-pipelines-ci/templates/unix.yaml
+++ b/.azure-pipelines-ci/templates/unix.yaml
@@ -5,4 +5,4 @@ steps:
     ./build.ps1 -Configuration 'Release' -PSVersion 6
     ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
   displayName: 'Build'
-- template: templates/test.yaml
\ No newline at end of file
+- template: test.yaml
\ No newline at end of file

From d2188be62f2db6a55b9c366fe4cd113671e6d4fd Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 18:54:01 +0000
Subject: [PATCH 06/35] disable sporadic tests generally and add both Ubuntu
 images to the tests

---
 .azure-pipelines-ci/ci-unix.yaml            |  9 ++++-
 Tests/Rules/UseCompatibleCommands.Tests.ps1 | 45 ++++++++++++---------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 951b3e9f7..7341eed9a 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -3,9 +3,14 @@ variables:
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 jobs:
-  - job: Ubuntu
+  - job: Ubuntu 16.04
     pool:
-      vmImage: ubuntu-latest
+      vmImage: ubuntu-16.04
+    steps:
+    - template: templates/unix.yaml
+  - job: Ubuntu 18.04
+    pool:
+      vmImage: ubuntu-18.04
     steps:
     - template: templates/unix.yaml
   - job: macOS
diff --git a/Tests/Rules/UseCompatibleCommands.Tests.ps1 b/Tests/Rules/UseCompatibleCommands.Tests.ps1
index 6e937670c..fa6628792 100644
--- a/Tests/Rules/UseCompatibleCommands.Tests.ps1
+++ b/Tests/Rules/UseCompatibleCommands.Tests.ps1
@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
+$script:RunningInCIOnUbuntu = $IsLinux -and ($env:TF_BUILD -or $env:APPVEYOR) # some test cases randomly start and stop to fail in Ubuntu CI tests
 $script:RuleName = 'PSUseCompatibleCommands'
 $script:AnyProfileConfigKey = 'AnyProfilePath'
 $script:TargetProfileConfigKey = 'TargetProfiles'
@@ -23,6 +24,7 @@ $script:CompatibilityTestCases = @(
     @{ Target = $script:Srv2012_3_profile; Script = '"Hello World" | ConvertFrom-String | Get-Member'; Commands = @("ConvertFrom-String"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Compress-Archive -LiteralPath C:\Reference\Draftdoc.docx, C:\Reference\Images\diagram2.vsd -CompressionLevel Optimal -DestinationPath C:\Archives\Draft.Zip'; Commands = @("Compress-Archive"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Get-Runspace -Id 2'; Commands = @("Get-Runspace"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2012_3_profile; Script = '$Protected = "Hello World" | Protect-CmsMessage -To "*youralias@emailaddress.com*"'; Commands = @("Protect-CmsMessage"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Format-Hex -Path "C:\temp\temp.t7f"'; Commands = @("Format-Hex"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Set-Clipboard -Value "This is a test string"'; Commands = @("Set-Clipboard"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Clear-RecycleBin -Force'; Commands = @("Clear-RecycleBin"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
@@ -62,7 +64,6 @@ $script:CompatibilityTestCases = @(
     @{ Target = $script:Srv2019_5_profile; Script = 'gci .'; Commands = @(); Version = "5.1"; OS = "Windows"; ProblemCount = 0 }
     @{ Target = $script:Srv2019_5_profile; Script = 'iex $expr | % { Transform $_ }'; Commands = @(); Version = "5.1"; OS = "Windows"; ProblemCount = 0 }
     @{ Target = $script:Srv2019_5_profile; Script = 'fhx $filePath'; Commands = @(); Version = "5.1"; OS = "Windows"; ProblemCount = 0 }
-
     @{ Target = $script:Srv2019_6_1_profile; Script = "Add-PSSnapIn MySnapIn"; Commands = @("Add-PSSnapIn"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2019_6_1_profile; Script = "Get-PSSnapIn MySnapIn"; Commands = @("Get-PSSnapIn"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
     @{ Target = $script:Srv2019_6_1_profile; Script = "Get-Content $pshome\about_signing.help.txt | Out-Printer"; Commands = @("Out-Printer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
@@ -78,6 +79,23 @@ $script:CompatibilityTestCases = @(
     @{ Target = $script:Srv2019_6_1_profile; Script = 'Get-ChildItem ./ | Format-List'; Commands = @(); Version = "3.0"; OS = "Windows"; ProblemCount = 0 }
     @{ Target = $script:Srv2019_6_1_profile; Script = 'gci .'; Commands = @(); Version = "6.1"; OS = "Windows"; ProblemCount = 0 }
     @{ Target = $script:Srv2016_6_1_profile; Script = 'iex $expr | % { Transform $_ }'; Commands = @(); Version = "6.1"; OS = "Windows"; ProblemCount = 0 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'ConvertFrom-String $str'; Commands = @("ConvertFrom-String"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = "Get-WmiObject -Class Win32_Process"; Commands = @("Get-WmiObject"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = "Invoke-WmiMethod -Path win32_process -Name create -ArgumentList notepad.exe"; Commands = @("Invoke-WmiMethod"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = '$np | Remove-WmiObject'; Commands = @("Remove-WmiObject"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Set-Clipboard -Value "This is a test string"'; Commands = @("Set-Clipboard"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = "Set-WmiInstance -Class Win32_WMISetting -Argument @{LoggingLevel=2}"; Commands = @("Set-WmiInstance"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Add-Computer -DomainName "Domain01" -Restart'; Commands = @("Add-Computer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Checkpoint-Computer -Description "Install MyApp"'; Commands = @("Checkpoint-Computer"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Clear-EventLog "Windows PowerShell"'; Commands = @("Clear-EventLog"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Clear-RecycleBin'; Commands = @("Clear-RecycleBin"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Start-Transaction; New-Item MyCompany -UseTransaction; Complete-Transaction'; Commands = @("Start-Transaction", "Complete-Transaction"); Version = "6.1"; OS = "Windows"; ProblemCount = 2 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Disable-ComputerRestore -Drive "C:\"'; Commands = @("Disable-ComputerRestore"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Enable-ComputerRestore -Drive "C:\", "D:\"'; Commands = @("Enable-ComputerRestore"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Get-ControlPanelItem -Name "*Program*", "*App*"'; Commands = @("Get-ControlPanelItem"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Get-EventLog -Newest 5 -LogName "Application"'; Commands = @("Get-EventLog"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = 'Get-HotFix -Description "Security*" -ComputerName "Server01", "Server02" -Cred "Server01\admin01"'; Commands = @("Get-HotFix"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
+    @{ Target = $script:Srv2019_6_1_profile; Script = '$zip = New-WebServiceProxy -Uri "http://www.webservicex.net/uszip.asmx?WSDL"'; Commands = @("New-WebServiceProxy"); Version = "6.1"; OS = "Windows"; ProblemCount = 1 }
 
     @{ Target = $script:Ubuntu1804_6_1_profile; Script = 'Get-AuthenticodeSignature ./script.ps1'; Commands = @("Get-AuthenticodeSignature"); Version = "6.1"; OS = "Linux"; ProblemCount = 1 }
     @{ Target = $script:Ubuntu1804_6_1_profile; Script = 'Get-Service systemd'; Commands = @("Get-Service"); Version = "6.1"; OS = "Linux"; ProblemCount = 1 }
@@ -120,6 +138,9 @@ $script:ParameterCompatibilityTestCases = @(
     @{ Target = $script:Srv2012_3_profile; Script = 'Get-Command -ShowCommandInfo'; Commands = @('Get-Command'); Parameters = @('ShowCommandInfo'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Import-Module -FullyQualifiedName @{ ModuleName = "PSScriptAnalyzer"; ModuleVersion = "1.17" }'; Commands = @('Import-Module'); Parameters = @('FullyQualifiedName'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Remove-Module -FullyQualifiedName @{ ModuleName = "PSScriptAnalyzer"; ModuleVersion = "1.17" }'; Commands = @('Remove-Module'); Parameters = @('FullyQualifiedName'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
+    @{ Target = $script:Srv2012_3_profile; Script = 'Register-ScheduledJob -RunNow -Trigger $t'; Commands = @('Register-ScheduledJob'); Parameters = @('RunNow'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
+    @{ Target = $script:Srv2012_3_profile; Script = 'New-JobTrigger -At "1/20/2012 3:00 AM" -RepeatIndefinitely'; Commands = @('New-JobTrigger'); Parameters = @('RepeatIndefinitely'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
+    @{ Target = $script:Srv2012_3_profile; Script = '$t = Get-ScheduledJob | Get-JobTrigger | Enable-JobTrigger -PassThru'; Commands = @('Enable-JobTrigger'); Parameters = @('PassThru'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Save-Help -FullyQualifiedModule @{ ModuleName = "MyModule"; MaximumVersion = "2.7" }'; Commands = @('Save-Help'); Parameters = @('FullyQualifiedModule'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Export-PSSession -FullyQualifiedModule @{ ModuleName = "MyModule"; RequiredVersion = $reqVer }'; Commands = @('Export-PSSession'); Parameters = @('FullyQualifiedModule'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
     @{ Target = $script:Srv2012_3_profile; Script = 'Get-Command -FullyQualifiedModule @{ ModuleName = $m; MaximumVersion = $maxVer }'; Commands = @('Get-Command'); Parameters = @('FullyQualifiedModule'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
@@ -155,23 +176,9 @@ $script:ParameterCompatibilityTestCases = @(
     @{ Target = $script:Srv2019_6_1_profile; Script = 'Start-Service "eventlog" -ComputerName "MyComputer"'; Commands = @('Start-Service'); Parameters = @('ComputerName'); Version = '6.1'; OS = 'Windows'; ProblemCount = 1 }
 )
 
-# Disabled on AppVeyor's Ubuntu image until fixed
-if (-not $IsLinux -and $env:APPVEYOR) {
-    $script:CompatibilityTestCases += @(
-        @{ Target = $script:Srv2012_3_profile; Script = '$Protected = "Hello World" | Protect-CmsMessage -To "*youralias@emailaddress.com*"'; Commands = @("Protect-CmsMessage"); Version = "3.0"; OS = "Windows"; ProblemCount = 1 }
-    )
-
-    $script:ParameterCompatibilityTestCases += @(
-        @{ Target = $script:Srv2012_3_profile; Script = 'Register-ScheduledJob -RunNow -Trigger $t'; Commands = @('Register-ScheduledJob'); Parameters = @('RunNow'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
-        @{ Target = $script:Srv2012_3_profile; Script = 'New-JobTrigger -At "1/20/2012 3:00 AM" -RepeatIndefinitely'; Commands = @('New-JobTrigger'); Parameters = @('RepeatIndefinitely'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
-        @{ Target = $script:Srv2012_3_profile; Script = '$t = Get-ScheduledJob | Get-JobTrigger | Enable-JobTrigger -PassThru'; Commands = @('Enable-JobTrigger'); Parameters = @('PassThru'); Version = '3.0'; OS = 'Windows'; ProblemCount = 1 }
-    )
-}
-
-
 Describe 'UseCompatibleCommands' {
     Context 'Targeting a single profile' {
-        It "Reports <ProblemCount> command incompatibilties with '<Script>' on <OS> with PowerShell <Version>" -TestCases $script:CompatibilityTestCases {
+        It "Reports <ProblemCount> command incompatibilties with '<Script>' on <OS> with PowerShell <Version>" -TestCases $script:CompatibilityTestCases -Skip:$script:RunningInCIOnUbuntu {
             param($Script, [string]$Target, [string[]]$Commands, [version]$Version, [string]$OS, [int]$ProblemCount)
 
             $settings = @{
@@ -197,7 +204,7 @@ Describe 'UseCompatibleCommands' {
             }
         }
 
-        It "Reports <ProblemCount> parameter incompatibilties for '<Parameters>' on '<Commands>' with '<Script>' on <OS> with PowerShell <Version>" -TestCases $script:ParameterCompatibilityTestCases {
+        It "Reports <ProblemCount> parameter incompatibilties for '<Parameters>' on '<Commands>' with '<Script>' on <OS> with PowerShell <Version>" -TestCases $script:ParameterCompatibilityTestCases -Skip:$script:RunningInCIOnUbuntu {
             param($Script, [string]$Target, [string[]]$Commands, [string[]]$Parameters, [version]$Version, [string]$OS, [int]$ProblemCount)
 
             $settings = @{
@@ -225,7 +232,7 @@ Describe 'UseCompatibleCommands' {
     }
 
     Context "Checking a file against many targets" {
-        It "Finds all command problems" {
+        It "Finds all command problems" -Skip:$script:RunningInCIOnUbuntu {
             $settings = @{
                 Rules = @{
                     $script:RuleName = @{
@@ -244,7 +251,7 @@ Describe 'UseCompatibleCommands' {
             $diagnostics = Invoke-ScriptAnalyzer -Path "$PSScriptRoot/CompatibilityRuleAssets/IncompatibleScript.ps1" -IncludeRule $script:RuleName -Settings $settings `
                 | Where-Object { $_.RuleName -eq $script:RuleName }
 
-            $expectedNumber = if ($env:TF_BUILD -and $IsLinux) { 13 } else { 14 }
+            $expectedNumber = 14
 
             $diagnostics.Count | Should -Be $expectedNumber -Because "Got diagnostics: $($diagnostics.Message -join ", ")"
 

From ba896ab8a4cdfd2946a327af385d171cf2ea612d Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 18:59:23 +0000
Subject: [PATCH 07/35] job name in quotes and disable redundant appveyor
 matrix entries

---
 .azure-pipelines-ci/ci-unix.yaml |  4 ++--
 appveyor.yml                     | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 7341eed9a..272172aa9 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -3,12 +3,12 @@ variables:
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 jobs:
-  - job: Ubuntu 16.04
+  - job: 'Ubuntu 16.04'
     pool:
       vmImage: ubuntu-16.04
     steps:
     - template: templates/unix.yaml
-  - job: Ubuntu 18.04
+  - job: 'Ubuntu 18.04'
     pool:
       vmImage: ubuntu-18.04
     steps:
diff --git a/appveyor.yml b/appveyor.yml
index 643caf59b..884efd718 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,15 +3,16 @@ environment:
   BuildConfiguration: Release
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # For faster CI builds
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    PowerShellEdition: PowerShellCore
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    PowerShellEdition: WindowsPowerShell
-  - APPVEYOR_BUILD_WORKER_IMAGE: WMF 4
-    PowerShellEdition: WindowsPowerShell
-    PSVersion: 4
-  - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
-    PowerShellEdition: PowerShellCore
+    - APPVEYOR_BUILD_WORKER_IMAGE: WMF 4
+      PowerShellEdition: WindowsPowerShell
+      PSVersion: 4
+  ## Only the tests for WMF4 remain active in AppVeyor due to Azure DevOps not offering such images ##
+  # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  #   PowerShellEdition: PowerShellCore
+  # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  #   PowerShellEdition: WindowsPowerShell
+  # - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
+  #   PowerShellEdition: PowerShellCore
 
 # cache Nuget packages and dotnet CLI cache
 cache:

From c50c02a6b10915faa77926905f7047b8a4253f55 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 19:01:30 +0000
Subject: [PATCH 08/35] whitespace not allowed for job name

---
 .azure-pipelines-ci/ci-unix.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 272172aa9..9c42034e2 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -3,12 +3,12 @@ variables:
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 jobs:
-  - job: 'Ubuntu 16.04'
+  - job: 'Ubuntu_16.04'
     pool:
       vmImage: ubuntu-16.04
     steps:
     - template: templates/unix.yaml
-  - job: 'Ubuntu 18.04'
+  - job: 'Ubuntu_18.04'
     pool:
       vmImage: ubuntu-18.04
     steps:

From ec0fcb76c4fc3c7a415e5c00110b75ebb5335ef8 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 19:03:13 +0000
Subject: [PATCH 09/35] dots arent allowed either...

---
 .azure-pipelines-ci/ci-unix.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 9c42034e2..82ec08530 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -3,14 +3,14 @@ variables:
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 jobs:
-  - job: 'Ubuntu_16.04'
+  - job: 'Ubuntu_16_04'
     pool:
       vmImage: ubuntu-16.04
     steps:
     - template: templates/unix.yaml
   - job: 'Ubuntu_18.04'
     pool:
-      vmImage: ubuntu-18.04
+      vmImage: ubuntu-18_04
     steps:
     - template: templates/unix.yaml
   - job: macOS

From 4afd0c6fceba7a2ed0315b5792b87fd4d6d050a3 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 19:04:11 +0000
Subject: [PATCH 10/35] last fix

---
 .azure-pipelines-ci/ci-unix.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
index 82ec08530..776d7bbbc 100644
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ b/.azure-pipelines-ci/ci-unix.yaml
@@ -8,9 +8,9 @@ jobs:
       vmImage: ubuntu-16.04
     steps:
     - template: templates/unix.yaml
-  - job: 'Ubuntu_18.04'
+  - job: 'Ubuntu_18_04'
     pool:
-      vmImage: ubuntu-18_04
+      vmImage: ubuntu-18.04
     steps:
     - template: templates/unix.yaml
   - job: macOS

From a503c1505482f26d34bdafe4a18a359eadf0b214 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 20:21:32 +0000
Subject: [PATCH 11/35] Merge all entry path yaml files into one yaml.ci file

---
 .azure-pipelines-ci/ci-unix.yaml        | 20 ----------
 .azure-pipelines-ci/ci-windows-ps5.yaml | 16 --------
 .azure-pipelines-ci/ci-windows.yaml     | 16 --------
 .azure-pipelines-ci/ci.yaml             | 51 +++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 52 deletions(-)
 delete mode 100644 .azure-pipelines-ci/ci-unix.yaml
 delete mode 100644 .azure-pipelines-ci/ci-windows-ps5.yaml
 delete mode 100644 .azure-pipelines-ci/ci-windows.yaml
 create mode 100644 .azure-pipelines-ci/ci.yaml

diff --git a/.azure-pipelines-ci/ci-unix.yaml b/.azure-pipelines-ci/ci-unix.yaml
deleted file mode 100644
index 776d7bbbc..000000000
--- a/.azure-pipelines-ci/ci-unix.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-variables:
-  pwsh: true
-  # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-jobs:
-  - job: 'Ubuntu_16_04'
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-    - template: templates/unix.yaml
-  - job: 'Ubuntu_18_04'
-    pool:
-      vmImage: ubuntu-18.04
-    steps:
-    - template: templates/unix.yaml
-  - job: macOS
-    pool:
-      vmImage: macos-latest
-    steps:
-    - template: templates/unix.yaml
\ No newline at end of file
diff --git a/.azure-pipelines-ci/ci-windows-ps5.yaml b/.azure-pipelines-ci/ci-windows-ps5.yaml
deleted file mode 100644
index 876d55974..000000000
--- a/.azure-pipelines-ci/ci-windows-ps5.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-pool:
-  vmImage: windows-latest
-variables:
-  pwsh: false
-    # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-steps:
-- powershell: |
-    Import-Module .\tools\appveyor.psm1
-    Invoke-AppveyorInstall
-    ./build.ps1 -Configuration 'Release' -PSVersion 5
-    ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'net452'
-  displayName: 'Build'
-- template: templates/test.yaml
-  parameters:
-    pwsh: $(pwsh)
\ No newline at end of file
diff --git a/.azure-pipelines-ci/ci-windows.yaml b/.azure-pipelines-ci/ci-windows.yaml
deleted file mode 100644
index 88316c3c3..000000000
--- a/.azure-pipelines-ci/ci-windows.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-pool:
-  vmImage: windows-latest
-variables:
-  pwsh: true
-  # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-steps:
-- pwsh: |
-    Import-Module .\tools\appveyor.psm1
-    Invoke-AppveyorInstall
-    ./build.ps1 -Configuration 'Release' -All
-    ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-  displayName: 'Full Build'
-- template: templates/test.yaml
-  parameters:
-    pwsh: $(pwsh)
diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
new file mode 100644
index 000000000..0095d05b8
--- /dev/null
+++ b/.azure-pipelines-ci/ci.yaml
@@ -0,0 +1,51 @@
+variables:
+  pwsh: true
+  # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+
+jobs:
+  - job: 'Ubuntu_16_04'
+    pool:
+      vmImage: ubuntu-16.04
+    steps:
+    - template: templates/unix.yaml
+    
+  - job: 'Ubuntu_18_04'
+    pool:
+      vmImage: ubuntu-18.04
+    steps:
+    - template: templates/unix.yaml
+    
+  - job: macOS
+    pool:
+      vmImage: macos-latest
+    steps:
+    - template: templates/unix.yaml
+
+  - job: 'Windows_PowerShell_5_1'
+    pool:
+      vmImage: windows-latest
+    steps:
+    - pwsh: |
+        Import-Module .\tools\appveyor.psm1
+        Invoke-AppveyorInstall
+        ./build.ps1 -Configuration 'Release' -PSVersion 5
+        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'net452'
+      displayName: 'Full Build'
+    - template: templates/test.yaml
+      parameters:
+        pwsh: false
+
+  - job: 'Windows_PowerShell_Core'
+    pool:
+      vmImage: windows-latest
+    steps:
+    - pwsh: |
+        Import-Module .\tools\appveyor.psm1
+        Invoke-AppveyorInstall
+        ./build.ps1 -Configuration 'Release' -All
+        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+      displayName: 'Full Build'
+    - template: templates/test.yaml
+      parameters:
+        pwsh: true

From e31aead1176fdb1d7f80eb129734706027f9deec Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 20:32:31 +0000
Subject: [PATCH 12/35] fix windows powershell job

---
 .azure-pipelines-ci/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 0095d05b8..7195ad25c 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -26,7 +26,7 @@ jobs:
     pool:
       vmImage: windows-latest
     steps:
-    - pwsh: |
+    - powershell: |
         Import-Module .\tools\appveyor.psm1
         Invoke-AppveyorInstall
         ./build.ps1 -Configuration 'Release' -PSVersion 5

From 06d6631b4e80680e11de74b0dd5c1022f0065113 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 20:38:06 +0000
Subject: [PATCH 13/35] tweak step name for ps5 to be consistent

---
 .azure-pipelines-ci/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 7195ad25c..19634eac9 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -31,7 +31,7 @@ jobs:
         Invoke-AppveyorInstall
         ./build.ps1 -Configuration 'Release' -PSVersion 5
         ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'net452'
-      displayName: 'Full Build'
+      displayName: 'Build'
     - template: templates/test.yaml
       parameters:
         pwsh: false

From 9c4445bc3313e09d7b5c1e2c465491825783d52c Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 20:43:04 +0000
Subject: [PATCH 14/35] re-trigger


From dfe241a86dcfbc90e8a92a464b2ba8fe09719ddf Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Sun, 2 Feb 2020 21:13:35 +0000
Subject: [PATCH 15/35] add badge

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03a71b853..d99092514 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@
 
 <img src="logo.png" width="180">
 
-[![Build status](https://ci.appveyor.com/api/projects/status/h5mot3vqtvxw5d7l/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/psscriptanalyzer/branch/master) [![Join the chat at https://gitter.im/PowerShell/PSScriptAnalyzer](https://badges.gitter.im/PowerShell/PSScriptAnalyzer.svg)](https://gitter.im/PowerShell/PSScriptAnalyzer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://dev.azure.com/powershell/psscriptanalyzer/_apis/build/status/psscriptanalyzer-ci?branchName=master)](https://dev.azure.com/powershell/psscriptanalyzer/_build/latest?definitionId=80&branchName=master)
+[![Build status](https://ci.appveyor.com/api/projects/status/h5mot3vqtvxw5d7l/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/psscriptanalyzer/branch/master)
+[![Join the chat at https://gitter.im/PowerShell/PSScriptAnalyzer](https://badges.gitter.im/PowerShell/PSScriptAnalyzer.svg)](https://gitter.im/PowerShell/PSScriptAnalyzer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Table of Contents
 =================

From 58df1683716324dbd97ff168159c11f3899f941a Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 07:22:07 +0000
Subject: [PATCH 16/35] multi stage build-test

---
 .azure-pipelines-ci/ci.yaml | 101 ++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 19634eac9..eac930dec 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -3,49 +3,62 @@ variables:
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 
-jobs:
-  - job: 'Ubuntu_16_04'
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-    - template: templates/unix.yaml
-    
-  - job: 'Ubuntu_18_04'
-    pool:
-      vmImage: ubuntu-18.04
-    steps:
-    - template: templates/unix.yaml
-    
-  - job: macOS
-    pool:
-      vmImage: macos-latest
-    steps:
-    - template: templates/unix.yaml
+stages:
+  - stage: Build
+    jobs:
+      - job: 'Full_Build'
+        pool:
+          vmImage: windows-latest
+        steps:
+        - pwsh: |
+            Import-Module .\tools\appveyor.psm1
+            Invoke-AppveyorInstall
+            ./build.ps1 -Configuration 'Release' -All
+            ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+          displayName: 'Full Build'
+        - task: PublishPipelineArtifact@1
+          displayName: 'Publish Artifact: out Folder'
+          inputs:
+            targetPath: '$(Build.SourcesDirectory)/out'
+            artifactName: out
+  - stage: Test
+    jobs:
+      - job: 'Ubuntu_16_04'
+        pool:
+          vmImage: ubuntu-16.04
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: false
+        
+      - job: 'Ubuntu_18_04'
+        pool:
+          vmImage: ubuntu-18.04
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: false
+        
+      - job: macOS
+        pool:
+          vmImage: macos-latest
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: false
 
-  - job: 'Windows_PowerShell_5_1'
-    pool:
-      vmImage: windows-latest
-    steps:
-    - powershell: |
-        Import-Module .\tools\appveyor.psm1
-        Invoke-AppveyorInstall
-        ./build.ps1 -Configuration 'Release' -PSVersion 5
-        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'net452'
-      displayName: 'Build'
-    - template: templates/test.yaml
-      parameters:
-        pwsh: false
+      - job: 'Windows_PowerShell_5_1'
+        pool:
+          vmImage: windows-latest
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: false
 
-  - job: 'Windows_PowerShell_Core'
-    pool:
-      vmImage: windows-latest
-    steps:
-    - pwsh: |
-        Import-Module .\tools\appveyor.psm1
-        Invoke-AppveyorInstall
-        ./build.ps1 -Configuration 'Release' -All
-        ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-      displayName: 'Full Build'
-    - template: templates/test.yaml
-      parameters:
-        pwsh: true
+      - job: 'Windows_PowerShell_Core'
+        pool:
+          vmImage: windows-latest
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: true

From b4ef261668228dda54390da0eacc7a4c5d143acf Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 07:30:32 +0000
Subject: [PATCH 17/35] bootstrap pester

---
 tools/appveyor.psm1 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
index c7146f50f..001b4dfc1 100644
--- a/tools/appveyor.psm1
+++ b/tools/appveyor.psm1
@@ -3,9 +3,8 @@
 
 $ErrorActionPreference = 'Stop'
 
-# Implements the AppVeyor 'install' step and installs the required versions of Pester, platyPS and the .Net Core SDK if needed.
-function Invoke-AppVeyorInstall {
-    $requiredPesterVersion = '4.4.4'
+function Install-Pester {
+    $requiredPesterVersion = '4.10.0'
     $pester = Get-Module Pester -ListAvailable | Where-Object { $_.Version -eq $requiredPesterVersion }
     if ($null -eq $pester) {
         if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
@@ -19,6 +18,12 @@ function Invoke-AppVeyorInstall {
             Install-Module -Name Pester -Force -SkipPublisherCheck -Scope CurrentUser -Repository PSGallery
         }
     }
+}
+
+# Implements the AppVeyor 'install' step and installs the required versions of Pester, platyPS and the .Net Core SDK if needed.
+function Invoke-AppVeyorInstall {
+
+    Install-Pester
 
     if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
         # WMF 4 image build
@@ -72,6 +77,8 @@ function Invoke-AppveyorTest {
         $CheckoutPath
     )
 
+    Install-Pester
+
     # enforce the language to utf-8 to avoid issues
     $env:LANG = "en_US.UTF-8"
     Write-Verbose -Verbose ("Running tests on PowerShell version " + $PSVersionTable.PSVersion)

From 2623e584649c51dd6a8f22cd8d4568d225e7db86 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 07:43:01 +0000
Subject: [PATCH 18/35] Cleanup and avoid Pester bootstrap in build stage

---
 .azure-pipelines-ci/templates/unix.yaml | 8 --------
 tools/appveyor.psm1                     | 6 +++++-
 2 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 .azure-pipelines-ci/templates/unix.yaml

diff --git a/.azure-pipelines-ci/templates/unix.yaml b/.azure-pipelines-ci/templates/unix.yaml
deleted file mode 100644
index 6d4ba43b9..000000000
--- a/.azure-pipelines-ci/templates/unix.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-steps:
-- pwsh: |
-    Import-Module .\tools\appveyor.psm1
-    Invoke-AppveyorInstall
-    ./build.ps1 -Configuration 'Release' -PSVersion 6
-    ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
-  displayName: 'Build'
-- template: test.yaml
\ No newline at end of file
diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
index 001b4dfc1..ffbcc415f 100644
--- a/tools/appveyor.psm1
+++ b/tools/appveyor.psm1
@@ -22,8 +22,12 @@ function Install-Pester {
 
 # Implements the AppVeyor 'install' step and installs the required versions of Pester, platyPS and the .Net Core SDK if needed.
 function Invoke-AppVeyorInstall {
+    param(
+        # For the multi-stage build in Azure DevOps, Pester is not needed for bootstrapping the build environment
+        [switch] $SkipPesterInstallation
+    )
 
-    Install-Pester
+    if (-not $SkipPesterInstallation.IsPresent) { Install-Pester }
 
     if ($null -eq (Get-Module -ListAvailable PowershellGet)) {
         # WMF 4 image build

From c7bbb5f01962f7b3fec418c15a3f39ff78de559a Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 07:45:24 +0000
Subject: [PATCH 19/35] download pipeline artifact in test stage

---
 .azure-pipelines-ci/ci.yaml             | 4 ++--
 .azure-pipelines-ci/templates/test.yaml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index eac930dec..8954147f9 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -12,12 +12,12 @@ stages:
         steps:
         - pwsh: |
             Import-Module .\tools\appveyor.psm1
-            Invoke-AppveyorInstall
+            Invoke-AppveyorInstall -SkipPesterInstallation
             ./build.ps1 -Configuration 'Release' -All
             ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
           displayName: 'Full Build'
         - task: PublishPipelineArtifact@1
-          displayName: 'Publish Artifact: out Folder'
+          displayName: 'Publish Pipeline Artifact: out Folder'
           inputs:
             targetPath: '$(Build.SourcesDirectory)/out'
             artifactName: out
diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml
index 708352b79..7014452ec 100644
--- a/.azure-pipelines-ci/templates/test.yaml
+++ b/.azure-pipelines-ci/templates/test.yaml
@@ -1,4 +1,8 @@
 steps:
+- task: DownloadPipelineArtifact@2
+  displayName: 'Download Pipeline Artifact: out Folder'
+  inputs:
+    artifactName: out
 - task: PowerShell@2
   displayName: 'Test'
   inputs:

From 270bb78a2b565a28fbe08d6910d061630fc0fefe Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 07:51:23 +0000
Subject: [PATCH 20/35] try fix artifact download path

---
 .azure-pipelines-ci/templates/test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml
index 7014452ec..2297fda2d 100644
--- a/.azure-pipelines-ci/templates/test.yaml
+++ b/.azure-pipelines-ci/templates/test.yaml
@@ -3,6 +3,7 @@ steps:
   displayName: 'Download Pipeline Artifact: out Folder'
   inputs:
     artifactName: out
+    targetPath: '$(Pipeline.Workspace)/out'
 - task: PowerShell@2
   displayName: 'Test'
   inputs:

From db7d52970ef3ed47b3515234970db1b523fb6dae Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 08:21:44 +0000
Subject: [PATCH 21/35] try fix artifact path using
 '$(Build.SourcesDirectory)/out' and add debugging info

---
 .azure-pipelines-ci/templates/test.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml
index 2297fda2d..6bc8118f5 100644
--- a/.azure-pipelines-ci/templates/test.yaml
+++ b/.azure-pipelines-ci/templates/test.yaml
@@ -3,7 +3,9 @@ steps:
   displayName: 'Download Pipeline Artifact: out Folder'
   inputs:
     artifactName: out
-    targetPath: '$(Pipeline.Workspace)/out'
+    targetPath: '$(Build.SourcesDirectory)/out'
+- pwsh: |
+    ls (Join-Path $env:Build_SourcesDirectory 'out'
 - task: PowerShell@2
   displayName: 'Test'
   inputs:

From 7a13f383bcbf13f0596114ca138ae2a7c42a2824 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 08:26:53 +0000
Subject: [PATCH 22/35] fix ps syntax

---
 .azure-pipelines-ci/templates/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml
index 6bc8118f5..0506c8065 100644
--- a/.azure-pipelines-ci/templates/test.yaml
+++ b/.azure-pipelines-ci/templates/test.yaml
@@ -5,7 +5,7 @@ steps:
     artifactName: out
     targetPath: '$(Build.SourcesDirectory)/out'
 - pwsh: |
-    ls (Join-Path $env:Build_SourcesDirectory 'out'
+    ls (Join-Path $env:Build_SourcesDirectory 'out')
 - task: PowerShell@2
   displayName: 'Test'
   inputs:

From ca2c14cb4204bedf79cf99a0c48d47290af50534 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 08:36:19 +0000
Subject: [PATCH 23/35] remove debugging step

---
 .azure-pipelines-ci/templates/test.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml
index 0506c8065..2cf0468a2 100644
--- a/.azure-pipelines-ci/templates/test.yaml
+++ b/.azure-pipelines-ci/templates/test.yaml
@@ -4,8 +4,6 @@ steps:
   inputs:
     artifactName: out
     targetPath: '$(Build.SourcesDirectory)/out'
-- pwsh: |
-    ls (Join-Path $env:Build_SourcesDirectory 'out')
 - task: PowerShell@2
   displayName: 'Test'
   inputs:

From e4717dd011ebe97c8b48e63a96e9507410b5cdd1 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 11:48:41 +0000
Subject: [PATCH 24/35] Fix suggestion text to have platform specific newlines
 and enable test on Linux

---
 Rules/MissingModuleManifestField.cs                        | 7 +++----
 ...oadableModuleOrMissingRequiredFieldInManifest.tests.ps1 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Rules/MissingModuleManifestField.cs b/Rules/MissingModuleManifestField.cs
index 78deb38ab..180767766 100644
--- a/Rules/MissingModuleManifestField.cs
+++ b/Rules/MissingModuleManifestField.cs
@@ -115,10 +115,9 @@ private List<CorrectionExtent> GetCorrectionExtent(HashtableAst ast)
                 Strings.MissingModuleManifestFieldCorrectionDescription,
                 fieldName,
                 fieldValue);
-            var correctionTextTemplate = @"
-# Version number of this module.
-{0} = '{1}'
-";
+            var correctionTextTemplate = string.Concat(Environment.NewLine,
+                "# Version number of this module.", Environment.NewLine,
+                "{0} = '{1}'", Environment.NewLine);
             var correctionText = string.Format(
                 correctionTextTemplate,
                 fieldName,
diff --git a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
index 55d6dc593..5cf8d69e4 100644
--- a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
+++ b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
@@ -33,7 +33,7 @@ Describe "MissingRequiredFieldModuleManifest" {
         }
 
     # On Linux, mismatch in line endings cause this to fail
-	It "has the right suggested correction" -Skip:($IsLinux) {
+	It "has the right suggested correction" {
 	   $expectedText = @'
 # Version number of this module.
 ModuleVersion = '1.0.0.0'

From 4459f9e1b67a3db39314368fb2dd2d94e65a9b89 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 13:01:30 +0000
Subject: [PATCH 25/35] add more windows images

---
 .azure-pipelines-ci/ci.yaml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 8954147f9..1bf88fb37 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -47,18 +47,35 @@ stages:
           parameters:
             pwsh: false
 
-      - job: 'Windows_PowerShell_5_1'
+      - job: 'Windows_Server2016_PowerShell_5_1'
         pool:
-          vmImage: windows-latest
+          vmImage: vs2017-win2016
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: false
+      
+      - job: 'Windows_Server2019_PowerShell_5_1'
+        pool:
+          vmImage: windows-2019
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
 
-      - job: 'Windows_PowerShell_Core'
+      - job: 'Windows_Server2016_PowerShell_Core'
         pool:
-          vmImage: windows-latest
+          vmImage: vs2017-win2016
+        steps:
+        - template: templates/test.yaml
+          parameters:
+            pwsh: true
+
+      - job: 'Windows_Server2019_PowerShell_Core'
+        pool:
+          vmImage: windows-2019
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: true
+      

From c34fb1a706a1f550695da504cbeb311502d88bd8 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 14:35:40 +0000
Subject: [PATCH 26/35] try use strategy

---
 .azure-pipelines-ci/ci.yaml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 1bf88fb37..0072e8a9a 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -22,58 +22,52 @@ stages:
             targetPath: '$(Build.SourcesDirectory)/out'
             artifactName: out
   - stage: Test
+    strategy:
+      matrix:
+        ubuntu16:
+          containerImage: ubuntu:16.04
+        ubuntu18:
+          containerImage: ubuntu:18.04
+    pool:
+      vmImage: $[ variables['containerImage'] ]
     jobs:
       - job: 'Ubuntu_16_04'
-        pool:
-          vmImage: ubuntu-16.04
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
         
       - job: 'Ubuntu_18_04'
-        pool:
-          vmImage: ubuntu-18.04
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
         
       - job: macOS
-        pool:
-          vmImage: macos-latest
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
 
       - job: 'Windows_Server2016_PowerShell_5_1'
-        pool:
-          vmImage: vs2017-win2016
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
       
       - job: 'Windows_Server2019_PowerShell_5_1'
-        pool:
-          vmImage: windows-2019
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
 
       - job: 'Windows_Server2016_PowerShell_Core'
-        pool:
-          vmImage: vs2017-win2016
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: true
 
       - job: 'Windows_Server2019_PowerShell_Core'
-        pool:
-          vmImage: windows-2019
         steps:
         - template: templates/test.yaml
           parameters:

From 164bca3fd57301525c661abbf7e3df838fb34036 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 14:40:06 +0000
Subject: [PATCH 27/35] try

---
 .azure-pipelines-ci/ci.yaml | 55 ++++++-------------------------------
 1 file changed, 9 insertions(+), 46 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 0072e8a9a..5f7cb13d6 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -22,54 +22,17 @@ stages:
             targetPath: '$(Build.SourcesDirectory)/out'
             artifactName: out
   - stage: Test
-    strategy:
-      matrix:
-        ubuntu16:
-          containerImage: ubuntu:16.04
-        ubuntu18:
-          containerImage: ubuntu:18.04
-    pool:
-      vmImage: $[ variables['containerImage'] ]
     jobs:
-      - job: 'Ubuntu_16_04'
-        steps:
-        - template: templates/test.yaml
-          parameters:
-            pwsh: false
-        
-      - job: 'Ubuntu_18_04'
-        steps:
-        - template: templates/test.yaml
-          parameters:
-            pwsh: false
-        
-      - job: macOS
-        steps:
-        - template: templates/test.yaml
-          parameters:
-            pwsh: false
-
-      - job: 'Windows_Server2016_PowerShell_5_1'
-        steps:
-        - template: templates/test.yaml
-          parameters:
-            pwsh: false
-      
-      - job: 'Windows_Server2019_PowerShell_5_1'
+      - job: Strategy
+        strategy:
+          matrix:
+            ubuntu16:
+              containerImage: ubuntu:16.04
+            ubuntu18:
+              containerImage: ubuntu:18.04
+        pool:
+          vmImage: $[ variables['containerImage'] ]
         steps:
         - template: templates/test.yaml
           parameters:
             pwsh: false
-
-      - job: 'Windows_Server2016_PowerShell_Core'
-        steps:
-        - template: templates/test.yaml
-          parameters:
-            pwsh: true
-
-      - job: 'Windows_Server2019_PowerShell_Core'
-        steps:
-        - template: templates/test.yaml
-          parameters:
-            pwsh: true
-      

From 329f712e1bcf343c0f75ee7fc52ab0ec87e0d48d Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 14:56:21 +0000
Subject: [PATCH 28/35] fix job name

---
 .azure-pipelines-ci/ci.yaml             | 22 ++++++++++++++++------
 .azure-pipelines-ci/templates/test.yaml |  5 +++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 5f7cb13d6..5da8fae0c 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -26,13 +26,23 @@ stages:
       - job: Strategy
         strategy:
           matrix:
-            ubuntu16:
-              containerImage: ubuntu:16.04
-            ubuntu18:
-              containerImage: ubuntu:18.04
+            Ubuntu_16_04:
+              containerImage: ubuntu-16.04
+            Ubuntu_18_04:
+              containerImage: ubuntu-18.04
+            macOS:
+              containerImage: macos-latest
+            Windows_Server2016_PowerShell_Core:
+              containerImage: windows-2019
+            Windows_Server2019_PowerShell_Core:
+              containerImage: windows-2019
+            Windows_Server2016_PowerShell_5_1:
+              containerImage: vs2017-win2016
+              pwsh: false
+            Windows_Server2019_PowerShell_5_1:
+              containerImage: vs2017-win2016
+              pwsh: false
         pool:
           vmImage: $[ variables['containerImage'] ]
         steps:
         - template: templates/test.yaml
-          parameters:
-            pwsh: false
diff --git a/.azure-pipelines-ci/templates/test.yaml b/.azure-pipelines-ci/templates/test.yaml
index 2cf0468a2..2acdcc6f5 100644
--- a/.azure-pipelines-ci/templates/test.yaml
+++ b/.azure-pipelines-ci/templates/test.yaml
@@ -1,3 +1,8 @@
+parameters:
+- name: pwsh
+  type: boolean
+  default: true
+
 steps:
 - task: DownloadPipelineArtifact@2
   displayName: 'Download Pipeline Artifact: out Folder'

From f5edd4eda42b964ec33e3c4adc1179c3b80576c6 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 15:09:56 +0000
Subject: [PATCH 29/35] rename and try to not use a job name

---
 .azure-pipelines-ci/ci.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 5da8fae0c..7417ea5b6 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -23,26 +23,26 @@ stages:
             artifactName: out
   - stage: Test
     jobs:
-      - job: Strategy
+      - job:
         strategy:
           matrix:
             Ubuntu_16_04:
-              containerImage: ubuntu-16.04
+              vmImage: ubuntu-16.04
             Ubuntu_18_04:
-              containerImage: ubuntu-18.04
+              vmImage: ubuntu-18.04
             macOS:
-              containerImage: macos-latest
+              vmImage: macos-latest
             Windows_Server2016_PowerShell_Core:
-              containerImage: windows-2019
+              vmImage: windows-2019
             Windows_Server2019_PowerShell_Core:
-              containerImage: windows-2019
+              vmImage: windows-2019
             Windows_Server2016_PowerShell_5_1:
-              containerImage: vs2017-win2016
+              vmImage: vs2017-win2016
               pwsh: false
             Windows_Server2019_PowerShell_5_1:
-              containerImage: vs2017-win2016
+              vmImage: vs2017-win2016
               pwsh: false
         pool:
-          vmImage: $[ variables['containerImage'] ]
+          vmImage: $[ variables['vmImage'] ]
         steps:
         - template: templates/test.yaml

From 5c8bb363106598192e80cae6a478e035633da303 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 15:13:36 +0000
Subject: [PATCH 30/35] remove pwsh variable, which is now redundant as it is
 now in test.yaml

---
 .azure-pipelines-ci/ci.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index 7417ea5b6..cde037592 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -1,5 +1,4 @@
 variables:
-  pwsh: true
   # Avoid expensive initialization of dotnet cli, see: https://donovanbrown.com/post/Stop-wasting-time-during-NET-Core-builds
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
 

From 06309b841e3d206b4106fb29872c9148158aa7fd Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 15:41:20 +0000
Subject: [PATCH 31/35] remove old comment

---
 ...oidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
index 5cf8d69e4..c775093e4 100644
--- a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
+++ b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
@@ -32,7 +32,6 @@ Describe "MissingRequiredFieldModuleManifest" {
             $violations.SuggestedCorrections.Count | Should -Be $numExpectedCorrections
         }
 
-    # On Linux, mismatch in line endings cause this to fail
 	It "has the right suggested correction" {
 	   $expectedText = @'
 # Version number of this module.

From 6ff0c072596a4b878c556156e6fb7b9adb19d0b9 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 17:05:02 +0000
Subject: [PATCH 32/35] try fix tests on wmf4

---
 ...UnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
index c775093e4..70c8c0af8 100644
--- a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
+++ b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
@@ -33,9 +33,11 @@ Describe "MissingRequiredFieldModuleManifest" {
         }
 
 	It "has the right suggested correction" {
-	   $expectedText = @'
+       $expectedText = @'
+
 # Version number of this module.
 ModuleVersion = '1.0.0.0'
+
 '@
             $violations[0].SuggestedCorrections[0].Text | Should -Match $expectedText
             Get-ExtentText $violations[0].SuggestedCorrections[0] $violationFilepath | Should -BeNullOrEmpty

From bb95ab45eba6a3e55806d1e382196d5844c5c498 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 17:29:40 +0000
Subject: [PATCH 33/35] try use -be instead of -match operator

---
 ...UnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
index 70c8c0af8..76a504923 100644
--- a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
+++ b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
@@ -33,13 +33,13 @@ Describe "MissingRequiredFieldModuleManifest" {
         }
 
 	It "has the right suggested correction" {
-       $expectedText = @'
+        $expectedText = @'
 
 # Version number of this module.
 ModuleVersion = '1.0.0.0'
 
 '@
-            $violations[0].SuggestedCorrections[0].Text | Should -Match $expectedText
+            $violations[0].SuggestedCorrections[0].Text | Should -Be $expectedText
             Get-ExtentText $violations[0].SuggestedCorrections[0] $violationFilepath | Should -BeNullOrEmpty
     }
 }

From 8eaf6fd09dcd8cb252e2fa3ec3cbe293cafc9551 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Mon, 3 Feb 2020 22:18:30 +0000
Subject: [PATCH 34/35] fix wmf4 test failure due to CRLF not being correctly
 used in this version

---
 ...leModuleOrMissingRequiredFieldInManifest.tests.ps1 | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1 b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
index 76a504923..2198fa178 100644
--- a/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
+++ b/Tests/Rules/AvoidUnloadableModuleOrMissingRequiredFieldInManifest.tests.ps1
@@ -33,14 +33,11 @@ Describe "MissingRequiredFieldModuleManifest" {
         }
 
 	It "has the right suggested correction" {
-        $expectedText = @'
+        $expectedText = [System.Environment]::NewLine + '# Version number of this module.' +
+            [System.Environment]::NewLine + "ModuleVersion = '1.0.0.0'" + [System.Environment]::NewLine
 
-# Version number of this module.
-ModuleVersion = '1.0.0.0'
-
-'@
-            $violations[0].SuggestedCorrections[0].Text | Should -Be $expectedText
-            Get-ExtentText $violations[0].SuggestedCorrections[0] $violationFilepath | Should -BeNullOrEmpty
+        $violations[0].SuggestedCorrections[0].Text | Should -BeExactly $expectedText
+        Get-ExtentText $violations[0].SuggestedCorrections[0] $violationFilepath | Should -BeNullOrEmpty
     }
 }
 

From 9f81fabf3322698521cf0ef6e0dffd4489e85e9f Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <christoph.bergmeister@bjss.com>
Date: Tue, 4 Feb 2020 06:53:05 +0000
Subject: [PATCH 35/35] make pscompatiblitycollector build against all
 frameworks again

---
 .azure-pipelines-ci/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines-ci/ci.yaml b/.azure-pipelines-ci/ci.yaml
index cde037592..6d110335f 100644
--- a/.azure-pipelines-ci/ci.yaml
+++ b/.azure-pipelines-ci/ci.yaml
@@ -13,7 +13,7 @@ stages:
             Import-Module .\tools\appveyor.psm1
             Invoke-AppveyorInstall -SkipPesterInstallation
             ./build.ps1 -Configuration 'Release' -All
-            ./PSCompatibilityCollector/build.ps1 -Configuration 'Release' -Framework 'netstandard2.0'
+            ./PSCompatibilityCollector/build.ps1 -Configuration 'Release'
           displayName: 'Full Build'
         - task: PublishPipelineArtifact@1
           displayName: 'Publish Pipeline Artifact: out Folder'