Adjust generation scripts to explicitly choose the MSBuild engine

dougbu · dougbu · commit 9a182ac972f2 · 2020-05-25T21:46:37.000-07:00
diff --git a/eng/scripts/GenerateProjectList.ps1 b/eng/scripts/GenerateProjectList.ps1
@@ -3,6 +3,7 @@ param(
 )
 $ErrorActionPreference = 'stop'
 
+$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,6 +3,9 @@ param(
 )
 $ErrorActionPreference = 'stop'
 
+# GenAPI with `dotnet msbuild` doesn't consistently order attributes in Microsoft.AspNetCore.Mvc.TagHelpers.netcoreapp.cs
+$msbuildEngine = 'vs'
+
 $repoRoot = Resolve-Path "$PSScriptRoot/../.."
 
 & "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" `

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ param(`
`3`	`3`	`)`
`4`	`4`	`$ErrorActionPreference = 'stop'`
`5`	`5`
	`6`	`+$msbuildEngine = 'dotnet'`
`6`	`7`	`$repoRoot = Resolve-Path "$PSScriptRoot/../.."`
`7`	`8`
`8`	`9`	& "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" `
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@ param(`
`3`	`3`	`)`
`4`	`4`	`$ErrorActionPreference = 'stop'`
`5`	`5`
	`6`	+# GenAPI with `dotnet msbuild` doesn't consistently order attributes in Microsoft.AspNetCore.Mvc.TagHelpers.netcoreapp.cs
	`7`	`+$msbuildEngine = 'vs'`
	`8`	`+`
`6`	`9`	`$repoRoot = Resolve-Path "$PSScriptRoot/../.."`
`7`	`10`
`8`	`11`	& "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" `