Commit11391a5

dotnet-automerge-bot

authored

Merge pull requestdotnet#5669 from Microsoft/merges/dev15.9-to-dev16.0

Merge dev15.9 to dev16.0

2 parents39d9ed7 +7791976 commit11391a5Copy full SHA for 11391a5

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ folder "InstallDir:MSBuild\Microsoft\VisualStudio\v$(VSGeneralVersion)\FSharp"`
`7`	`7`	`file "Microsoft.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Shim.targets"`
`8`	`8`	`file "Microsoft.Portable.FSharp.targets" source="$(BinariesFolder)\setup\resources\Microsoft.Portable.FSharp.Shim.targets"`
`9`	`9`	`file "Microsoft.FSharp.NetSdk.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.targets"`
`10`		`- file "Microsoft.FSharp.NetSdk.Overrides.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Overrides.NetSdk.Shim.targets"`
	`10`	`+ file "Microsoft.FSharp.Overrides.NetSdk.targets" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.Overrides.NetSdk.Shim.targets"`
`11`	`11`	`file "Microsoft.FSharp.NetSdk.props" source="$(BinariesFolder)\setup\resources\Microsoft.FSharp.NetSdk.Shim.props"`
`12`	`12`
`13`	`13`	`folder "InstallDir:Common7\IDE\PublicAssemblies"`

Comments

(0)