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

Commit63db27c

Browse files
authored
Merge pull requestfsharp#801 from dsyme/i2
integrate visualfsharp master
2 parentsf8c5faa +85674e1 commit63db27c

File tree

366 files changed

+136817
-3325
lines changed

Some content is hidden

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

366 files changed

+136817
-3325
lines changed

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ scripts/*.patch
5858
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
5959
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
6060
/tests/Xnet40-fsharpqa-suite-failures.log.*
61-
/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
62-
/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
61+
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
62+
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
6363
/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
6464
/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
6565
/tests/fsharpqa/Source/*net40-fsharpqa-suite-failures.env
@@ -235,3 +235,4 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
235235
/fcs/TestResult.xml
236236
/tests/fcs/
237237
/fcs/.paket/Paket.Restore.targets
238+
msbuild.binlog

‎CHANGELOG-fsharp.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
4.1.31
2+
* Integrate visualfsharp master to 31ec0e0fb
3+
* Remove .NET Core version of compiler in FSharp.Compiler.Tools (now only for .NET Framework and Mono)
4+
5+
4.1.30
6+
* Integrate visualfsharp master to 94c7fe1f15811d9c57c26d49cc2309883b83d338
7+
18
4.1.29
29
* Integrate visualfsharp master to d903cf6277e40646563f24bbe2790e8a292d5f9b
310

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-preview2-006502
1+
2.0.3-servicing-007056

‎FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
FSharp.Compiler.Tools built by F# Software Foundation
1717
This package includes the F# compiler and the F# Interactive.
1818
</description>
19-
<summary>FSharp.Compiler.Tools for F# 4.1 - This package includes the F# compiler andtheF# Interactive.</summary>
19+
<summary>FSharp.Compiler.Tools for F# 4.1 - This package includes the F# compiler and F# Interactive.</summary>
2020
<tags>F#, FSharp, FSharp.Core, fsi, fsc</tags>
2121
</metadata>
2222
<files>
@@ -58,16 +58,5 @@
5858
<!-- Microsoft.Portable.FSharp.Targets: imported by project templates-->
5959
<filesrc="..\Release\net40\bin\Microsoft.Portable.FSharp.targets"target="tools\Microsoft.Portable.FSharp.Targets" />
6060

61-
<filesrc="..\Release\net40\bin\Microsoft.Build.dll"target="tools\Microsoft.Build.dll" />
62-
<filesrc="..\Release\net40\bin\Microsoft.Build.Engine.dll"target="tools\Microsoft.Build.Engine.dll" />
63-
<filesrc="..\Release\net40\bin\Microsoft.Build.Framework.dll"target="tools\Microsoft.Build.Framework.dll" />
64-
<filesrc="..\Release\net40\bin\Microsoft.Build.Tasks.v12.0.dll"target="tools\Microsoft.Build.Tasks.v12.0.dll" />
65-
<filesrc="..\Release\net40\bin\Microsoft.Build.Utilities.v12.0.dll"target="tools\Microsoft.Build.Utilities.v12.0.dll" />
66-
67-
<!-- Add fsc published as framework dependent netcoreapp-->
68-
<filesrc="..\Release\netcoreapp1.0\bin\**"target="build\netcoreapp1.0" />
69-
<!-- Add auto-imported props to locate fsc and FSharp.Build-->
70-
<filesrc=".\build\FSharp.Compiler.Tools.props"target="build\FSharp.Compiler.Tools.props" />
71-
<filesrc=".\buildCrossTargeting\FSharp.Compiler.Tools.props"target="buildCrossTargeting\FSharp.Compiler.Tools.props" />
7261
</files>
7362
</package>

‎FSharp.Compiler.Tools.Nuget/build/FSharp.Compiler.Tools.props‎

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

‎FSharp.Compiler.Tools.Nuget/build/netcoreapp1.0/fsc.deps.json‎

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

‎FSharp.Compiler.Tools.Nuget/build/netcoreapp1.0/fsc.runtimeconfig.json‎

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

‎FSharp.Compiler.Tools.Nuget/buildCrossTargeting/FSharp.Compiler.Tools.props‎

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

‎FSharp.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fsi", "src\fsharp\fsi\Fsi.f
2929
EndProject
3030
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Tests.FSharpSuite","tests\fsharp\FSharp.Tests.FSharpSuite.fsproj","{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
3131
EndProject
32-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Unittests","src\fsharp\FSharp.Compiler.Unittests\FSharp.Compiler.Unittests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
32+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.Unittests","src\fsharp\FSharp.Core.Unittests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
3737
EndProject

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include$(topsrcdir)mono/config.make
22

3-
.PHONY: restore
3+
.PHONY: restore build
44

55
restore:
66
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
@@ -27,7 +27,7 @@ build:
2727
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
2828
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
2929
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30-
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj
3131
mkdir -p$(Configuration)/fsharp30/net40/bin
3232
mkdir -p$(Configuration)/fsharp31/net40/bin
3333
mkdir -p$(Configuration)/fsharp40/net40/bin

0 commit comments

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