Skip to content

Commit bb6ca8c

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
2 parents 0dea4f5 + db6bcf5 commit bb6ca8c

10 files changed

+684
-194
lines changed

Diff for: .gitignore

+132-36
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
3+
##
4+
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
35

46
# User-specific files
57
*.suo
68
*.user
9+
*.userosscache
710
*.sln.docstates
811

12+
# User-specific files (MonoDevelop/Xamarin Studio)
13+
*.userprefs
14+
915
# Build results
1016
[Dd]ebug/
1117
[Dd]ebugPublic/
1218
[Rr]elease/
19+
[Rr]eleases/
1320
x64/
14-
build/
21+
x86/
1522
bld/
16-
generated/
17-
[Pp]ackages/
1823
[Bb]in/
1924
[Oo]bj/
25+
[Ll]og/
2026

21-
# Roslyn cache directories
22-
*.ide/
27+
# Visual Studio 2015 cache/options directory
28+
.vs/
29+
# Uncomment if you have tasks that create the project's static files in wwwroot
30+
#wwwroot/
2331

2432
# MSTest test Results
2533
[Tt]est[Rr]esult*/
2634
[Bb]uild[Ll]og.*
2735

28-
#NUNIT
36+
# NUNIT
2937
*.VisualState.xml
3038
TestResult.xml
3139

@@ -34,6 +42,12 @@ TestResult.xml
3442
[Rr]eleasePS/
3543
dlldata.c
3644

45+
# .NET Core
46+
project.lock.json
47+
project.fragment.lock.json
48+
artifacts/
49+
**/Properties/launchSettings.json
50+
3751
*_i.c
3852
*_p.c
3953
*_i.h
@@ -66,14 +80,18 @@ _Chutzpah*
6680
ipch/
6781
*.aps
6882
*.ncb
83+
*.opendb
6984
*.opensdf
7085
*.sdf
7186
*.cachefile
87+
*.VC.db
88+
*.VC.VC.opendb
7289

7390
# Visual Studio profiler
7491
*.psess
7592
*.vsp
7693
*.vspx
94+
*.sap
7795

7896
# TFS 2012 Local Workspace
7997
$tf/
@@ -86,7 +104,7 @@ _ReSharper*/
86104
*.[Rr]e[Ss]harper
87105
*.DotSettings.user
88106

89-
# JustCode is a .NET coding addin-in
107+
# JustCode is a .NET coding add-in
90108
.JustCode
91109

92110
# TeamCity is a build add-in
@@ -95,9 +113,14 @@ _TeamCity*
95113
# DotCover is a Code Coverage Tool
96114
*.dotCover
97115

116+
# Visual Studio code coverage results
117+
*.coverage
118+
*.coveragexml
119+
98120
# NCrunch
99121
_NCrunch_*
100122
.*crunch*.local.xml
123+
nCrunchTemp_*
101124

102125
# MightyMoose
103126
*.mm.*
@@ -125,44 +148,62 @@ publish/
125148
# Publish Web Output
126149
*.[Pp]ublish.xml
127150
*.azurePubxml
128-
## TODO: Comment the next line if you want to checkin your
129-
## web deploy settings but do note that will include unencrypted
130-
## passwords
131-
#*.pubxml
132-
133-
# NuGet Packages Directory
134-
packages/*
135-
## TODO: If the tool you use requires repositories.config
136-
## uncomment the next line
137-
#!packages/repositories.config
138-
139-
# Enable "build/" folder in the NuGet Packages folder since
140-
# NuGet packages use it for MSBuild targets.
141-
# This line needs to be after the ignore of the build folder
142-
# (and the packages folder if the line above has been uncommented)
143-
!packages/build/
144-
145-
# Windows Azure Build Output
151+
# TODO: Comment the next line if you want to checkin your web deploy settings
152+
# but database connection strings (with potential passwords) will be unencrypted
153+
*.pubxml
154+
*.publishproj
155+
156+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
157+
# checkin your Azure Web App publish settings, but sensitive information contained
158+
# in these scripts will be unencrypted
159+
PublishScripts/
160+
161+
# NuGet Packages
162+
*.nupkg
163+
# The packages folder can be ignored because of Package Restore
164+
**/packages/*
165+
# except build/, which is used as an MSBuild target.
166+
!**/packages/build/
167+
# Uncomment if necessary however generally it will be regenerated when needed
168+
#!**/packages/repositories.config
169+
# NuGet v3's project.json files produces more ignorable files
170+
*.nuget.props
171+
*.nuget.targets
172+
173+
# Microsoft Azure Build Output
146174
csx/
147175
*.build.csdef
148176

149-
# Windows Store app package directory
177+
# Microsoft Azure Emulator
178+
ecf/
179+
rcf/
180+
181+
# Windows Store app package directories and files
150182
AppPackages/
183+
BundleArtifacts/
184+
Package.StoreAssociation.xml
185+
_pkginfo.txt
186+
187+
# Visual Studio cache files
188+
# files ending in .cache can be ignored
189+
*.[Cc]ache
190+
# but keep track of directories ending in .cache
191+
!*.[Cc]ache/
151192

152193
# Others
153-
sql/
154-
*.Cache
155194
ClientBin/
156-
[Ss]tyle[Cc]op.*
157195
~$*
158196
*~
159197
*.dbmdl
160198
*.dbproj.schemaview
199+
*.jfm
161200
*.pfx
162201
*.publishsettings
163-
node_modules/
164-
bower_components/
165-
.DS_Store
202+
orleans.codegen.cs
203+
204+
# Since there are multiple workflows, uncomment next line to ignore bower_components
205+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
206+
#bower_components/
166207

