Merge branch 'master' into merge-v5.1-into-openapi

bkoelman · bkoelman · commit ac6a210415d8 · 2022-11-09T12:09:07.000+01:00
diff --git a/Build.ps1 b/Build.ps1
@@ -114,7 +114,7 @@ dotnet build -c Release
 CheckLastExitCode
 
 # https://youtrack.jetbrains.com/issue/RSRP-488628/Breaking-InspectCode-fails-with-Roslyn-Worker-process-exited-unexpectedly-after-update
-if ($env:APPVEYOR_BUILD_WORKER_IMAGE -ne 'Ubuntu') {
+if ($IsWindows) {
     RunInspectCode
     RunCleanupCode
 }
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 image:
-  - Ubuntu
+  - Ubuntu2004
   - Visual Studio 2022
 
 version: '{build}'

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ dotnet build -c Release`
`114`	`114`	`CheckLastExitCode`
`115`	`115`
`116`	`116`	`# https://youtrack.jetbrains.com/issue/RSRP-488628/Breaking-InspectCode-fails-with-Roslyn-Worker-process-exited-unexpectedly-after-update`
`117`		`-if ($env:APPVEYOR_BUILD_WORKER_IMAGE -ne 'Ubuntu') {`
	`117`	`+if ($IsWindows) {`
`118`	`118`	`RunInspectCode`
`119`	`119`	`RunCleanupCode`
`120`	`120`	`}`