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

Commit8b80426

Browse files
authored
allow build of FCS nuget package within this repo (#3480)
* allow build of community FCS nuget pacakge from this repo* fix build of vs tests* build fcs nupkg* clean project files* build all FCS bits, incl right dependencies* fcs nuget updates* netstandard is not netcore* make FCS tests pass* make FCS tests pass* revert unintended change* fix build of FCS docs* remove explicit codegen from fcs .NETStandard build* remove explicit codegen from fcs .NETStandard build* add version numbers to DLLs* missing file* remove duplicate package
1 parentc0bf278 commit8b80426

File tree

333 files changed

+15051
-861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+15051
-861
lines changed

‎before_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi)
5858
fi)
5959

6060
#TODO: work out how to avoid the need for this
61-
chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe
61+
chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe
6262
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
6363
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
6464

‎build-everything.proj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737

3838
<ItemGroupCondition="'$(BUILD_FCS)'=='1'">
3939
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj" />
40+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj" />
41+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj" />
42+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj" />
43+
<ProjectsWithNet40Include="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
4044
</ItemGroup>
4145

4246
<ItemGroupCondition="'$(BUILD_SETUP)'=='1'">

‎build.cmd‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
554554
setNUGET_PACKAGES=%~dp0Packages
555555
setpath=%~dp0Tools\dotnet20\;%path%
556556

557-
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.5\tools\fsi.exe"
557+
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.23\tools\fsi.exe"
558558
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
559559
%_ngenexe% install%_fsiexe% /nologo
560560