167208
# RIA/Silverlight projects
168209
Generated_Code/
@@ -178,6 +219,7 @@ UpgradeLog*.htm
178219
# SQL Server files
179220
*.mdf
180221
*.ldf
222+
*.ndf
181223

182224
# Business Intelligence projects
183225
*.rdl.data
@@ -187,10 +229,64 @@ UpgradeLog*.htm
187229
# Microsoft Fakes
188230
FakesAssemblies/
189231

190-
# LightSwitch generated files
191-
GeneratedArtifacts/
192-
_Pvt_Extensions/
193-
ModelManifest.xml
232+
# GhostDoc plugin setting file
233+
*.GhostDoc.xml
234+
235+
# Node.js Tools for Visual Studio
236+
.ntvs_analysis.dat
237+
node_modules/
238+
239+
# Typescript v1 declaration files
240+
typings/
241+
242+
# Visual Studio 6 build log
243+
*.plg
244+
245+
# Visual Studio 6 workspace options file
246+
*.opt
247+
248+
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
249+
*.vbw
250+
251+
# Visual Studio LightSwitch build output
252+
**/*.HTMLClient/GeneratedArtifacts
253+
**/*.DesktopClient/GeneratedArtifacts
254+
**/*.DesktopClient/ModelManifest.xml
255+
**/*.Server/GeneratedArtifacts
256+
**/*.Server/ModelManifest.xml
257+
_Pvt_Extensions
258+
259+
# Paket dependency manager
260+
.paket/paket.exe
261+
paket-files/
262+
263+
# FAKE - F# Make
264+
.fake/
265+
266+
# JetBrains Rider
267+
.idea/
268+
*.sln.iml
269+
270+
# CodeRush
271+
.cr/
272+
273+
# Python Tools for Visual Studio (PTVS)
274+
__pycache__/
275+
*.pyc
276+
277+
# Cake - Uncomment if you are using it
278+
# tools/**
279+
# !tools/packages.config
280+
281+
# Telerik's JustMock configuration file
282+
*.jmconfig
283+
284+
# BizTalk build output
285+
*.btp.cs
286+
*.btm.cs
287+
*.odx.cs
288+
*.xsd.cs
194289

195290
.paket/
196291
.fake/
292+
generated/

Diff for: .mailMap

+17-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,20 @@ Yuichi Nukiyama <[email protected]> YuichiNukiyama <oscar.wilde84@hotm
3636
Zhengbo Li <Zhengbo Li> Zhengbo Li <[email protected]> zhengbli <[email protected]> tinza123 <[email protected]>
3737
falsandtru <[email protected]> # @falsandtru
3838
rix <[email protected]> # Richard Sentino
39-
rohitverma007 <[email protected]> # Rohit Verma
39+
rohitverma007 <[email protected]> # Rohit Verma
40+
Akinmade Bond <[email protected]>
41+
alfaslash <[email protected]> # Artem Roshko
42+
Andy Hanson <[email protected]>
43+
Argelius Andreas <[email protected]>
44+
arjunyel <[email protected]> # @arjunyel
45+
Christian Silver <[email protected]>
46+
cronon <[email protected]> # @cronon
47+
Diullei Gomes <[email protected]>
48+
Gabriel Pena Calero <[email protected]>
49+
Logan Mzz <[email protected]>
50+
Luc-Edmond Gaspard <[email protected]>
51+
ncoley <[email protected]> # Natalie Coley
52+
Nico Kemnitz <[email protected]>
53+
Stanislav Vasilev <[email protected]>
54+
Tuure Savuoja <[email protected]>
55+
VincentBel <[email protected]> # Vincent Bel

Diff for: AUTHORS.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
11
TypeScript library is authored by:
22

33
* Aaron Holmes
4+
* Akinmade Bond
45
* Akshar Patel
56
* Ali Sabzevari
67
* Aliaksandr Radzivanovich
8+
* Andy Hanson
9+
* Argelius Andreas
10+
* @arjunyel
11+
* Artem Roshko
12+
* Christian Silver
13+
* @cronon
714
* Daniel Hollocher
815
* Daniel Rosenwasser
916
* David Kmenta
17+
* Diullei Gomes
1018
* Elisée Maurer
1119
* Emilio García-Pumarino
1220
* @falsandtru
1321
* Franklin Tse
22+
* Gabriel Pena Calero
1423
* Guilherme Oenning
1524
* Herrington Darkholme
1625
* Ivo Gabe de Wolff
1726
* Joey Wilson
1827
* Jonathon Smith
1928
* Juan Luis Boya García
2029
* Kagami Sascha Rosylight
30+
* Logan Mzz
31+
* Luc-Edmond Gaspard
2132
* Lucien Greathouse
2233
* Martin Vseticka
2334
* Mattias Buelens
2435
* Michael Bromley
2536
* Mohamed Hegazy
37+
* Natalie Coley
2638
* Nathan Shively-Sanders
39+
* Nico Kemnitz
2740
* Nicolas Henry
2841
* Paul Jolly
2942
* Perry Jiang
@@ -32,10 +45,13 @@ TypeScript library is authored by:
3245
* Robert Coie
3346
* Rohit Verma
3447
* Ryan Cavanaugh
48+
* Stanislav Vasilev
3549
* Thomas Loubiou
3650
* Tim Perry
51+
* Tuure Savuoja
3752
* Vidar Tonaas Fauske
3853
* Viktor Zozulyak
54+
* Vincent Bel
3955
* York Yao
4056
* Yuichi Nukiyama
4157
* Zhengbo Li

0 commit comments

Comments
 (0)