Fix Ubuntu Appveyor build (#1320)

* try fix appveyor ubuntu build * temporarily enable only ubuntu * remove redundant linux customisation * fix compatibility analyser build * final tweak to make it ready for PR * Update tools/appveyor.psm1 Co-Authored-By: Robert Holt <[email protected]>
PowerShell · Aug 27, 2019 · 5cd3065 · 5cd3065
1 parent 3351367
commit 5cd3065
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/PSCompatibilityCollector/build.ps1 b/PSCompatibilityCollector/build.ps1
@@ -57,7 +57,15 @@ function Invoke-CrossCompatibilityModuleBuild
     Push-Location $script:BinModSrcDir
     try
     {
-        dotnet publish -f $Framework -c $Configuration
+        if ( Test-Path "$HOME/.dotnet/dotnet" )
+        {
+            $dotnet = "$HOME/.dotnet/dotnet"
+        }
+        else
+        {
+            $dotnet = "dotnet"
+        }
+        & $dotnet publish --framework $Framework --configuration $Configuration
     }
     finally
     {

diff --git a/Tests/Engine/CustomizedRule.tests.ps1 b/Tests/Engine/CustomizedRule.tests.ps1
@@ -97,10 +97,6 @@ Describe "Test importing correct customized rules" {
 		It "will show the custom rules when given a glob" {
 			# needs fixing for Linux
 			$expectedNumRules = 4
-			if ($IsLinux)
-			{
-				$expectedNumRules = 3
-			}
 			$customizedRulePath = Get-ScriptAnalyzerRule  -CustomizedRulePath $directory\samplerule\samplerule* | Where-Object {$_.RuleName -match $measure}
 			$customizedRulePath.Count | Should -Be $expectedNumRules
 		}
@@ -113,10 +109,6 @@ Describe "Test importing correct customized rules" {
 		It "will show the custom rules when given glob with recurse switch" {
 			# needs fixing for Linux
 			$expectedNumRules = 5
-			if ($IsLinux)
-			{
-				$expectedNumRules = 4
-			}
 			$customizedRulePath = Get-ScriptAnalyzerRule  -RecurseCustomRulePath -CustomizedRulePath $directory\samplerule\samplerule* | Where-Object {$_.RuleName -eq $measure}
 			$customizedRulePath.Count | Should -Be $expectedNumRules
 		}

diff --git a/tools/appveyor.psm1 b/tools/appveyor.psm1
@@ -36,6 +36,7 @@ function Invoke-AppVeyorInstall {
     Write-Verbose "& $buildScriptDir/build.ps1 -bootstrap"
     $buildScriptDir = (Resolve-Path "$PSScriptRoot/..").Path
     & "$buildScriptDir/build.ps1" -bootstrap
+    $Global:LASTEXITCODE = $LASTEXITCODE = 0 # needed to avoid a premature abortion of the AppVeyor Ubuntu build
 }
 
 # Implements AppVeyor 'test_script' step