Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integrate visualfsharp master and bump version to 17.0.1 #833

Merged
merged 172 commits into from
Nov 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
f41a9a8
Merge pull request #3446 from brettfo/merge-master-into-vs2017-rtm
brettfo Aug 16, 2017
cc1b137
Merge master into vs2017-rtm (#3458)
brettfo Aug 17, 2017
64eb7dc
prevent endless async loop on Receive
Aug 24, 2017
03fb5b8
fix 3033 - make projects known to roslyn
Aug 24, 2017
f4120b3
remove AddProject, now done via project tracker metadata ref conversion
Aug 24, 2017
c107a16
merge
Aug 24, 2017
abbe394
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Sep 1, 2017
af471a3
remove flag for all but .NET 4.0 (#3482)
dsyme Aug 22, 2017
094f373
Merge branch 'master' into proj1
KevinRansom Sep 16, 2017
8381e23
merge
KevinRansom Sep 16, 2017
8724793
Merge issues
KevinRansom Sep 16, 2017
4710a17
merge
KevinRansom Sep 16, 2017
eeac3a5
Merge pull request #3594 from KevinRansom/mergetovs2017-rtm
KevinRansom Sep 16, 2017
0e0b4f9
Merge branch 'proj1' of https://github.com/dsyme/visualfsharp into ds…
KevinRansom Sep 17, 2017
6b68865
Merge pull request #3597 from KevinRansom/dsyme-proj1
KevinRansom Sep 17, 2017
8615245
Merge pull request #3606 from KevinRansom/mergeintortm
KevinRansom Sep 19, 2017
2b13f5d
Merge branch 'master' of https://github.com/microsoft/visualfsharp in…
KevinRansom Sep 20, 2017
d26de72
Merge pull request #3616 from KevinRansom/vs2017-rtm
KevinRansom Sep 20, 2017
db2e4e2
update DEVGUIDE to add addiitional steps before running build (#3725)
eriawan Oct 10, 2017
6ecacd7
Split templates out into a seperate vsix (#3720)
KevinRansom Oct 10, 2017
57b2cfe
Merge branch 'vs2017-rtm' into master
KevinRansom Oct 10, 2017
531cd5b
merge master into vs-rtm2017 (#3728)
KevinRansom Oct 11, 2017
b714ecb
fix merge that picked up the wrong refactoring (#3732)
brettfo Oct 11, 2017
a83598d
move `GenerateSource` attributes to be elements
brettfo Oct 12, 2017
2ccf874
publish templates VSIX (#3741)
brettfo Oct 12, 2017
481427f
Don't suggest variables explicitly marked unused (#3706)
drvink Oct 12, 2017
68f4187
Parameterise rc location (#3744)
KevinRansom Oct 13, 2017
503d167
undo #3536 (#3746)
dsyme Oct 13, 2017
9fc3952
undo #3536 (#3746) (#3749)
brettfo Oct 13, 2017
8adfa2f
Do not commit autocompletion on bracket or pipe chars (#3718)
cartermp Oct 14, 2017
860c812
Fix completion inside last part of long ident (#3711)
vasily-kirichenko Oct 14, 2017
baf0c53
make SimplifyNameEachItemDelay zero (#3708)
vasily-kirichenko Oct 14, 2017
44e3e0d
Fix IL types constructors nice print (#3754)
vasily-kirichenko Oct 15, 2017
3634f0c
Fix typo in README (#3760)
piperchester Oct 16, 2017
80b8c9e
Add WriteCodeFragment build task (#3702)
brettfo Oct 17, 2017
4029f19
fix IndexOutOfRange exception in advanced completion (#3753)
vasily-kirichenko Oct 17, 2017
72e28fe
Add `IsRelativeNameResolvableFromSymbol` (#3722)
Krzysztof-Cieslak Oct 17, 2017
0095fde
Fix de-duplication of module names in ParseAndCheckFileInProject (FCS…
dsyme Oct 17, 2017
e5762fd
typeof in quotations.fs now respects ByRef types (#3450)
krauthaufen Oct 17, 2017
69ac9af
copy VisualFSharpTemplate.vsix to the insertion directory (#3767)
brettfo Oct 17, 2017
452f21a
don't display contents of <InternalsVisibleTo> nodes in the solution …
brettfo Oct 18, 2017
b05e17a
Fix editor service sample (#3770)
Krzysztof-Cieslak Oct 18, 2017
4788e9d
use QuickParse to get proper full idents island in UnusedOpensDiagnos…
vasily-kirichenko Oct 18, 2017
064d804
Make "GitHub linguist" happy (#3771)
forki Oct 18, 2017
c422581
module scope aware unused opens
Oct 19, 2017
9e51546
Merge remote-tracking branch 'origin/master' into fix-unused-opens-an…
vasily-kirichenko Oct 19, 2017
5f2eb3e
fix notUsed logic
vasily-kirichenko Oct 19, 2017
2899fb6
start adding UnusedOpensDiagnosticAnalyzer tests
vasily-kirichenko Oct 19, 2017
1e156fc
port all UnusedOpensDiagnosticAnalyzer tests from VFPT
vasily-kirichenko Oct 19, 2017
a0918f2
Activate FCS build on CI (#3769)
forki Oct 20, 2017
7673c14
fix some test, ignore other
Oct 20, 2017
bf88499
fix and ignore tests
Oct 20, 2017
2335589
move Unused Opens analyzer core logic to FCS
Oct 20, 2017
f8e4b40
fix tests
Oct 20, 2017
ef55edb
fix build
vasily-kirichenko Oct 20, 2017
bf4d5f7
Merge remote-tracking branch 'upstream/vs2017-rtm' into merge-vs2017-…
brettfo Oct 19, 2017
f81fea2
collect open declarations EntityRefs during compilation
vasily-kirichenko Oct 20, 2017
b1d98f8
fix
vasily-kirichenko Oct 20, 2017
00ca671
Make the FCS build work (#3781)
forki Oct 20, 2017
129a9b0
Update netci.groovy (#3787)
forki Oct 20, 2017
1bc77f9
try to get full EntityRef name
vasily-kirichenko Oct 20, 2017
cb33a22
Merge pull request #3780 from Microsoft/merge-vs2017-rtm-to-master
brettfo Oct 20, 2017
9153474
bump
KevinRansom Oct 20, 2017
37fc75d
don't update project info if the source file collection is empty (#3792)
brettfo Oct 21, 2017
cc4b678
Correct groovy file
KevinRansom Oct 21, 2017
f375d8d
don't update project info if the source file collection is empty (#37…
brettfo Oct 21, 2017
92cbb6b
refactoring, fix compilation
vasily-kirichenko Oct 21, 2017
99d0f40
all not ignored tests pass
vasily-kirichenko Oct 21, 2017
12db301
exclude nested symbol uses from consideration
vasily-kirichenko Oct 21, 2017
86c7bc0
fix compilation
vasily-kirichenko Oct 21, 2017
2e0af3d
remove duplicate reference to FSharp.Core (#3796)
brettfo Oct 21, 2017
eb75ac8
use module's child symbols
vasily-kirichenko Oct 22, 2017
f7362f5
fix for module suffix
vasily-kirichenko Oct 22, 2017
4b8a736
add functions and values into consideration
vasily-kirichenko Oct 22, 2017
71a5f23
switch back from full names to possible namespaces
Oct 23, 2017
c84c7d5
refactoring
Oct 23, 2017
5655a92
bring record field into scope
Oct 23, 2017
80dc7d3
bring non RQA DU cases into scope
Oct 23, 2017
a35e535
auto open modules
Oct 23, 2017
4ba197a
fix partially qualified name 1
Oct 23, 2017
6d1b4bd
find in open decls sub namespaces (wip)
Oct 23, 2017
42e528b
the proper way, finally
vasily-kirichenko Oct 23, 2017
d063ef8
active pattern cases work
vasily-kirichenko Oct 23, 2017
961f0e9
active patterns work
vasily-kirichenko Oct 23, 2017
8d5176a
Update netci.groovy (#3800)
forki Oct 23, 2017
05e7d26
symbol use for open declarations
vasily-kirichenko Oct 23, 2017
5e1255b
all tests pass except type in type extension
vasily-kirichenko Oct 23, 2017
28ea9a5
set execute for fcs build.sh (#3801)
forki Oct 23, 2017
c9b975e
install templates VSIX to a unique directory (#3804)
brettfo Oct 24, 2017
28f0262
Update netci.groovy (#3805)
forki Oct 24, 2017
03ecab2
Merge remote-tracking branch 'origin/master' into typed-open-declarat…
Oct 24, 2017
6085f0b
consider definitions because they can be used at type extensions point
Oct 24, 2017
e146709
remove unused code
Oct 24, 2017
bf6bd3f
properly handle own namespace opening
Oct 24, 2017
6960062
fix tests
Oct 24, 2017
e55de7e
revert FSharpEntity.TryFullName for namespaces
Oct 24, 2017
b561754
fixed: opening nested auto open module makes outer module as unused
Oct 24, 2017
0366ad1
remove logging
Oct 24, 2017
716b8e9
P2p references (#3777)
KevinRansom Oct 24, 2017
2f9e8db
P2p references (#3777)
KevinRansom Oct 24, 2017
0037eb1
fix for identical sub module
vasily-kirichenko Oct 24, 2017
077d13a
Parameterise rc location (#3744)
KevinRansom Oct 13, 2017
29c1df1
Fix issues
KevinRansom Oct 24, 2017
55859f9
fix auto opens
vasily-kirichenko Oct 24, 2017
5f6388b
Merge pull request #3810 from Microsoft/master
brettfo Oct 24, 2017
d55aa3b
Put nupkgs into artifacts (#3806)
forki Oct 24, 2017
4c19c42
Make FCS build work on Jenkins (#3788)
forki Oct 24, 2017
f3d67ff
Merge remote-tracking branch 'origin/master' into typed-open-declarat…
Oct 25, 2017
aacb796
fix tests
Oct 25, 2017
d225014
handle C# extension methods
Oct 25, 2017
0676848
do not use MembersFunctionsAndValues
Oct 25, 2017
26526dd
wip
Oct 25, 2017
d6fade9
use EnclosingEntity if available
vasily-kirichenko Oct 25, 2017
ba6e2b8
fix compilation
Oct 26, 2017
b9bca6a
Merge dev15.5 to dev15.6 (#3825)
dotnet-bot Oct 26, 2017
01938e2
Merge master to dev15.6 (#3826)
dotnet-bot Oct 26, 2017
3a4bd07
Dev15.6 (#3832)
KevinRansom Oct 27, 2017
715c863
Merge pull request #3834 from Microsoft/merges/dev15.5-to-dev15.6-201…
KevinRansom Oct 27, 2017
9925e99
Merge pull request #3835 from Microsoft/merges/dev15.6-to-master-2017…
KevinRansom Oct 27, 2017
29e27d2
Merge pull request #3836 from Microsoft/merges/master-to-dev15.6-2017…
KevinRansom Oct 27, 2017
51fe090
Work around corecompile.cache bugs (#3833)
KevinRansom Oct 27, 2017
cadfd2c
Add icon for test libraries (#3838)
KevinRansom Oct 27, 2017
8f3c59c
Work around corecompile.cache bugs (#3833)
KevinRansom Oct 27, 2017
182fd38
Merge pull request #3839 from Microsoft/dev15.6
KevinRansom Oct 27, 2017
0bb0a00
Update build status for new branch names
brettfo Oct 27, 2017
0a17cb0
Ensure that Item templates are always installed with F#
Oct 27, 2017
885feb7
Merge pull request #3840 from KevinRansom/itemtemplates
KevinRansom Oct 27, 2017
542917b
Update the name of the preview VSIX branch.
brettfo Oct 27, 2017
726f56f
Add icon for test libraries (#3838)
KevinRansom Oct 27, 2017
bb20848
Merge remote-tracking branch 'origin/master' into typed-open-declarat…
vasily-kirichenko Oct 28, 2017
59103f7
fix a test
vasily-kirichenko Oct 28, 2017
8076475
fix FCS netstandard compilation
vasily-kirichenko Oct 28, 2017
a395c76
add NUnit3TestAdapter package to enable running tests from inside Rider
vasily-kirichenko Oct 28, 2017
6a978f1
fix test
vasily-kirichenko Oct 28, 2017
1b0fad8
do not filter symbol uses by range length in getSymbolUsesInSolution …
vasily-kirichenko Oct 29, 2017
8861075
Improve sprintf/printf for short format strings (#3761)
forki Oct 29, 2017
d2cb414
Keep context information over parens and sequence expressions (#3763)
forki Oct 29, 2017
1422322
Fix go to definition to symbols defined in referenced assemblies and …
vasily-kirichenko Oct 29, 2017
47772f9
Merge pull request #3842 from Microsoft/merges/dev15.5-to-dev15.6-201…
KevinRansom Oct 30, 2017
f087d4f
Merge pull request #3803 from vasily-kirichenko/typed-open-declaratio…
KevinRansom Oct 30, 2017
1e6f253
fix completion after double dot in non-auto mode
vasily-kirichenko Oct 30, 2017
46c2bc5
Merge remote-tracking branch 'origin/master' into do-no-auto-popup-co…
vasily-kirichenko Oct 30, 2017
8bee84b
Merge pull request #3843 from Microsoft/merges/master-to-dev15.6-2017…
KevinRansom Oct 30, 2017
d7ee51e
fix auto completion after dot
vasily-kirichenko Oct 30, 2017
1658aa0
don't run tests if the `PB_SKIPTESTS` variable is set to true
brettfo Oct 30, 2017
3a30dfb
Allow the templates package to be locally overwritten.
brettfo Oct 31, 2017
88ab3e3
Merge pull request #3850 from Microsoft/merges/dev15.6-to-master-2017…
brettfo Oct 31, 2017
dd0538e
Merge pull request #3851 from Microsoft/merges/master-to-dev15.6-2017…
brettfo Oct 31, 2017
0991a3b
Merge pull request #3846 from vasily-kirichenko/do-no-auto-popup-comp…
KevinRansom Oct 31, 2017
4ad577f
Minor cleanup (#3854)
KevinRansom Nov 1, 2017
c7e276a
Merge pull request #3856 from Microsoft/merges/master-to-dev15.6-2017…
KevinRansom Nov 1, 2017
b73a0c4
Merge pull request #3855 from Microsoft/merges/dev15.6-to-master-2017…
KevinRansom Nov 1, 2017
88379e7
Merge pull request #3847 from brettfo/skip-test-option
brettfo Nov 1, 2017
9cd9f22
skip publishing packages unless the variable `PB_PUBLISHTYPE` is set …
brettfo Nov 1, 2017
876e4a4
Merge pull request #3857 from brettfo/package-publish
brettfo Nov 1, 2017
0a9c0c1
Remove build fcs from branch dev15.5
KevinRansom Nov 2, 2017
26b66fb
Merge pull request #3860 from Microsoft/merges/dev15.6-to-master-2017…
KevinRansom Nov 2, 2017
41111ac
remove MyGet package publishing
brettfo Nov 2, 2017
6b4a0bd
use a stable up-to-date version of MSBuild
brettfo Nov 2, 2017
9fadedb
enable publishing NuGet packages to an Azure Blob feed
brettfo Nov 2, 2017
7542396
Merge pull request #3874 from brettfo/blob-publish
brettfo Nov 2, 2017
f8b648b
Merge pull request #3867 from brettfo/package-publish
brettfo Nov 2, 2017
d903cf6
Merge pull request #3875 from brettfo/stable-msbuild
KevinRansom Nov 3, 2017
0d53d9c
integrate visualfsharp master and bump version
Nov 3, 2017
44d037c
fix build
Nov 3, 2017
d8b4aea
fix build
Nov 3, 2017
47e2135
try update fake
Nov 3, 2017
8411623
install .net core sdk 2.0.2 in travis
enricosada Nov 6, 2017
e75e32c
empty commit
enricosada Nov 6, 2017
297f286
use 2.0.0, because 2.0.2 not yet in travis
enricosada Nov 6, 2017
d2f4646
use osx 10.12, because is the minimum for .net core sdk 2.0
enricosada Nov 7, 2017
013ac24
Merge pull request #1 from enricosada/dsyme-i1
dsyme Nov 7, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,11 @@ install-sh text eol=lf
*.in text eol=lf
*.ac text eol=lf
*.sh text eol=lf
autogen.sh text eol=lf
launcher.in text eol=lf
config.make.in text eol=lf
targets.make text eol=lf
configure.ac text eol=lf
Makefile.in text eol=lf

*.bsl linguist-vendored=true
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,9 @@ tests/fsharpqa/testenv/bin/System.ValueTuple.dll
lib/netcore/fsc/bin/

!lib/bootstrap/signed/**/*
*/.fake
/fcs/packages/
*/paket-files/
/fcs/TestResult.xml
/tests/fcs/
/fcs/.paket/Paket.Restore.targets
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ os:
- linux
- osx

osx_image: xcode9

mono:
- weekly
- latest
- 4.8.0
- 4.4.2

dotnet: 2.0.0

sudo: false

Expand Down
10 changes: 9 additions & 1 deletion DEVGUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
Install

- [.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760) or Visual Studio 2013 (or later)

**NOTE on Windows:**
1. It is recommended to run the build.cmd and the qualifiers below on a command prompt with path set to have the location of MSBuild. If we have Visual Studio, we can also run using `Developer Command Prompt for Visual Studio 20xx` (depends on Visual Studio version). This developer command prompt is easier to use than normal command prompt, because it already has the correct path of Visual Studio and .NET's tooling set for us to use (including MSBuild).
2. The running command prompt must be run under Administrator right (`Run as Administrator`).

Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:

git clean -xfd

On Windows you can build the F# compiler for .NET Framework as follows:

Expand Down
29 changes: 29 additions & 0 deletions PublishToBlob.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project>

<!--

This is for the internal orchestrated build scenarios and will likely never be run on a
developer's machine. The official build definition builds this file directly.

-->

<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<!-- This version should be kept in sync with `packages.config` -->
<FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />

<ItemGroup>
<ItemsToPush Include="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
</ItemGroup>

<Target Name="Build">
<PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
AccountKey="$(AccountKey)"
ItemsToPush="@(ItemsToPush)"
Overwrite="$(PublishOverwrite)" />
</Target>

</Project>
Loading