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

Commitf41a9a8

Browse files
authored
Merge pull request #3446 from brettfo/merge-master-into-vs2017-rtm
Merge master into vs2017-rtm
2 parents4633116 +f535de6 commitf41a9a8

File tree

140 files changed

+10483
-3442
lines changed

Some content is hidden

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

140 files changed

+10483
-3442
lines changed

‎.gitignore‎

Lines changed: 9 additions & 0 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

‎DEVGUIDE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ To test your changes locally _without_ overwriting your default installed Visual
143143
project as the startup project. When you hit F5 a new instance of Visual Studio will be started in the`RoslynDev` hive with your
144144
changes, but the root (default) hive will remain untouched. You can also start this hive automatically using
145145

146-
devenv.exe /rootsuffix:RoslynDev
147-
146+
devenv.exe /rootsuffixRoslynDev
147+
148148
Because this uses the "RoslynDev" hive you can simultaneously test changes to an appropriate build of Roslyn binaries.
149149

150150

‎DotnetCLIToolsVersion.txt‎

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

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ For historical reasons this repository is called "visualfsharp" and currently al
1616

1717
##Build Status
1818

19-
|| Ubuntu (Build)| Windows (Debug Build)| Windows (Release Tests 1)| Windows (Release Tests 2)| Windows (Release Tests 3)| Windows (Release Tests 4)|
20-
|:----------:|:----------------:|:----------------:|:------------------:|:-----------------------:|:---------------------:|:----------:|
21-
|**master** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part3_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part4_windows_nt/)|
22-
|**vs2017-rtm** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part3_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part4_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part4_windows_nt/)|
19+
|| Ubuntu (Build)| Windows (Debug Build)| Windows (Release Tests 1)| Windows (Release Tests 2)| Windows (Release Tests 3)|
20+
|:----------:|:----------------:|:----------------:|:------------------:|:-----------------------:|:---------------------:|
21+
|**master** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/master/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/master/job/release_ci_part3_windows_nt/)|
22+
|**vs2017-rtm** |[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ubuntu14.04)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ubuntu14.04/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/debug_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/debug_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part1_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part1_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part2_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part2_windows_nt/)|[![Build Status](https://ci2.dot.net/buildStatus/icon?job=Microsoft_visualfsharp/vs2017-rtm/release_ci_part3_windows_nt)](https://ci2.dot.net/job/Microsoft_visualfsharp/job/vs2017-rtm/job/release_ci_part3_windows_nt/)|
2323

2424
##Contributing
2525

‎before_install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ fi)
5959

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

6565
# The FSharp.Compiler.Tools package doesn't work correctly unless a proper install of F# has been done on the machine.
6666
# OSX can skip this because the OSX Mono installer includes F#.

‎build.cmd‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ echo.Other examples:
3434
echo.
3535
echo. build.cmd net40 (build compiler for .NET Framework)
3636
echo. build.cmd coreclr (build compiler for .NET Core)
37+
echo. build.cmd buildfromsource (build compiler for .NET Core -- Verify that buildfromsource works)
3738
echo. build.cmd vs (build Visual Studio IDE Tools)
3839
echo. build.cmd all (build everything)
3940
echo. build.cmd test (build and test default targets)
@@ -59,6 +60,7 @@ set BUILD_PHASE=1
5960
setBUILD_NET40=0
6061
setBUILD_NET40_FSHARP_CORE=0
6162
setBUILD_CORECLR=0
63+
setBUILD_BUILDFROMSOURCE=0
6264
setBUILD_VS=0
6365
setBUILD_FCS=0
6466
setBUILD_CONFIG=release
@@ -145,6 +147,13 @@ if /i "%ARG%" == "coreclr" (
145147
set_autoselect=0
146148
setBUILD_PROTO_WITH_CORECLR_LKG=1
147149
setBUILD_CORECLR=1
150+
setBUILD_FROMSOURCE=1
151+
)
152+
153+
if /i"%ARG%"=="buildfromsource" (
154+
set_autoselect=0
155+
setBUILD_PROTO_WITH_CORECLR_LKG=1
156+
setBUILD_FROMSOURCE=1
148157
)
149158

150159
if /i"%ARG%"=="vs" (
@@ -387,6 +396,7 @@ echo BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG%
387396
echo BUILD_NET40=%BUILD_NET40%
388397
echo BUILD_NET40_FSHARP_CORE=%BUILD_NET40_FSHARP_CORE%
389398
echo BUILD_CORECLR=%BUILD_CORECLR%
399+
echo BUILD_BUILDFROMSOURCE=%BUILD_BUILDFROMSOURCE%
390400
echo BUILD_VS=%BUILD_VS%
391401
echo BUILD_FCS=%BUILD_FCS%
392402
echo BUILD_SETUP=%BUILD_SETUP%
@@ -542,6 +552,7 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
542552
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
543553
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
544554
setNUGET_PACKAGES=%~dp0Packages
555+
setpath=%~dp0Tools\dotnet20\;%path%
545556

546557
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.5\tools\fsi.exe"
547558
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
@@ -550,6 +561,14 @@ if not exist %_fsiexe% echo Error: Could not find %_fsiexe% && goto :failure
550561
ifnotexist%_nugetexe%echo Error: Could not find%_nugetexe%&&goto :failure
551562
%_ngenexe% install%_nugetexe% /nologo
552563

564+
echo ---------------- Done with package restore, verify buildfrom source ---------------
565+
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
566+
pushd src
567+
call buildfromsource.cmd
568+
@if ERRORLEVEL1echo Error: buildfromsource.cmd failed&&goto :failure
569+
popd
570+
)
571+
553572
echo ---------------- Done with package restore, starting proto ------------------------
554573

555574
rem Decide if Proto need building

‎mono/prepare-mono.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ echo "chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe"
5858
echo"chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe"
5959
echo"chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe"
6060
chmod u+x packages/FSharp.Compiler.Tools.4.1.5/tools/fsi.exe
61-
chmod u+x packages/FsLexYacc.7.0.4/build/fslex.exe
62-
chmod u+x packages/FsLexYacc.7.0.4/build/fsyacc.exe
61+
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
62+
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
6363

6464
# The FSharp.Compiler.Tools package doesn't work correctly unless a proper install of F# has been done on the machine.
6565
# OSX can skip this because the OSX Mono installer includes F#.

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- Packages for the Visual F# IDE Tools should go in vsintegration\packages.config-->
66

77
<!-- CodeGen-->
8-
<packageid="FsLexYacc"version="7.0.4"targetFramework="net46" />
8+
<packageid="FsLexYacc"version="7.0.6"targetFramework="net46" />
99

1010
<!-- Build infrastructure-->
1111
<packageid="MicroBuild.Core"version="0.2.0" />

‎setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use vs
33
package name=Microsoft.FSharp.SDK.Core
44
version=$(FSharpPackageVersion)
55
vs.package.type=msi
6+
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v4.1
67

78
vs.installSize
89
SystemDrive=194670592

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ package name=Microsoft.FSharp.SDK.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.language=$(LocaleSpecificCulture)
66
vs.package.installSize=1
7+
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.1

0 commit comments

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