Permalink
Browse files

updated .gitignore/.gitattributes from latest at github/gitignore

  • Loading branch information...
ghuntley committed Jan 23, 2016
1 parent 1d744a4 commit 9f696fd9fb6096bacc5e78b622e3e5f184e1c7a1
Showing with 103 additions and 66 deletions.
  1. +42 −19 .gitattributes
  2. +61 −47 .gitignore
@@ -1,22 +1,45 @@
# Auto detect text files and perform LF normalization
# Catch all for anything we forgot. Add rules if you get CRLF to LF warnings.
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
# Text files that should be normalized to LF in odb.
*.cs text eol=lf diff=csharp
*.xaml text
*.config text
*.c text
*.h text
*.cpp text
*.hpp text

# Standard to msysgit
*.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
*.sln text
*.csproj text
*.vcxproj text

*.md text
*.tt text
*.sh text
*.ps1 text
*.cmd text
*.bat text
*.markdown text
*.msbuild text


# Binary files that should not be normalized or diffed
*.png binary
*.jpg binary
*.gif binary
*.ico binary
*.rc binary

*.pfx binary
*.snk binary
*.dll binary
*.exe binary
*.lib binary
*.exp binary
*.pdb binary
*.sdf binary
*.7z binary

# Generated file should just use CRLF, it's fiiine
SolutionInfo.cs text eol=crlf diff=csharp
@@ -4,28 +4,34 @@
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/

# Roslyn cache directories
*.ide/
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

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

#NUNIT
# NUNIT
*.VisualState.xml
TestResult.xml

@@ -34,6 +40,10 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
@@ -66,6 +76,7 @@ _Chutzpah*
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
@@ -74,6 +85,7 @@ ipch/
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/
@@ -86,7 +98,7 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding addin-in
# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
@@ -98,6 +110,7 @@ _TeamCity*
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
@@ -125,48 +138,48 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
## TODO: Comment the next line if you want to checkin your
## web deploy settings but do note that will include unencrypted
## passwords
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages Directory
packages/*
## TODO: If the tool you use requires repositories.config
## uncomment the next line
!packages/repositories.config



# Enable "build/" folder in the NuGet Packages folder since
# NuGet packages use it for MSBuild targets.
# This line needs to be after the ignore of the build folder
# (and the packages folder if the line above has been uncommented)
#!packages/build/

*.nuget.props
*.nuget.targets
*.lock.json
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config

# Windows Azure Build Output
csx/
*.build.csdef

# Windows Azure Emulator
ecf/
rcf/

# Windows Store app package directory
AppPackages/
BundleArtifacts/

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# RIA/Silverlight projects
Generated_Code/
@@ -191,30 +204,31 @@ UpgradeLog*.htm
# Microsoft Fakes
FakesAssemblies/

# RxUI build directories
Release
NuGet-Release

# Ensure all files in the NuGet directory are tracked.
!NuGet/**

*.nupkg
*.userprefs

version-bump.patch
# GhostDoc plugin setting file
*.GhostDoc.xml

ReactiveUI.Events/Events.cs
ReactiveUI.Events/Events_*.cs
# Node.js Tools for Visual Studio
.ntvs_analysis.dat

ReactiveUI.Events/EventBuilder.exe
ReactiveUI.Events/EventBuilder.exe.mdb
ReactiveUI.Events/Mono.*
ReactiveUI.Events/Nustache.*
# Visual Studio 6 build log
*.plg

nuget.exe
# Visual Studio 6 workspace options file
*.opt

ext/monodroid/18
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe

# FAKE - F# Make
.fake/

.DS_Store
# Tools
tools/

0 comments on commit 9f696fd

Please sign in to comment.