Skip to content

Commit f234a8e

Browse files
Merge pull request #1915 from PowerShell/andschwa/codeql
Change CI build script to only build
2 parents 5ddc688 + 294f1c3 commit f234a8e

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

.vsts-ci/templates/ci-general.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,18 @@ steps:
2626
performMultiLevelLookup: true
2727

2828
- task: PowerShell@2
29-
displayName: Build and test
29+
displayName: Build
3030
inputs:
3131
filePath: tools/azurePipelinesBuild.ps1
3232
pwsh: ${{ parameters.pwsh }}
3333

34+
- task: PowerShell@2
35+
displayName: Test
36+
inputs:
37+
targetType: inline
38+
script: Invoke-Build Test
39+
pwsh: ${{ parameters.pwsh }}
40+
3441
- task: PublishTestResults@2
3542
displayName: Publish test results
3643
inputs:

PowerShellEditorServices.build.ps1

+5-4
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,16 @@ Task SetupHelpForTests {
161161
}
162162

163163
Task Build FindDotNet, CreateBuildInfo, {
164+
# NOTE: We use /p:UseSharedCompilation=false to work around a bug with CodeQL.
164165
Exec { & dotnet restore $VerbosityArgs }
165-
Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
166-
Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
166+
Exec { & dotnet publish /p:UseSharedCompilation=false $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
167+
Exec { & dotnet publish /p:UseSharedCompilation=false $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.PS7 }
167168
if (-not $script:IsNix) {
168-
Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
169+
Exec { & dotnet publish /p:UseSharedCompilation=false $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Desktop }
169170
}
170171

171172
# Build PowerShellEditorServices.VSCode module
172-
Exec { & dotnet publish $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetRuntime.Standard }
173+
Exec { & dotnet publish /p:UseSharedCompilation=false $VerbosityArgs -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj -f $script:NetRuntime.Standard }
173174
}
174175

175176
Task Test TestServer, TestE2E

tools/azurePipelinesBuild.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Update-Help -Force -ErrorAction SilentlyContinue
2020
Install-Module -Name InvokeBuild -RequiredVersion 5.9.7 -Scope CurrentUser -Force
2121
Install-Module -Name platyPS -RequiredVersion 0.14.2 -Scope CurrentUser -Force
2222

23-
Invoke-Build -Configuration Release
23+
Invoke-Build -Configuration Release Build

0 commit comments

Comments
 (0)