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

[Release-2.0] Merge master into Release-2.0 #10347

Merged
merged 438 commits into from
Aug 18, 2016
Merged

Conversation

yuit
Copy link
Contributor

@yuit yuit commented Aug 15, 2016

Also update version to 2.0.1

ahejlsberg and others added 30 commits July 23, 2016 11:20
# Conflicts:
#	src/compiler/checker.ts
…ible-in-subclass-static-methods

Protected constructors accessible in subclass static methods
Add src to absolute paths in browserify task
Using an arrow function. Previously, it was set directly to
window.performance.now, which fails when used on Chrome.
In ts.performance.now, bind window.performance.now
* Add assertion whitespace lint rule

* Fix typo

* Add the word `Rule` to Jakefile
* Convert getErrorBaseline to use canonical diagnostic formatting

* Fix lint

* Found another clone of format diagnostic - consolidate

* Fully declone
Add servicesSources to the list of prerequisites for running tests
Support emitting static properties for classes with no name
Unfortunately, I didn't find a way to reuse the normal string literal
type, so I had to extend the existing JSDoc type hierarchy. Otherwise,
this feature is very simple.
Andy and others added 25 commits August 17, 2016 06:04
Use lowercase names for type reference directives
Remove old assertion about when we're allowed to use fileExists
…-assignability

Improve ReadonlyArray<T>.concat to match Array<T>
…ce_directives

Explain why we lower-case type reference directives
Also simply it considerably after noticing that it's *only* called for
Javascript files, so there was a lot of dead code for TS cases that
never happened.
…n-of-constructor-properties

Allow JS multiple declarations of ctor properties
Make baselines faster by not writing out unneeded files
…t_any

Treat ambient shorthand declarations as explicit uses of the `any` type
…TrueForJS

Set isNewIdentifierLocation to true for JavaScript files
… into gcnew-noErrorTruncation

# Conflicts:
#	src/compiler/diagnosticMessages.json
* Separate generate tsconfig into its own function and implement init with --lib

# Conflicts:
#	src/compiler/tsc.ts

* Add tests and baselines; Update function name

Add unittests and baselines
Add unittests and baselines for generating tsconfig

Move unittest into harness folder

Update harness tsconfig.json

USe correct function name

* Use new MapLike interstead. Update unittest

# Conflicts:
#	src/compiler/commandLineParser.ts

* Update JakeFile

* Add tests for incorrect cases

* Address PR : remove explicity write node_modules
Output test baselines to tests/baselines/local instead of root
@yuit
Copy link
Contributor Author

yuit commented Aug 18, 2016

🔔

@mhegazy
Copy link
Contributor

mhegazy commented Aug 18, 2016

👍

@yuit yuit merged commit 1d9124e into release-2.0 Aug 18, 2016
@yuit yuit deleted the release-2.0_mergeMaster branch August 18, 2016 21:49
@microsoft microsoft locked and limited conversation to collaborators Jun 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.