Merge remote-tracking branch 'origin/release/2.1'

.gitattributes

@@ -1,65 +1,49 @@
 ###############################################################################
-# Set default behavior to automatically normalize line endings.
+# Set default behavior to:
+#   automatically normalize line endings on check-in
 ###############################################################################
-* text=auto encoding=UTF-8
-*.vb linguist-vendored
+*           text=auto
 
 ###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-*.cs     diff=csharp text 
-*.vb     text
+# Set file behavior to:
+#   treat as text
+###############################################################################
+*.cmd       text
+*.config    text
+*.cs        text
+*.csproj    text
+*.groovy    text
+*.json      text
+*.md        text
+*.proj      text
+*.projitems text
+*.props     text
+*.ps1       text
+*.resx      text
+*.shproj    text
+*.sln       text
+*.targets   text
+*.txt       text
+*.xlf       text
+*.xml       text
+
 
 ###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
+# Set file behavior to:
+#   treat as text
+#   normalize to Windows-style line endings on check-in
 ###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
+*.sln        text       eol=crlf
 
 ###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
+# Set file behavior to:
+#   treat as text
+#   normalize to Unix-style line endings on check-in
 ###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
+*.sh        text        eol=lf
 
 ###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
+# Set file behavior to:
+#   treat as binary
 ###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+*.snk       binary

.gitignore

@@ -1,191 +1,11 @@
-# Build version number is generated for the tests, so they can succeed on both non-official builds and official builds.
-# It's ignored, as it's autogenerated every build
-TestAssets/buildVersion.txt
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
+###############################################################################
+# Build Artifacts
+###############################################################################
+artifacts/
+bin/
+obj/
+
+###############################################################################
+# Visual Studio
+###############################################################################
 .vs/
-
-# dotnet cli install directory
-.dotnet_cli
-
-# nuget install directory
-.nuget
-
-# Build results
-[Bb]inaries/
-[Dd]ebug/
-[Rr]elease/
-x64/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-UnitTestResults.html
-
-# NuGet V3 artifacts
-*-packages.config
-*.nuget.props
-*.nuget.targets
-project.lock.json
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.wrn
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.binlog
-*.scc
-
-# Template Manifests generated as part of VSIX build
-*.vstman
-
-# Visual Studio cache files
-*.sln.ide/
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.opendb
-*.VC.db
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-
-# NuGet Packages Directory
-packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-
-#LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
-
-# =========================
-# Windows detritus
-# =========================
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac desktop service store files
-.DS_Store
-
-# Ignore Generated project json template file 
-project.json.template
-
-# Ignore Generated project template files 
-Project.csproj
-Project.vbproj
-
-# VS Code
-.vscode/
-
-# VS for mac
-*.userprefs