Commit68cd2bb

committed

converge compiler DLLs

1 parent1cf901a commit68cd2bbCopy full SHA for 68cd2bb

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@`
`57`	`57`	`<ReferenceInclude="mscorlib" />`
`58`	`58`	`<ReferenceInclude="System" />`
`59`	`59`	`</ItemGroup>`
	`60`	`+`
	`61`	`+ <ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
	`62`	`+`
`60`	`63`	`<ItemGroup>`
`61`	`64`	`<ProjectReferenceInclude="..\FSharp.Compiler.Service.Private\FSharp.Compiler.Service.Private.fsproj">`
`62`	`65`	`<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>`
`@@ -105,8 +108,6 @@`
`105`	`108`	`</Otherwise>`
`106`	`109`	`</Choose>`
`107`	`110`
`108`		`- <ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
`109`		`-`
`110`	`111`
`111`	`112`	`<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">`
`112`	`113`	`<ItemGroup>`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@`
`55`	`55`	`<ItemGroupCondition="'$(TargetFramework)' == 'coreclr'">`
`56`	`56`	`<NoneInclude="project.json" />`
`57`	`57`	`</ItemGroup>`
	`58`	`+`
	`59`	`+ <ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
	`60`	`+`
`58`	`61`	`<ItemGroupCondition="'$(TargetFramework)' != 'coreclr'">`
`59`	`62`	`<ReferenceInclude="mscorlib" />`
`60`	`63`	`<ReferenceInclude="System" />`
`@@ -119,7 +122,6 @@`
`119`	`122`	`</Otherwise>`
`120`	`123`	`</Choose>`
`121`	`124`
`122`		`- <ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
`123`	`125`	`<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">`
`124`	`126`	`<ItemGroup>`
`125`	`127`	`<BinariesToBeSignedInclude="$(OutDir)$(AssemblyName).exe" />`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`<Link>fsiAnyCpu.exe.config</Link>`
`49`	`49`	`</None>`
`50`	`50`	`</ItemGroup>`
	`51`	`+ <ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
`51`	`52`	`<ItemGroup>`
`52`	`53`	`<ReferenceInclude="mscorlib" />`
`53`	`54`	`<ReferenceInclude="System" />`
`@@ -108,7 +109,6 @@`
`108`	`109`	`</Otherwise>`
`109`	`110`	`</Choose>`
`110`	`111`
`111`		`- <ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />`
`112`	`112`	`<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize"Condition="'$(UseGatherBinaries)' == 'true'">`
`113`	`113`	`<ItemGroup>`
`114`	`114`	`<BinariesToBeSignedInclude="$(OutDir)$(AssemblyName).exe" />`

Comments

(0)