Adjust generation scripts to explicitly choose the MSBuild engine

dougbu · dougbu · commit c845813307b0 · 2020-05-26T13:07:44.000-07:00
- also ensure native assets are included in GenerateReferenceAssemblies.ps1 build
diff --git a/eng/scripts/GenerateProjectList.ps1 b/eng/scripts/GenerateProjectList.ps1
@@ -3,6 +3,8 @@ param(
 )
 $ErrorActionPreference = 'stop'
 
+Remove-Item variable:global:_BuildTool -ea Ignore
+$msbuildEngine = 'dotnet'
 $repoRoot = Resolve-Path "$PSScriptRoot/../.."
 
 & "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" `
diff --git a/eng/scripts/GenerateReferenceAssemblies.ps1 b/eng/scripts/GenerateReferenceAssemblies.ps1
@@ -3,8 +3,13 @@ param(
 )
 $ErrorActionPreference = 'stop'
 
+# GenAPI with `dotnet msbuild` doesn't consistently order attributes in Microsoft.AspNetCore.Mvc.TagHelpers.netcoreapp.cs
+$msbuildEngine = 'vs'
+
+Remove-Item variable:global:_BuildTool -ea Ignore
 $repoRoot = Resolve-Path "$PSScriptRoot/../.."
 
 & "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" `
     /t:GenerateReferenceSources `
-    /bl:artifacts/log/genrefassemblies.binlog
+    /bl:artifacts/log/genrefassemblies.binlog `
+    /p:BuildNative=true

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ param(`
`3`	`3`	`)`
`4`	`4`	`$ErrorActionPreference = 'stop'`
`5`	`5`
	`6`	`+Remove-Item variable:global:_BuildTool -ea Ignore`
	`7`	`+$msbuildEngine = 'dotnet'`
`6`	`8`	`$repoRoot = Resolve-Path "$PSScriptRoot/../.."`
`7`	`9`
`8`	`10`	& "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" `