Skip to content

Commit 25890f7

Browse files
dsymedsyme
committed
Merge pull request #567 from dsyme/integrate-7
Integrate visualfsharp/master --> fsharp/master
2 parents 7b91c18 + 90e5e33 commit 25890f7

File tree

232 files changed

+26620
-10474
lines changed

Some content is hidden

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

232 files changed

+26620
-10474
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
120120
src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
121121
src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
122122
vsintegration/src/unittests/Unittests.fsi
123+
vsintegration/src/FSharp.ProjectSystem.FSharp/ctofiles/MenusAndCommands.cto
123124
tests/*FSharp_Failures.env
124125
tests/*FSharp_Failures.lst
125126
tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
@@ -147,3 +148,4 @@ FSharp.Core.Nuget/*.nupkg
147148
*.ldf
148149
*.cto
149150
tests/**/FSharp.Core.dll
151+
project.lock.json

‎.nuget/NuGet.Config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
66
<packageSources>
7-
<add key="myget.org dotnet-corefx" value="https://www.myget.org/F/dotnet-corefx/" />
8-
<add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />
9-
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/" />
7+
8+
<clear />
9+
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
1010
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
11+
1112
</packageSources>
1213
</configuration>

‎.nuget/NuGet.exe‎

162 KB
Binary file not shown.

‎README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,9 @@ You can also build FSharp.Core.dll for other profiles:
147147
msbuild src\fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
148148
msbuild src\fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
149149
msbuild src\fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
150-
msbuild src\fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
151150

152151
msbuild src\fsharp-library-build.proj /p:TargetFramework=monodroid /p:Configuration=Release
153152
msbuild src\fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release
154-
msbuild src\fsharp-library-build.proj /p:TargetFramework=net40-xna40-xbox360 /p:Configuration=Release
155-
156-
You can also build the FSharp.Core and FSharp.Compiler.Silverlight.dll for Silverlight 5.0:
157-
158-
msbuild src\fsharp-library-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release
159153

160154
Change to ``` /p:Configuration=Debug``` for debug binaries.
161155

‎build-everything.proj‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
4+
<ItemGroup Condition="'$(BUILD_NET40)'=='1'">
5+
<ProjectsWithDefaultFramework Include="src/fsharp-library-build.proj" />
6+
<ProjectsWithDefaultFramework Include="src/fsharp-compiler-build.proj" />
7+
</ItemGroup>
8+
9+
<ItemGroup>
10+
<ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_NET40_COREUNIT)'=='1'" />
11+
<ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1'" />
12+
<ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj" Condition="'$(TEST_FSHARP_SUITE)'=='1'" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<ProjectsWithPortableFramework Include="src/fsharp-library-build.proj" Condition="'$(BUILD_PORTABLE)'=='1'"/>
17+
<ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1'" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition="'$(BUILD_VS)'=='1'">
21+
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
22+
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
23+
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
24+
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-deployment-build.proj" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1'" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
32+
<ProjectsWithCoreClr Include="src/fsharp-library-build.proj" />
33+
<ProjectsWithCoreClr Include="src/fsharp-compiler-build.proj" />
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1'" />
38+
</ItemGroup>
39+
40+
<Target Name="Build">
41+
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
42+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7" />
43+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47" />
44+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
45+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
46+
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
47+
</Target>
48+
49+
<Target Name="Rebuild">
50+
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
51+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7" />
52+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47" />
53+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
54+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
55+
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
56+
</Target>
57+
58+
<Target Name="Clean">
59+
<MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
60+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable7" />
61+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable47" />
62+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
63+
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
64+
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
65+
</Target>
66+
</Project>

‎build.bat‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,8 @@ set msbuildflags=/maxcpucount
1111
set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
1212
if not exist %_ngenexe% echo Note: Could not find ngen.exe.
1313

14-
::Clean
15-
del /F /S /Q lib\proto
16-
del /F /S /Q lib\release
17-
1814
::Build
1915

20-
set msbuildflags=/maxcpucount
21-
set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
22-
if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
23-
2416
%_ngenexe% install .\.nuget\NuGet.exe
2517

2618
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
@@ -29,17 +21,37 @@ if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure
2921
%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.0.1\tools\fsc.exe
3022

3123
%_msbuildexe% src\fsharp-proto-build.proj
24+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% src\fsharp-proto-build.proj" failed && goto :failure
25+
3226
%_ngenexe% install lib\proto\fsc-proto.exe
27+
3328
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release
29+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release" failed && goto :failure
30+
3431
%_msbuildexe% %msbuildflags% src\fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
32+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release" failed && goto :failure
33+
3534
%_msbuildexe% %msbuildflags% src\fsharp-compiler-build.proj /p:TargetFramework=net40 /p:Configuration=Release
35+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-compiler-build.proj /p:TargetFramework=net40 /p:Configuration=Release" failed && goto :failure
36+
3637
%_msbuildexe% %msbuildflags% src\fsharp-compiler-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
38+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-compiler-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release" failed && goto :failure
39+
3740
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
41+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release" failed && goto :failure
42+
3843
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
44+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release" failed && goto :failure
45+
3946
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
47+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release" failed && goto :failure
48+
4049
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
41-
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
50+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release" failed && goto :failure
51+
4252
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk
53+
@if ERRORLEVEL 1 echo Error: "%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk" failed && goto :failure
54+
4355

4456
@echo "Finished"
4557
goto :eof

‎configure.ac‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ src/fsharp/FSharp.Compiler/Makefile
164164
src/fsharp/Fsc/Makefile
165165
src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile
166166
src/fsharp/FSharp.Compiler.Server.Shared/Makefile
167-
src/fsharp/FSharp.Data.TypeProviders/Makefile
168167
src/fsharp/fsi/Makefile
169168
src/fsharp/fsiAnyCpu/Makefile
170169
src/fsharp/policy.2.0.FSharp.Core/Makefile

0 commit comments

Comments
 (0)