Commitd966d6d

authored

Merge pull requestdotnet#4613 from Microsoft/master

merge master to dev15.7

2 parents57a588a +65d87f0 commitd966d6dCopy full SHA for d966d6d

File tree

+2893

-2278

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+2893

-2278

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",`
`33`	`33`	`"net40\\bin\\FSharp.ProjectSystem.FSharp.dll",`
`34`	`34`	`"net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",`
	`35`	`+"net40\\bin\\PatternMatcher.dll",`
`35`	`36`	`"coreclr\\bin\\FSharp.Core.dll",`
`36`	`37`	`"coreclr\\bin\\*\\FSharp.Core.resources.dll",`
`37`	`38`	`"coreclr\\bin\\FSharp.Build.dll",`
`@@ -65,9 +66,10 @@`
`65`	`66`	`"Microsoft.DiaSymReader.dll",`
`66`	`67`	`"Microsoft.DiaSymReader.PortablePdb.dll",`
`67`	`68`	`"Newtonsoft.Json.dll",`
`68`		`-"System.ValueTuple.4.4.0.nupkg",`
`69`	`69`	`"System.Collections.Immutable.dll",`
`70`	`70`	`"System.Reflection.Metadata.dll",`
	`71`	`+"System.ValueTuple.4.3.1.nupkg",`
	`72`	`+"System.ValueTuple.4.4.0.nupkg",`
`71`	`73`	`"System.ValueTuple.dll"`
`72`	`74`	`]`
`73`	`75`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ let isMono = false`
`24`	`24`	`// Utilities`
`25`	`25`	`// --------------------------------------------------------------------------------------`
`26`	`26`
`27`		`-letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.4"`
	`27`	`+letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.100"`
`28`	`28`
`29`	`29`	`letrunDotnet workingDir args=`
`30`	`30`	`letresult=`

Lines changed: 297 additions & 158 deletions

Large diffs are not rendered by default.

Comments

(0)