Commit0e85dd1

authored

Merge pull requestdotnet#5494 from Microsoft/merges/dev15.8-to-dev15.9

Merge dev15.8 to dev15.9

2 parents632ebf1 +c55dd2c commit0e85dd1Copy full SHA for 0e85dd1

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -737,6 +737,8 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (`
`737`	`737`	`)`
`738`	`738`
`739`	`739`	`echo ---------------- Done with package restore, starting proto ------------------------`
	`740`	`+setlogdir=%~dp0%BUILD_CONFIG%\net40\`
	`741`	`+ifnotexist"!logdir!"mkdir"!logdir!"`
`740`	`742`
`741`	`743`	`rem Build Proto`
`742`	`744`	`if"%BUILD_PROTO%"=="1" (`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@`
`57`	`57`	`}`
`58`	`58`	`],`
`59`	`59`	`"exclude": [`
	`60`	`+"e_sqlite3.dll",`
`60`	`61`	`"FSharp.Core.4.5.2.nupkg",`
`61`	`62`	`"FSharp.Data.TypeProviders.dll",`
`62`	`63`	`"Microsoft.Build.Conversion.Core.dll",`

Comments

(0)