Skip to content

Commit c5131b2

Browse files
dsymedsyme
authored
Merge pull request #793 from dsyme/i10
Update FCS to latest
2 parents b2713c3 + 5ea194d commit c5131b2

File tree

397 files changed

+24962
-8124
lines changed

Some content is hidden

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

397 files changed

+24962
-8124
lines changed

‎.gitignore‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@
77
# (These aren't generally useful to commit directly; if anything, they should be applied.)
88
scripts/*.patch
99

10+
/fcs/FSharp.Compiler.Service/illex.fs
11+
/fcs/FSharp.Compiler.Service/ilpars.fs
12+
/fcs/FSharp.Compiler.Service/ilpars.fsi
13+
/fcs/FSharp.Compiler.Service/lex.fs
14+
/fcs/FSharp.Compiler.Service/pars.fs
15+
/fcs/FSharp.Compiler.Service/pars.fsi
16+
/fcs/FSharp.Compiler.Service/pplex.fs
17+
/fcs/FSharp.Compiler.Service/pppars.fs
18+
/fcs/FSharp.Compiler.Service/pppars.fsi
1019
/src/*.userprefs
1120
/src/fsharp/FSStrings.resources
1221
/src/fsharp/FSharp.Build/*.resx
@@ -21,29 +30,29 @@ scripts/*.patch
2130
/src/fsharp/FSharp.Compiler.Server.Shared/*.resx
2231
/src/fsharp/fsi/Fsi.sln
2332
/src/fsharp/FSharp.Build/*.resources
24-
/src/fsharp/FSharp.Compiler/*.resx
25-
/src/fsharp/FSharp.Compiler/*.resources
26-
/src/fsharp/FSharp.Compiler/*.sln
27-
/src/fsharp/FSharp.Compiler/*.userprefs
33+
/src/fsharp/FSharp.Compiler.Private/*.resx
34+
/src/fsharp/FSharp.Compiler.Private/*.resources
35+
/src/fsharp/FSharp.Compiler.Private/*.sln
36+
/src/fsharp/FSharp.Compiler.Private/*.userprefs
2837
/src/*.log
29-
/src/fsharp/FSharp.Compiler/illex.fs
30-
/src/fsharp/FSharp.Compiler/ilpars.fs
31-
/src/fsharp/FSharp.Compiler/ilpars.fsi
32-
/src/fsharp/FSharp.Compiler/lex.fs
33-
/src/fsharp/FSharp.Compiler/pars.fs
34-
/src/fsharp/FSharp.Compiler/pars.fsi
35-
/src/fsharp/FSharp.Compiler/pplex.fs
36-
/src/fsharp/FSharp.Compiler/pppars.fs
37-
/src/fsharp/FSharp.Compiler/pppars.fsi
38-
/src/fsharp/FSharp.Compiler-proto/illex.fs
39-
/src/fsharp/FSharp.Compiler-proto/ilpars.fs
40-
/src/fsharp/FSharp.Compiler-proto/ilpars.fsi
41-
/src/fsharp/FSharp.Compiler-proto/lex.fs
42-
/src/fsharp/FSharp.Compiler-proto/pars.fs
43-
/src/fsharp/FSharp.Compiler-proto/pars.fsi
44-
/src/fsharp/FSharp.Compiler-proto/pplex.fs
45-
/src/fsharp/FSharp.Compiler-proto/pppars.fs
46-
/src/fsharp/FSharp.Compiler-proto/pppars.fsi
38+
/src/fsharp/FSharp.Compiler.Private/illex.fs
39+
/src/fsharp/FSharp.Compiler.Private/ilpars.fs
40+
/src/fsharp/FSharp.Compiler.Private/ilpars.fsi
41+
/src/fsharp/FSharp.Compiler.Private/lex.fs
42+
/src/fsharp/FSharp.Compiler.Private/pars.fs
43+
/src/fsharp/FSharp.Compiler.Private/pars.fsi
44+
/src/fsharp/FSharp.Compiler.Private/pplex.fs
45+
/src/fsharp/FSharp.Compiler.Private/pppars.fs
46+
/src/fsharp/FSharp.Compiler.Private/pppars.fsi
47+
/src/fsharp/Fsc-proto/illex.fs
48+
/src/fsharp/Fsc-proto/ilpars.fs
49+
/src/fsharp/Fsc-proto/ilpars.fsi
50+
/src/fsharp/Fsc-proto/lex.fs
51+
/src/fsharp/Fsc-proto/pars.fs
52+
/src/fsharp/Fsc-proto/pars.fsi
53+
/src/fsharp/Fsc-proto/pplex.fs
54+
/src/fsharp/Fsc-proto/pppars.fs
55+
/src/fsharp/Fsc-proto/pppars.fsi
4756
/src/fsharp/FSharp.LanguageService.Compiler/illex.*
4857
/src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
4958
/src/fsharp/FSharp.LanguageService.Compiler/lex.*
@@ -65,6 +74,8 @@ scripts/*.patch
6574
/tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
6675
/tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.lst
6776
/tests/**/FSharp.Core.dll
77+
/tests/fsharp/optimize/stats/FSharpOptimizationInfo.FSharp.Core
78+
/tests/fsharp/optimize/stats/FSharpSignatureInfo.FSharp.Core
6879
lib/debug
6980
lib/release
7081
lib/proto

