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.

Sign up for GitHub

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

Jump to bottom

merge from dev #8

Merged
merged 49 commits into from
Nov 2, 2016
Merged

merge from dev #8

merged 49 commits into from
Nov 2, 2016

Conversation

AviAvni
Copy link
Owner

@AviAvni AviAvni commented Nov 2, 2016

No description provided.

dsyme and others added 30 commits October 13, 2016 14:06
@dsyme
remove outputDirectory from compile-time search paths for scripts (#1606
2002675 
)

* remove outputDirectory from compile-time search paths for scripts

* remove code duplication

* code cleanup
@dsyme
Squashed commit of the following:
ea2f737 
commit 2a991b6
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Mon Oct 17 20:40:15 2016 +0100

    Fix microbuild (#1629)

commit 169d366
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sun Oct 16 15:04:50 2016 -0700

    Add missed file. (#1625)

    * Ensure that portable libraries have correct hintpath for preview 5

    * Replaced missed file

commit d64ff35
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Sun Oct 16 22:37:08 2016 +0100

    cleanup build and test scripts (#1615)

    * cleanup build and test scripts

commit 39480c4
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sun Oct 16 10:19:03 2016 -0700

    Ensure that portable libraries have correct hintpath for preview 5 (#1624)

commit 2fe5a3b
Author: Kevin Ransom (msft) <codecutter@hotmail.com>
Date:   Sat Oct 15 14:03:48 2016 -0700

    Add support for generating sourcelink record in portable pdbs.  Fixes #1585

commit e0318a8
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sat Oct 15 13:32:44 2016 -0700

    FSharp ms build task to support new xommand line options (#1616)

commit 749ba2d
Author: Omar Tawfik <OmarTawfik@users.noreply.github.com>
Date:   Sat Oct 15 13:27:14 2016 -0700

    Don't match braces at the end of the caret (#1619)

commit 00bab99
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Sat Oct 15 13:25:15 2016 -0700

    (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

commit 2a9b5ef
Author: Omar Tawfik <OmarTawfik@users.noreply.github.com>
Date:   Fri Oct 14 22:45:35 2016 -0700

    Add fsx files to workspaces (#1612)

    * Add fsx files to workspaces

    * Stop passing project output paths to CPS

    * Read script file contents from memory (on workspace initialization)

commit 8b434e0
Author: Kevin Ransom (msft) <codecutter.fsharp@hotmail.com>
Date:   Fri Oct 14 10:32:59 2016 -0700

    Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

commit 79430d2
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Fri Oct 14 15:58:08 2016 +0100

    simplify use of if-defs (#1614)

commit b708921
Author: Don Syme <dsyme@users.noreply.github.com>
Date:   Fri Oct 14 10:25:28 2016 +0100

    Always use FSharp.Core not fsharp.core (#1610)
@dsyme
remove RunTests.cmd
f649cfc
@dsyme
more cleanup
60964c0
@gusty @dsyme
Speed up Constraint Solver's overload resolution (#1530)
369a847 
* Assume the constraint is solved before trying each overload.

* Defer transact member solution.

* Fix previous commit.

* Refactor with an additional function.

* Remove unused parameter.

* Fix test by removing duplicate error message.

* Add comment.

* Try to reproduce #351

* Commit cx solution right after the shortcut.
@dsyme
allow tags in build.cmd
363f843
@dsyme
Merge branch 'cleanup-9' into cleanup-10
cdaec29
@dsyme
cleanup and simplify tests
fa44188
Added ProjectDiagnosticAnalyzer
6d79320
@dsyme
test fixes
8d60372
@dsyme
disable long running test
540136d
@dsyme
Merge branch 'cleanup-9' of https://github.com/dsyme/visualfsharp int…
c0ba4af 
…o cleanup-9
@dsyme
disable expensive tests that weren't previously being run
db4c230
@dsyme
Merge branch 'cleanup-9' of https://github.com/dsyme/visualfsharp int…
25d40c6 
…o cleanup-9
@dsyme
more cleanup
a6a01f4
@dsyme
more cleanup
3ea88f5
Added tests
e8a69c0
@KevinRansom
Ensure setup build works on microbuild
21c95d2
@dsyme
integrate
62c1cba
@dsyme
integrate
4376ff1
@dsyme
cleanup and simplify test runner logic, remove RunTests.cmd (#1628)
07fd501 
* remove RunTests.cmd

* more cleanup

* allow tags in build.cmd

* cleanup and simplify tests

* test fixes

* disable long running test

* disable expensive tests that weren't previously being run

* more cleanup

* more cleanup

* integrate
@dsyme
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
3d8e44a 
…to cleanup-9
@dsyme
remove unused function
869aca5
@dsyme @KevinRansom
Fix fsc task to check for nulls, fsharp/fsharp#628 (#1638)
361aaf9
@OmarTawfik
Merge pull request #1634 from OmarTawfik/fix-1596-project-diagnostics
1d303ea 
Separate Project/Document diagnostics
Remove project templates packages.config
57f758e
@OmarTawfik
Merge pull request #1640 from OmarTawfik/fix-setup-swix
536cfeb 
Remove project templates packages.config
@dsyme
update test stats (#1645)
983330c
@KevinRansom
Fix ngen error (#1648)
efc36c0 
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Fix ngen build error
@dsyme
Update compiler perf results (#1653)
4a27561 
* update test stats

* add perf results
KevinRansom and others added 19 commits October 24, 2016 22:57
@KevinRansom
Update build tools to latest (#1651)
a9f3f4a 
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* update build tools

* reset build_coreclr

* Fix coreclr proto build

* Typo
@KevinRansom
Update nunit to 3.5.0 (#1659)
db5aec2 
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Update to nunit 3.5
@OmarTawfik @KevinRansom
Fix setup issues for Roslyn insertion (#1657)
5b4d5c9 
* Remove prequesities from vsix manifests

* Fix #1655 - Upgrade to SwixBuild plugin version 1.0.71

* Fix #1654 - FSharp Binaries installed reference wrong versions

* Bring back language service registration

* Remove System.ValueTuple binding redirection
Include Setup Manifests Before Computing Hashes
ddc855d
@KevinRansom
Revert nunit runner to 3.0.0. because it doesn't support pcls (#1665)
1f6b0f7 
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Update to nunit 3.5

* revert unit runner to 3.0.0

* move back to local packages.

* revert to nuget
@vasily-kirichenko @dsyme
optimize Filename.checkPathForIllegalChars (#1662)
9753f72
@dsyme
Update perf stats (#1672)
f142979 
* update test stats

* add perf results

* update test stats
@KevinRansom
Revert "optimize Filename.checkPathForIllegalChars (#1662)"
67c23cb 
This reverts commit 9753f72.
@KevinRansom
Crop extension (#1666)
8b3540e 
* Always use FSharp.Core not fsharp.core (#1610)

* simplify use of if-defs (#1614)

* Don't try to deploy vsix during OSS build.  Specify prereq in vsixmanifest (#1613)

* Add fsx files to workspaces (#1612)

* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)

* (Nugetize F# templates.  Ensure value tuple installed on create template. (#1620)

* Don't match braces at the end of the caret (#1619)

* FSharp ms build task to support new xommand line options (#1616)

* Add support for generating sourcelink record in portable pdbs.  Fixes #1585

* Ensure that portable libraries have correct hintpath for preview 5

* Ensure that portable libraries have correct hintpath for preview 5 (#1624)

* cleanup build and test scripts (#1615)

* cleanup build and test scripts

* Replaced missed file

* Fix merge issue

* fix merge error

* Update to nunit 3.5

* revert unit runner to 3.0.0

* Reduce number of times check path for illegal chars occurs in cropextension
@OmarTawfik
Merge pull request #1667 from OmarTawfik/fix-manifest-hash-compute
8afd0e0 
Include Setup Manifests Before Computing Hashes
@KevinRansom
Ensure that build all gets coreclr tools and builds proto using corec…
33f9193 
…lr (#1674)
@KevinRansom
Reduce calls to checkPathForIllegalChars by eliminating Validation in…
ca5eadb 
… AssemblyReference.SimpleAssemblyNameIs (#1677)
@dsyme @KevinRansom
Update fslex/yacc/srgen (#1673)
f1504d9 
* update fslex/yacc/srgen

* Update FSharpSource.Settings.targets

* update

* update
@KevinRansom
Add typeforwarders to portable and coreclr fsharp.core.dll. (#1675)
943ef4d 
* Add typeforwarders to portable and coreclr fsharp.core.dll.  Also update fscheck to Version: 2.6.2

* Revert fscheck 2.6.2 because it hangs
@brettfo @KevinRansom
make the FSHARPINSTALLDIR variable system-wide, but don't overwrite i…
4c93b84 
…t if it's already present (#1586)
@brettfo @KevinRansom
add simple project classifier authoring for .fsproj (#1681)
44ec493
@forki @KevinRansom
Use runAndCheckErrorType for init check (#1646)
7bc2f24
@KevinRansom
Tell the compiler to emit the correct reference to system.runtime.num…
6742723 
…erics for non mscorlib builds (#1688)
@KevinRansom
Update Templates (#1690)
0e60f38 
* Update Templates to a recent System.ValueTuple.  Fix project location of fsharp.core

* Fix hintpath.  Deploy correct version of valuetuple.

* standar1.0

* A few missed project files

* Update TupleSample dll to reference new ValueTuple dll

* Update TupleSample dll

* Remove pdb file from repo
@AviAvni AviAvni merged commit 500c342 into AviAvni:master Nov 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@AviAvni @dsyme @gusty @KevinRansom @OmarTawfik @vasily-kirichenko @brettfo @forki