@@ -592,8 +592,8 @@ if "%BUILD_PROTO%" == "1" (
592592

593593
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="0" (
594594

595-
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe /nologo
596-
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.5\tools\fsc.exe /nologo
595+
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo
596+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.23\tools\fsc.exe /nologo
597597

598598
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
599599
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
@@ -614,10 +614,11 @@ if "%BUILD_PHASE%" == "1" (
614614
@if ERRORLEVEL1echo Error build failed&&goto :failure
615615
)
616616

617-
echo ---------------- Done with build, starting update/prepare ---------------
617+
echo ---------------- Done with build, startingpack/update/prepare ---------------
618618

619619
if"%BUILD_NET40_FSHARP_CORE%"=="1" (
620-
call src\update.cmd%BUILD_CONFIG% -ngen
620+
echo ---------------- start update.cmd ---------------
621+
call src\update.cmd%BUILD_CONFIG% -ngen
621622
)
622623

623624
@echo set NUNITPATH=packages\NUnit.Console.3.0.0\tools\

‎fcs/.paket/paket.bootstrapper.exe‎

27.5 KB
Binary file not shown.
Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
# Copyright (c) 2002-2011 Microsoft Corporation.
4-
#
5-
#
6-
#
7-
#
8-
#
9-
#
10-
# You must not remove this notice, or any other, from this software.
3+
# Copyright (c) 2002-2011 Microsoft Corporation. You must not remove this notice, or any other, from this software.
114
-->
125
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
8+
</PropertyGroup>
9+
<ImportProject="..\fcs.props" />
1310
<PropertyGroup>
1411
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
1512
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
@@ -19,26 +16,23 @@
1916
<NoWarn>$(NoWarn);44;62;9</NoWarn>
2017
<ProjectGuid>{8157b50e-397d-4232-a4e0-1977afc7076d}</ProjectGuid>
2118
<AllowCrossTargeting>true</AllowCrossTargeting>
22-
<TargetFrameworkVersionCondition=" '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
2319
<BaseAddress>0x06800000</BaseAddress>
24-
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
2520
<Tailcalls>true</Tailcalls>
2621
<FsLexUnicode>true</FsLexUnicode>
2722
<OtherFlags>$(OtherFlags) --times</OtherFlags>
2823
<NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
2924
<DebugSymbols>true</DebugSymbols>
30-
<OutputPath>..\..\..\bin\$(TargetFrameworkVersion)</OutputPath>
31-
<DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
32-
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
33-
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
34-
<DefineConstantsCondition="$(TargetFrameworkVersion) == 'v4.5'">$(DefineConstants);FX_ATLEAST_45</DefineConstants>
35-
<DefineConstants>$(DefineConstants);FX_ATLEAST_40</DefineConstants>
36-
<DefineConstants>$(DefineConstants);FX_MSBUILDRESOLVER_RUNTIMELIKE</DefineConstants>
37-
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
25+
<OutputPath>..\..\$(Configuration)\fcs\net45\</OutputPath>
3826
<TargetFrameworkProfile />
3927
<ResolveNuGetPackages>false</ResolveNuGetPackages>
4028
<Prefer32Bit>true</Prefer32Bit>
4129
<PlatformTarget>AnyCPU</PlatformTarget>
30+
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
31+
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
32+
<OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
33+
<OtherFlags>$(OtherFlags) --version:$(VersionPrefix).0</OtherFlags>
34+
<!-- We target .NET 4.5 for FSharp.Compiler.Service.dll to allow broader use of this DLL-->
35+
<TargetFrameworkVersionCondition=" '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
4236
</PropertyGroup>
4337
<!-- MonoDevelop likes these here to recognise the configurations-->
4438
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -50,13 +44,7 @@
5044
<Optimize>true</Optimize>
5145
</PropertyGroup>
5246
<ItemGroup>
53-
<CompileInclude="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.MSBuild.v12.dll.fs">
54-
<Link>AssemblyInfo/assemblyinfo.FSharp.Compiler.Service.MSBuild.v12.dll.fs</Link>
55-
</Compile>
56-
<CompileInclude="..\..\assemblyinfo\assemblyinfo.shared.fs"Condition="Exists('..\..\assemblyinfo\assemblyinfo.shared.fs')">
57-
<Link>AssemblyInfo/assemblyinfo.shared.fs</Link>
58-
</Compile>
59-
<CompileInclude="..\MSBuildReferenceResolver.fs">
47+
<CompileInclude="..\..\src\fsharp\MSBuildReferenceResolver.fs">
6048
<Link>Service/MSBuildReferenceResolver.fs</Link>
6149
</Compile>
6250
</ItemGroup>
@@ -68,35 +56,37 @@
6856
<ReferenceInclude="System.Runtime.Serialization" />
6957
<ReferenceInclude="System.Xml" />
7058
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
71-
<Private>True</Private>
59+
<HintPath>$(FSharpSourcesRoot)/../fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Framework.dll</HintPath>
60+
<Private>false</Private>
7261
</Reference>
7362
<ReferenceInclude="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
74-
<Private>True</Private>
63+
<HintPath>$(FSharpSourcesRoot)/../fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Engine.dll</HintPath>
64+
<Private>false</Private>
7565
</Reference>
7666
<ReferenceInclude="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
77-
<Private>True</Private>
67+
<HintPath>$(FSharpSourcesRoot)/../fcs/dependencies/MSBuild.v12.0/Microsoft.Build.dll</HintPath>
68+
<Private>false</Private>
7869
</Reference>
7970
<ReferenceInclude="Microsoft.Build.Utilities.v12.0">
80-
<Private>True</Private>
71+
<HintPath>$(FSharpSourcesRoot)/../fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Utilities.v12.0.dll</HintPath>
72+
<Private>false</Private>
8173
</Reference>
8274
<ReferenceInclude="Microsoft.Build.Tasks.v12.0">
83-
<Private>True</Private>
75+
<HintPath>$(FSharpSourcesRoot)/../fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Tasks.v12.0.dll</HintPath>
76+
<Private>false</Private>
8477
</Reference>
85-
<ReferenceInclude="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
86-
<Private>False</Private>
78+
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
79+
<ReferenceInclude="FSharp.Core">
80+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
81+
<Private>false</Private>
8782
</Reference>
83+
</ItemGroup>
84+
<ItemGroup>
8885
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
8986
<Name>FSharp.Compiler.Service</Name>
9087
<Project>{2e4d67b4-522d-4cf7-97e4-ba940f0b18f3}</Project>
9188
<Private>True</Private>
9289
</ProjectReference>
9390
</ItemGroup>
94-
<PropertyGroup>
95-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
96-
</PropertyGroup>
97-
<PropertyGroupCondition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
98-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
99-
</PropertyGroup>
100-
<ImportProject="$(FSharpTargetsPath)"Condition="Exists('$(FSharpTargetsPath)')" />
101-
<ImportProject="$(SolutionDir)\.paket\paket.targets" />
91+
<ImportProject="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
10292
</Project>
Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,54 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectToolsVersion="12.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
3+
<PropertyGroup>
4+
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\src</FSharpSourcesRoot>
5+
</PropertyGroup>
6+
<ImportProject="..\fcs.props" />
47
<PropertyGroup>
58
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
69
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
710
<SolutionDirCondition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\..\..\</SolutionDir>
811
<SchemaVersion>2.0</SchemaVersion>
912
<ProjectGuid>893c3cd9-5af8-4027-a667-21e62fc2c703</ProjectGuid>
10-
<OutputType>Library</OutputType>
1113
<RootNamespace>FSharp.Compiler.Service.ProjectCracker</RootNamespace>
1214
<AssemblyName>FSharp.Compiler.Service.ProjectCracker</AssemblyName>
13-
<TargetFrameworkVersionCondition=" '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
14-
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1515
<Name>FSharp.Compiler.Service.ProjectCracker</Name>
16-
<OutputPath>..\..\..\bin\$(TargetFrameworkVersion)</OutputPath>
17-
<DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.ProjectCracker.xml</DocumentationFile>
16+
<OutputType>Library</OutputType>
17+
<OutputPath>..\..\$(Configuration)\fcs\net45\</OutputPath>
18+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1819
<ResolveNuGetPackages>false</ResolveNuGetPackages>
20+
<!-- We target .NET 4.5 for FSharp.Compiler.Service.dll to allow broader use of this DLL-->
21+
<TargetFrameworkVersionCondition=" '$(TargetFrameworkVersion)' == ''">v4.5</TargetFrameworkVersion>
22+
<Prefer32Bit>true</Prefer32Bit>
23+
<PlatformTarget>AnyCPU</PlatformTarget>
24+
<WarningLevel>3</WarningLevel>
25+
<OtherFlags>$(OtherFlags) --version:$(VersionPrefix).0</OtherFlags>
1926
</PropertyGroup>
2027
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2128
<DebugSymbols>true</DebugSymbols>
2229
<DebugType>full</DebugType>
2330
<Optimize>false</Optimize>
2431
<Tailcalls>false</Tailcalls>
2532
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<WarningLevel>3</WarningLevel>
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<Prefer32Bit>true</Prefer32Bit>
2933
</PropertyGroup>
3034
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
3135
<DebugType>pdbonly</DebugType>
3236
<Optimize>true</Optimize>
3337
<Tailcalls>true</Tailcalls>
3438
<DefineConstants>TRACE</DefineConstants>
35-
<WarningLevel>3</WarningLevel>
36-
<PlatformTarget>AnyCPU</PlatformTarget>
37-
<Prefer32Bit>true</Prefer32Bit>
3839
</PropertyGroup>
3940
<ItemGroup>
4041
<ReferenceInclude="mscorlib" />
41-
<ReferenceInclude="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
42-
<Private>False</Private>
43-
</Reference>
4442
<ReferenceInclude="System" />
4543
<ReferenceInclude="System.Core" />
4644
<ReferenceInclude="System.Numerics" />
4745
<ReferenceInclude="System.Runtime.Serialization" />
4846
<ReferenceInclude="System.Xml" />
47+
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
48+
<ReferenceInclude="FSharp.Core">
49+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.4.1.20\lib\profiles\net40\FSharp.Core.dll</HintPath>
50+
<Private>false</Private>
51+
</Reference>
4952
</ItemGroup>
5053
<ItemGroup>
5154
<CompileInclude="..\FSharp.Compiler.Service.ProjectCrackerTool\ProjectCrackerOptions.fs">
@@ -60,5 +63,5 @@
6063
<Private>True</Private>
6164
</ProjectReference>
6265
</ItemGroup>
63-
<ImportProject="$(SolutionDir)\packages\FSharp.Compiler.Tools\tools\Microsoft.FSharp.Targets" />
66+
<ImportProject="$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.23\tools\Microsoft.FSharp.Targets" />
6467
</Project>

‎fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.netcore.fsproj‎

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

‎fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ type ProjectCracker =
4141
LoadTime= loadedTimeStamp
4242
UnresolvedReferences= None
4343
OriginalLoadReferences=[]
44-
ExtraProjectInfo= None}
44+
ExtraProjectInfo= None
45+
Stamp= None}
4546

4647
#if NETSTANDARD1_6
4748
letarguments=[|

0 commit comments

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