Skip to content

Commit c88c98a

Browse files
committed
Miscellaneous cleanup
* Fix a garbled comment * Remove redundant -BuildTests flag (implied by -RunTests) * Ignore test residue
1 parent df33819 commit c88c98a

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/base-installer-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
id: build_and_test
157157
shell: powershell
158158
run: |
159-
.\build.ps1 -BuildInstaller -Configuration Release -Verbosity detailed -BuildTests -RunTests -TestFilter 'TestCategory!=DesktopRequired' -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log
159+
.\build.ps1 -BuildInstaller -Configuration Release -Verbosity detailed -RunTests -TestFilter 'TestCategory!=DesktopRequired' -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log
160160
161161
- name: Scan Build Output
162162
shell: powershell

.github/workflows/patch-installer-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
shell: powershell
226226
run: |
227227
Get-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\.NETFramework\AppContext"
228-
.\build.ps1 -BuildPatch -Configuration Release -Verbosity detailed -BuildTests -RunTests -TestFilter 'TestCategory!=DesktopRequired' -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log
228+
.\build.ps1 -BuildPatch -Configuration Release -Verbosity detailed -RunTests -TestFilter 'TestCategory!=DesktopRequired' -MsBuildArgs @("/bl") | Tee-Object -FilePath build.log
229229
230230
- name: Scan Build Output
231231
shell: powershell

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ _user.mak.lnx
6363
*.usertasks
6464
*.resources
6565
*.bak
66+
*.fwdata.lock
6667
*.swp
6768
*.pyc
6869
*.log

build.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ if ($Configuration -eq 'Release' -and -not $isGitHubActions) {
197197
}
198198
}
199199

200-
# ===========ed Module
200+
# =============================================================================
201+
# Import FwBuildHelpers Module (for building build tasks)
201202
# =============================================================================
202203

203204
$helpersPath = Join-Path $PSScriptRoot "Build/Agent/FwBuildHelpers.psm1"
@@ -610,7 +611,7 @@ try {
610611
Invoke-MSBuild `
611612
-Arguments (@('Build/InstallerBuild.proj', "/t:Build$BaseOrPatch", '/p:config=release', "/p:InstallerToolset=$InstallerToolset", $installerCleanArg) + `
612613
$InstallerMsBuildArgs) `
613-
-Description '$BaseOrPatch Build' `
614+
-Description "$BaseOrPatch Build" `
614615
-LogPath $LogFile `
615616
-TailLines $TailLines
616617

0 commit comments

Comments
 (0)