Skip to content

Commit f777b1f

Browse files
committed
onuy MSBuildv12
1 parent 0bf1ac4 commit f777b1f

14 files changed

+247
-423
lines changed

FSharp.Compiler.Service.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{9020
8383
EndProject
8484
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.MSBuild.v12", "src\fsharp\FSharp.Compiler.Service.MSBuild.v12\FSharp.Compiler.Service.MSBuild.v12.fsproj", "{8157B50E-397D-4232-A4E0-1977AFC7076D}"
8585
EndProject
86-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.MSBuild.v14", "src\fsharp\FSharp.Compiler.Service.MSBuild.v14\FSharp.Compiler.Service.MSBuild.v14.fsproj", "{43393416-DA88-4286-8D5A-3D2BB3686BBA}"
87-
EndProject
8886
Global
8987
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9088
Debug|Any CPU = Debug|Any CPU
@@ -233,18 +231,6 @@ Global
233231
{8157B50E-397D-4232-A4E0-1977AFC7076D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
234232
{8157B50E-397D-4232-A4E0-1977AFC7076D}.Release|x86.ActiveCfg = Release|Any CPU
235233
{8157B50E-397D-4232-A4E0-1977AFC7076D}.Release|x86.Build.0 = Release|Any CPU
236-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
237-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
238-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
239-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
240-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Debug|x86.ActiveCfg = Debug|Any CPU
241-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Debug|x86.Build.0 = Debug|Any CPU
242-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
243-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Release|Any CPU.Build.0 = Release|Any CPU
244-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
245-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
246-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Release|x86.ActiveCfg = Release|Any CPU
247-
{43393416-DA88-4286-8D5A-3D2BB3686BBA}.Release|x86.Build.0 = Release|Any CPU
248234
EndGlobalSection
249235
GlobalSection(SolutionProperties) = preSolution
250236
HideSolutionNode = FALSE

nuget/FSharp.Compiler.Service.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ files
2020
../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
2121
../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
2222
../bin/v4.5/FSharp.Compiler.Service.MSBuild.v12.dll ==> lib/net45
23-
../bin/v4.5/FSharp.Compiler.Service.MSBuild.v14.dll ==> lib/net45
2423
dependencies
2524
System.Collections.Immutable >= LOCKEDVERSION
2625
System.Reflection.Metadata >= LOCKEDVERSION

src/fsharp/FSharp.Compiler.Service.MSBuild.v14/FSharp.Compiler.Service.MSBuild.v14.fsproj

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/fsharp/FSharp.Compiler.Service.MSBuild.v14/project.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,9 @@
604604
<Compile Include="..\..\utils\reshapedmsbuild.fs">
605605
<Link>Service/reshapedmsbuild.fs</Link>
606606
</Compile>
607+
<Compile Include="..\SimulatedMSBuildReferenceResolver.fs">
608+
<Link>Service/SimulatedMSBuildReferenceResolver.fs</Link>
609+
</Compile>
607610
<Compile Include="..\vs\service.fsi">
608611
<Link>Service/service.fsi</Link>
609612
</Compile>

src/fsharp/FSharp.Compiler.Service/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
"../vs/ServiceUntypedParse.fsi",
168168
"../vs/ServiceUntypedParse.fs",
169169
"../../utils/reshapedmsbuild.fs",
170-
"../MSBuildReferenceResolver.fs",
170+
"../SimulatedMSBuildReferenceResolver.fs",
171171
"../vs/service.fsi",
172172
"../vs/service.fs",
173173
"../vs/SimpleServices.fsi",

0 commit comments

Comments
 (0)