Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3111afb

Browse files
committed
Fixes to allow optional bootstrap using xbuild and loading compiler .fsproj into MonoDevelop
We can now bootstrap the compiler with xbuild, though it is not thedefaultThe compiler projec files can also be loaded into MonoDevelop though itis slow and blocks the UI often (too much garbage being produced? isMonoDevelop using SGEN?). Added an all-vs2010.sln which can be loadedinto MDThis removes .NET 2.0 as a target for the compiler binaries whcih makeseverything simpler (the library binaries for .NET 2.0 are stillcompiled)
1 parent665f986 commit3111afb

File tree

16 files changed

+225
-104
lines changed

16 files changed

+225
-104
lines changed

‎.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,15 @@ config.log
99
config.make
1010
config.status
1111

12+
13+
Debug/net40/bin/FSharp.Build.dll
14+
15+
Debug/net40/bin/FSharp.Build.xml
16+
17+
src/fsharp/FSharp.Compiler/illex.fs
18+
19+
src/fsharp/FSharp.Compiler/ilpars.fs
20+
21+
src/fsharp/FSharp.Compiler/lex.fs
22+
23+
src/fsharp/FSharp.Compiler/pars.fs

‎src/all-vs2010.sln‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Solution Items","Solution Items","{D78E3B57-DAD1-4FE1-9DC8-84F7847B0C77}"
5+
ProjectSection(SolutionItems) =preProject
6+
fsharp-compiler-build.proj=fsharp-compiler-build.proj
7+
fsharp-proto-build.proj=fsharp-proto-build.proj
8+
root.traversal.targets=root.traversal.targets
9+
source-build-version =source-build-version
10+
EndProjectSection
11+
EndProject
12+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="Fsc","fsharp\Fsc\Fsc.fsproj","{C94C257C-3C0A-4858-B5D8-D746498D1F08}"
13+
EndProject
14+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Compiler","fsharp\FSharp.Compiler\FSharp.Compiler.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
15+
EndProject
16+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Compiler.Silverlight","fsharp\FSharp.Compiler.Silverlight\FSharp.Compiler.Silverlight.fsproj","{a90a57be-c2bd-4cb9-87dc-c0d18820ff6b}"
17+
EndProject
18+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Core","fsharp\FSharp.Core\FSharp.Core.fsproj","{DED3BBD7-53F4-428A-8C9F-27968E768605}"
19+
EndProject
20+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Build","fsharp\FSharp.Build\FSharp.Build.fsproj","{702A7979-BCF9-4C41-853E-3ADFC9897890}"
21+
EndProject
22+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="Unittests","fsharp\unittests\Unittests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
23+
EndProject
24+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="Fsi","fsharp\fsi\Fsi.fsproj","{d0e98c0d-490b-4c61-9329-0862f6e87645}"
25+
EndProject
26+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Compiler.Interactive.Settings","fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj","{649FA588-F02E-457C-9FCF-87E46407481E}"
27+
EndProject
28+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Compiler.Server.Shared","fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj","{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}"
29+
EndProject
30+
Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") ="FSharp.Core.Unittests","fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
31+
EndProject
32+
Global
33+
GlobalSection(SolutionConfigurationPlatforms) =preSolution
34+
Debug|Any CPU=Debug|Any CPU
35+
Release|Any CPU=Release|Any CPU
36+
EndGlobalSection
37+
GlobalSection(ProjectConfigurationPlatforms) =postSolution
38+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
39+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.Build.0=Debug|Any CPU
40+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg=Release|Any CPU
41+
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0=Release|Any CPU
42+
{649FA588-F02E-457C-9FCF-87E46407481E}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
43+
{649FA588-F02E-457C-9FCF-87E46407481E}.Debug|Any CPU.Build.0=Debug|Any CPU
44+
{649FA588-F02E-457C-9FCF-87E46407481E}.Release|Any CPU.ActiveCfg=Release|Any CPU
45+
{649FA588-F02E-457C-9FCF-87E46407481E}.Release|Any CPU.Build.0=Release|Any CPU
46+
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
47+
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Debug|Any CPU.Build.0=Debug|Any CPU
48+
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Release|Any CPU.ActiveCfg=Release|Any CPU
49+
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Release|Any CPU.Build.0=Release|Any CPU
50+
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
51+
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.Build.0=Debug|Any CPU
52+
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.ActiveCfg=Release|Any CPU
53+
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
54+
{a90a57be-c2bd-4cb9-87dc-c0d18820ff6b}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
55+
{a90a57be-c2bd-4cb9-87dc-c0d18820ff6b}.Release|Any CPU.ActiveCfg=Release|Any CPU
56+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
57+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Debug|Any CPU.Build.0=Debug|Any CPU
58+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Release|Any CPU.ActiveCfg=Release|Any CPU
59+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Release|Any CPU.Build.0=Release|Any CPU
60+
{d0e98c0d-490b-4c61-9329-0862f6e87645}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
61+
{d0e98c0d-490b-4c61-9329-0862f6e87645}.Debug|Any CPU.Build.0=Debug|Any CPU
62+
{d0e98c0d-490b-4c61-9329-0862f6e87645}.Release|Any CPU.ActiveCfg=Release|Any CPU
63+
{d0e98c0d-490b-4c61-9329-0862f6e87645}.Release|Any CPU.Build.0=Release|Any CPU
64+
{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
65+
{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}.Debug|Any CPU.Build.0=Debug|Any CPU
66+
{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}.Release|Any CPU.ActiveCfg=Release|Any CPU
67+
{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}.Release|Any CPU.Build.0=Release|Any CPU
68+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
69+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.Build.0=Debug|Any CPU
70+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Release|Any CPU.ActiveCfg=Release|Any CPU
71+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Release|Any CPU.Build.0=Release|Any CPU
72+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
73+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|Any CPU.Build.0=Debug|Any CPU
74+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.ActiveCfg=Release|Any CPU
75+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.Build.0=Release|Any CPU
76+
EndGlobalSection
77+
GlobalSection(NestedProjects) =preSolution
78+
EndGlobalSection
79+
GlobalSection(MonoDevelopProperties) =preSolution
80+
StartupItem =fsharp\Fsc\Fsc.fsproj
81+
EndGlobalSection
82+
GlobalSection(SolutionProperties) =preSolution
83+
HideSolutionNode =FALSE
84+
EndGlobalSection
85+
EndGlobal

‎src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
<DefineConstants>BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
2424
<BuildWith>LKG</BuildWith>
2525
<ProjectGuid>{D8BC791F-C1A9-49DC-9432-0F3090537555}</ProjectGuid>
26-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v3.5</TargetFrameworkVersion>
26+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2727
</PropertyGroup>
28+
<!-- MonoDevelop likes these here to recognise the configurations-->
29+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'" />
30+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'" />
2831
<ItemGroup>
2932
<FsSrGenInclude="..\FSharp.Build\FSBuild.txt">
3033
</FsSrGen>
@@ -54,8 +57,6 @@
5457
<ReferenceInclude="System" />
5558
<ReferenceInclude="System.Numerics"Condition="'$(TargetFramework)' == 'net40'" />
5659
<ReferenceInclude="Microsoft.Build.Engine" />
57-
<ReferenceInclude="Microsoft.Build.Utilities.v3.5"Condition="'$(TargetFramework)' == 'net20'" />
58-
<ReferenceInclude="Microsoft.Build.Tasks.v3.5"Condition="'$(TargetFramework)' == 'net20'" />
5960
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
6061
<ReferenceInclude="Microsoft.Build.Framework"Condition="'$(TargetFramework)'=='net40'" />
6162
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

100755100644
Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
1414
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
15+
<ProductVersion>10.0.0</ProductVersion>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
<UsePartialTypes>False</UsePartialTypes>
1518
</PropertyGroup>
1619
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
1720
<PropertyGroup>
@@ -20,13 +23,15 @@
2023
<OutputType>Library</OutputType>
2124
<AssemblyName>FSharp.Build</AssemblyName>
2225
<AllowCrossTargeting>true</AllowCrossTargeting>
23-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v3.5</TargetFrameworkVersion>
2426
<ProjectGuid>{702A7979-BCF9-4C41-853E-3ADFC9897890}</ProjectGuid>
2527
</PropertyGroup>
28+
<!-- MonoDevelop likes these here to recognise the configurations-->
29+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'" />
30+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'" />
2631
<ItemGroup>
27-
<FsSrGenInclude="FSBuild.txt">
28-
<Link>FSBuild.txt</Link>
29-
</FsSrGen>
32+
<FsSrGenInclude="FSBuild.txt">
33+
<Link>FSBuild.txt</Link>
34+
</FsSrGen>
3035
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs">
3136
<Link>assemblyinfo.FSharp.Build.dll.fs</Link>
3237
</Compile>
@@ -40,26 +45,19 @@
4045
<CustomCopyLocalInclude="Microsoft.FSharp.targets">
4146
<TargetFilename>Microsoft.FSharp.targets</TargetFilename>
4247
</CustomCopyLocal>
43-
<ContentInclude="Microsoft.FSharp.targets">
44-
<SubType>Content</SubType>
45-
</Content>
4648
</ItemGroup>
4749
<ItemGroup>
4850
<ReferenceInclude="mscorlib" />
4951
<ReferenceInclude="System" />
50-
5152
<ReferenceInclude="Microsoft.Build.Engine" />
5253
<ReferenceInclude="Microsoft.Build.Framework" />
53-
<ReferenceInclude="Microsoft.Build.Utilities.v3.5"Condition="'$(TargetFramework)'=='net20'" />
54-
<ReferenceInclude="Microsoft.Build.Tasks.v3.5"Condition="'$(TargetFramework)'=='net20'" />
55-
56-
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
54+
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
5755
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />
5856
<ReferenceInclude="Microsoft.Build.Tasks.v4.0"Condition="'$(TargetFramework)'=='net40'" />
59-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
60-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
61-
<Name>FSharp.Core</Name>
62-
</ProjectReference>
57+
<ProjectReferenceInclude="..\FSharp.Core\FSharp.Core.fsproj">
58+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
59+
<Name>FSharp.Core</Name>
60+
</ProjectReference>
6361
</ItemGroup>
6462
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
65-
</Project>
63+
</Project>

‎src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828
<BuildWith>LKG</BuildWith>
2929
<AllowCrossTargeting>true</AllowCrossTargeting>
3030
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
31-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
31+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
3232
</PropertyGroup>
33+
<!-- MonoDevelop likes these here to recognise the configurations-->
34+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'" />
35+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'" />
3336
<ItemGroup>
3437
<FsSrGenInclude="..\FSComp.txt">
3538
<Link>FSComp.txt</Link>
@@ -430,8 +433,6 @@
430433
<ReferenceInclude="Microsoft.Build.Framework" />
431434
<ReferenceInclude="Microsoft.Build.Engine" />
432435
<ReferenceInclude="System.Numerics"Condition="'$(TargetFramework)' == 'net40'" />
433-
<ReferenceInclude="Microsoft.Build.Utilities"Condition="'$(TargetFramework)' == 'net20'" />
434-
<ReferenceInclude="Microsoft.Build.Tasks"Condition="'$(TargetFramework)' == 'net20'" />
435436
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(TargetFramework)'=='net40'" />
436437
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
437438
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />

‎src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj‎

100755100644
Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,28 @@
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
1414
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
15+
<ProductVersion>10.0.0</ProductVersion>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
<UsePartialTypes>False</UsePartialTypes>
1518
</PropertyGroup>
1619
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
1720
<PropertyGroup>
1821
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
1922
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
2023
<ProjectGuid>{649FA588-F02E-457C-9FCF-87E46407481E}</ProjectGuid>
2124
<OutputType>Library</OutputType>
25+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
2226
<DefineConstants>EXTENSIONTYPING;$(DefineConstants)</DefineConstants>
2327
<AssemblyName>FSharp.Compiler.Interactive.Settings</AssemblyName>
2428
<FileAlignment>512</FileAlignment>
2529
</PropertyGroup>
30+
<!-- MonoDevelop likes these here to recognise the configurations-->
31+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'" />
32+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'" />
2633
<ItemGroup>
27-
<FsSrGenInclude="..\FSInteractiveSettings.txt">
28-
<Link>FSInteractiveSettings.txt</Link>
29-
</FsSrGen>
34+
<FsSrGenInclude="..\FSInteractiveSettings.txt">
35+
<Link>FSInteractiveSettings.txt</Link>
36+
</FsSrGen>
3037
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs">
3138
<Link>assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs</Link>
3239
</Compile>
@@ -41,13 +48,12 @@
4148
</Compile>
4249
</ItemGroup>
4350
<ItemGroup>
44-
4551
<ReferenceInclude="mscorlib" />
4652
<ReferenceInclude="System" />
47-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
48-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
49-
<Name>FSharp.Core</Name>
50-
</ProjectReference>
51-
</ItemGroup>
53+
<ProjectReferenceInclude="..\FSharp.Core\FSharp.Core.fsproj">
54+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
55+
<Name>FSharp.Core</Name>
56+
</ProjectReference>
57+
</ItemGroup>
5258
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
53-
</Project>
59+
</Project>

‎src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj‎

100755100644
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
1414
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
15+
<ProductVersion>10.0.0</ProductVersion>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
<UsePartialTypes>False</UsePartialTypes>
1518
</PropertyGroup>
1619
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
1720
<PropertyGroup>
@@ -20,12 +23,14 @@
2023
<ProjectGuid>{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}</ProjectGuid>
2124
<OutputType>Library</OutputType>
2225
<AssemblyName>FSharp.Compiler.Server.Shared</AssemblyName>
23-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
2426
</PropertyGroup>
27+
<!-- MonoDevelop likes these here to recognise the configurations-->
28+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'" />
29+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'" />
2530
<ItemGroup>
26-
<FsSrGenInclude="..\fsiserver\FSServerShared.txt">
27-
<Link>FSServerShared.txt</Link>
28-
</FsSrGen>
31+
<FsSrGenInclude="..\fsiserver\FSServerShared.txt">
32+
<Link>FSServerShared.txt</Link>
33+
</FsSrGen>
2934
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs">
3035
<Link>assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs</Link>
3136
</Compile>
@@ -37,10 +42,10 @@
3742
<ReferenceInclude="mscorlib" />
3843
<ReferenceInclude="System" />
3944
<ReferenceInclude="System.Runtime.Remoting" />
40-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
41-
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
42-
<Name>FSharp.Core</Name>
43-
</ProjectReference>
45+
<ProjectReferenceInclude="..\FSharp.Core\FSharp.Core.fsproj">
46+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
47+
<Name>FSharp.Core</Name>
48+
</ProjectReference>
4449
</ItemGroup>
4550
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
4651
</Project>

‎src/fsharp/FSharp.Compiler.Silverlight/FSharp.Compiler.Silverlight.fsproj‎

100755100644
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<PropertyGroup>
44
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
55
<TargetFrameworkCondition="'$(TargetFramework)' == ''">sl5-compiler</TargetFramework>
6+
<ProductVersion>10.0.0</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<UsePartialTypes>False</UsePartialTypes>
69
</PropertyGroup>
710
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
811
<PropertyGroup>
@@ -477,14 +480,14 @@
477480
</Compile>
478481
</ItemGroup>
479482
<ItemGroup>
480-
<ProjectReferenceInclude="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
481-
<Project>{5ed79cd6-eda7-4052-972a-053d3e8391b6}</Project>
482-
<Name>FSharp.Core</Name>
483-
</ProjectReference>
484483
<ReferenceInclude="mscorlib" />
485484
<ReferenceInclude="System" />
486485
<ReferenceInclude="System.Core" />
487486
<ReferenceInclude="System.Windows" />
487+
<ProjectReferenceInclude="..\FSharp.Core\FSharp.Core.fsproj">
488+
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
489+
<Name>FSharp.Core</Name>
490+
</ProjectReference>
488491
</ItemGroup>
489492
<ImportProject="$(FSharpSourcesRoot)\FSharpTeam.targets"Condition=" Exists('$(FSharpSourcesRoot)\FSharpTeam.targets')" />
490493
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets"Condition=" !Exists('$(FSharpSourcesRoot)\FSharpTeam.targets')" />

‎src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313
<PropertyGroup>
1414
<FSharpSourcesRoot>..\..</FSharpSourcesRoot>
15+
<ProductVersion>10.0.0</ProductVersion>
16+
<SchemaVersion>2.0</SchemaVersion>
17+
<UsePartialTypes>False</UsePartialTypes>
1518
</PropertyGroup>
1619
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
1720
<PropertyGroup>
@@ -23,10 +26,12 @@
2326
<NoWarn>$(NoWarn);44;62;9</NoWarn>
2427
<ProjectGuid>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</ProjectGuid>
2528
<AllowCrossTargeting>true</AllowCrossTargeting>
26-
<TargetFrameworkVersionCondition="'$(TargetFramework)'=='net20'">v2.0</TargetFrameworkVersion>
2729
<BaseAddress>0x06800000</BaseAddress>
2830
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
2931
</PropertyGroup>
32+
<!-- MonoDevelop likes these here to recognise the configurations-->
33+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|x86'" />
34+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|x86'" />
3035
<ItemGroup>
3136
<FsSrGenInclude="..\FSComp.txt">
3237
<Link>FSComp.txt</Link>
@@ -500,8 +505,6 @@
500505
<ReferenceInclude="System.Runtime.Remoting" />
501506
<ReferenceInclude="Microsoft.Build.Framework" />
502507
<ReferenceInclude="Microsoft.Build.Engine" />
503-
<ReferenceInclude="Microsoft.Build.Utilities"Condition="'$(TargetFramework)'=='net20'" />
504-
<ReferenceInclude="Microsoft.Build.Tasks"Condition="'$(TargetFramework)'=='net20'" />
505508
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"Condition="'$(TargetFramework)'=='net40'" />
506509
<ReferenceInclude="Microsoft.Build"Condition="'$(TargetFramework)'=='net40'" />
507510
<ReferenceInclude="Microsoft.Build.Utilities.v4.0"Condition="'$(TargetFramework)'=='net40'" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp