File tree Expand file tree Collapse file tree 2 files changed +28
-4
lines changed Expand file tree Collapse file tree 2 files changed +28
-4
lines changed Original file line number Diff line number Diff line change 1
1
param (
2
2
[switch ]$ci
3
3
)
4
- $ErrorActionPreference = ' stop'
5
4
5
+ $ErrorActionPreference = ' stop'
6
+ $msbuildEngine = ' dotnet'
6
7
$repoRoot = Resolve-Path " $PSScriptRoot /../.."
7
8
8
- & " $repoRoot \eng\common\msbuild.ps1" - ci:$ci " $repoRoot /eng/CodeGen.proj" `
9
+ try {
10
+ & " $repoRoot \eng\common\msbuild.ps1" - ci:$ci " $repoRoot /eng/CodeGen.proj" `
9
11
/ t:GenerateProjectList `
10
12
/ bl:artifacts/ log/ genprojlist.binlog
13
+ } finally {
14
+ Remove-Item variable:global:_BuildTool - ErrorAction Ignore
15
+ Remove-Item variable:global:_DotNetInstallDir - ErrorAction Ignore
16
+ Remove-Item variable:global:_ToolsetBuildProj - ErrorAction Ignore
17
+ Remove-Item variable:global:_MSBuildExe - ErrorAction Ignore
18
+ }
Original file line number Diff line number Diff line change 1
1
param (
2
2
[switch ]$ci
3
3
)
4
- $ErrorActionPreference = ' stop'
5
4
5
+ $ErrorActionPreference = ' stop'
6
6
$repoRoot = Resolve-Path " $PSScriptRoot /../.."
7
7
8
- & " $repoRoot \eng\common\msbuild.ps1" - ci:$ci " $repoRoot /eng/CodeGen.proj" `
8
+ try {
9
+ # eng/common/msbuild.ps1 builds the Debug configuration unless there's a $Configuration variable. Match that here.
10
+ & " $repoRoot \build.ps1" - ci:$ci - nobl - buildNative - configuration Debug
11
+
12
+ Remove-Item variable:global:_BuildTool - ErrorAction Ignore
13
+ Remove-Item variable:global:_DotNetInstallDir - ErrorAction Ignore
14
+ Remove-Item variable:global:_ToolsetBuildProj - ErrorAction Ignore
15
+ Remove-Item variable:global:_MSBuildExe - ErrorAction Ignore
16
+
17
+ $msbuildEngine = ' dotnet'
18
+ & " $repoRoot \eng\common\msbuild.ps1" - ci:$ci " $repoRoot /eng/CodeGen.proj" `
9
19
/ t:GenerateReferenceSources `
10
20
/ bl:artifacts/ log/ genrefassemblies.binlog
21
+ } finally {
22
+ Remove-Item variable:global:_BuildTool - ErrorAction Ignore
23
+ Remove-Item variable:global:_DotNetInstallDir - ErrorAction Ignore
24
+ Remove-Item variable:global:_ToolsetBuildProj - ErrorAction Ignore
25
+ Remove-Item variable:global:_MSBuildExe - ErrorAction Ignore
26
+ }
You can’t perform that action at this time.
0 commit comments