‎.nuget/NuGet.Config‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
4+
<solution>
5+
<add key="disableSourceControlIntegration" value="true" />
6+
</solution>
7+
<packageSources>
8+
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
9+
<clear />
10+
<add key="artifacts" value="../artifacts" />
11+
<add key="artifacts" value="../artifacts/4.2" />
12+
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
13+
<add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
14+
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
15+
<add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
16+
<add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
17+
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
18+
<add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
19+
<add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
20+
</packageSources>
21+
22+
</configuration>

‎.nuget/NuGet.exe‎

3.61 MB
Binary file not shown.

‎.nuget/NuGet.targets‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Enable the restore command to run before builds -->
7+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
8+
9+
<!-- Property that enables building a package from a project -->
10+
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
11+
12+
<!-- Determines if package restore consent is required to restore packages -->
13+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
14+
15+
<!-- Download NuGet.exe if it does not already exist -->
16+
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
17+
</PropertyGroup>
18+
19+
<ItemGroup Condition=" '$(PackageSources)' == '' ">
20+
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
21+
<!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
22+
<!--
23+
<PackageSource Include="https://www.nuget.org/api/v2/" />
24+
<PackageSource Include="https://my-nuget-source/nuget/" />
25+
-->
26+
</ItemGroup>
27+
28+
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
29+
<!-- Windows specific commands -->
30+
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31+
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32+
</PropertyGroup>
33+
34+
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
35+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
36+
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37+
<PackagesConfig>packages.config</PackagesConfig>
38+
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
39+
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
40+
</PropertyGroup>
41+
42+
<PropertyGroup>
43+
<!-- NuGet command -->
44+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
45+
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
46+
47+
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
48+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
49+
50+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
51+
52+
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
53+
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
54+
55+
<PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
56+
<PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
57+
58+
<!-- Commands -->
59+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
60+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
61+
62+
<!-- We need to ensure packages are restored prior to assembly resolve -->
63+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
64+
RestorePackages;
65+
$(BuildDependsOn);
66+
</BuildDependsOn>
67+
68+
<!-- Make the build depend on restore packages -->
69+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
70+
$(BuildDependsOn);
71+
BuildPackage;
72+
</BuildDependsOn>
73+
</PropertyGroup>
74+
75+
<Target Name="CheckPrerequisites">
76+
<!-- Raise an error if we're unable to locate nuget.exe -->
77+
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
78+
<!--
79+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
80+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
81+
parallel builds will have to wait for it to complete.
82+
-->
83+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
84+
</Target>
85+
86+
<Target Name="_DownloadNuGet">
87+
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
88+
</Target>
89+
90+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
91+
<Exec Command="$(RestoreCommand)"
92+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
93+
94+
<Exec Command="$(RestoreCommand)"
95+
LogStandardErrorAsError="true"
96+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
97+
</Target>
98+
99+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
100+
<Exec Command="$(BuildCommand)"
101+
Condition=" '$(OS)' != 'Windows_NT' " />
102+
103+
<Exec Command="$(BuildCommand)"
104+
LogStandardErrorAsError="true"
105+
Condition=" '$(OS)' == 'Windows_NT' " />
106+
</Target>
107+
108+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
109+
<ParameterGroup>
110+
<OutputFilename ParameterType="System.String" Required="true" />
111+
</ParameterGroup>
112+
<Task>
113+
<Reference Include="System.Core" />
114+
<Using Namespace="System" />
115+
<Using Namespace="System.IO" />
116+
<Using Namespace="System.Net" />
117+
<Using Namespace="Microsoft.Build.Framework" />
118+
<Using Namespace="Microsoft.Build.Utilities" />
119+
<Code Type="Fragment" Language="cs">
120+
<![CDATA[
121+
try {
122+
OutputFilename = Path.GetFullPath(OutputFilename);
123+
124+
Log.LogMessage("Downloading latest version of NuGet.exe...");
125+
WebClient webClient = new WebClient();
126+
webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
127+
128+
return true;
129+
}
130+
catch (Exception ex) {
131+
Log.LogErrorFromException(ex);
132+
return false;
133+
}
134+
]]>
135+
</Code>
136+
</Task>
137+
</UsingTask>
138+
</Project>

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sudo: false
1616
install:
1717

1818
script:
19-
- ./build.sh NuGet
19+
- ./fcs/build.sh NuGet
2020

2121
# Fails on Travis OSX too often because there are network outages on that configuration getting the Mono MDK
2222

‎CHANGELOG-fsharp.md‎

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

0 commit comments

Comments
 (0)