Skip to content

Commit c5f583b

Browse files
committed
update config files
1 parent 5e14f78 commit c5f583b

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

FSharp.Compiler.Service.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 14
33
VisualStudioVersion = 14.0.24720.0
4-
VisualStudioVersion = 14.0.23107.0
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{B6B68AE6-E7A4-4D43-9B34-FFA74BFE192B}"
76
ProjectSection(SolutionItems) = preProject
@@ -54,11 +53,12 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.Tes
5453
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3} = {2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}
5554
EndProjectSection
5655
EndProject
57-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsc", "samples\FscExe\Fsc.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
56+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FscExe", "samples\FscExe\FscExe.fsproj", "{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
5857
EndProject
5958
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharp_Analysis", "tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj", "{887630A3-4B1D-40EA-B8B3-2D842E9C40DB}"
6059
EndProject
6160
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsiExe", "samples\FsiExe\FsiExe.fsproj", "{F9540CA8-1CE0-4546-A23A-A461E416E95B}"
61+
EndProject
6262
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.ProjectCrackerTool", "src\fsharp\FSharp.Compiler.Service.ProjectCrackerTool\FSharp.Compiler.Service.ProjectCrackerTool.fsproj", "{B1BDD96D-47E1-4E65-8107-FBAE23A06DB4}"
6363
EndProject
6464
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service.ProjectCracker", "src\fsharp\FSharp.Compiler.Service.ProjectCracker\FSharp.Compiler.Service.ProjectCracker.fsproj", "{893C3CD9-5AF8-4027-A667-21E62FC2C703}"
Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,24 @@
4242
<DocumentationFile>bin\Release\FsiExe.xml</DocumentationFile>
4343
<Prefer32Bit>true</Prefer32Bit>
4444
</PropertyGroup>
45+
<PropertyGroup>
46+
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
47+
</PropertyGroup>
48+
<PropertyGroup>
49+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
50+
</PropertyGroup>
51+
<PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
52+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
53+
</PropertyGroup>
54+
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
4555
<ItemGroup>
4656
<Compile Include="..\..\src\assemblyinfo\assemblyinfo.fsc.exe.fs">
4757
<Link>Resources/assemblyinfo.fsc.exe.fs</Link>
4858
</Compile>
4959
<Compile Include="FscMain.fs">
5060
<Link>Driver/FscMain.fs</Link>
5161
</Compile>
62+
<None Include="App.config" />
5263
</ItemGroup>
5364
<ItemGroup>
5465
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -62,19 +73,4 @@
6273
<Name>FSharp.Compiler.Service</Name>
6374
</ProjectReference>
6475
</ItemGroup>
65-
<ItemGroup>
66-
<Content Include="App.config">
67-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
68-
</Content>
69-
</ItemGroup>
70-
<PropertyGroup>
71-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
72-
</PropertyGroup>
73-
<PropertyGroup>
74-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
75-
</PropertyGroup>
76-
<PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
77-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
78-
</PropertyGroup>
79-
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
8076
</Project>

0 commit comments

Comments
 (0)