Browse Source
Windows and Linux seem to be arguing about line endings on .gitignore and packages.config...pull/10/head
4 changed files with 180 additions and 165 deletions
@ -1,158 +1,158 @@ |
|||||
################# |
################# |
||||
## Visual Studio |
## Visual Studio |
||||
################# |
################# |
||||
|
|
||||
## Ignore Visual Studio temporary files, build results, and |
## Ignore Visual Studio temporary files, build results, and |
||||
## files generated by popular Visual Studio add-ons. |
## files generated by popular Visual Studio add-ons. |
||||
|
|
||||
# User-specific files |
# User-specific files |
||||
*.suo |
*.suo |
||||
*.user |
*.user |
||||
*.sln.docstates |
*.sln.docstates |
||||
|
|
||||
# Build results |
# Build results |
||||
|
|
||||
*.sln.ide/ |
*.sln.ide/ |
||||
[Dd]ebug/ |
[Dd]ebug/ |
||||
[Rr]elease/ |
[Rr]elease/ |
||||
x64/ |
x64/ |
||||
build/ |
build/ |
||||
[Bb]in/ |
[Bb]in/ |
||||
[Oo]bj/ |
[Oo]bj/ |
||||
|
|
||||
# MSTest test Results |
# MSTest test Results |
||||
[Tt]est[Rr]esult*/ |
[Tt]est[Rr]esult*/ |
||||
[Bb]uild[Ll]og.* |
[Bb]uild[Ll]og.* |
||||
|
|
||||
*_i.c |
*_i.c |
||||
*_p.c |
*_p.c |
||||
*.ilk |
*.ilk |
||||
*.meta |
*.meta |
||||
*.obj |
*.obj |
||||
*.pch |
*.pch |
||||
*.pdb |
*.pdb |
||||
*.pgc |
*.pgc |
||||
*.pgd |
*.pgd |
||||
*.rsp |
*.rsp |
||||
*.sbr |
*.sbr |
||||
*.tlb |
*.tlb |
||||
*.tli |
*.tli |
||||
*.tlh |
*.tlh |
||||
*.tmp |
*.tmp |
||||
*.tmp_proj |
*.tmp_proj |
||||
*.log |
*.log |
||||
*.vspscc |
*.vspscc |
||||
*.vssscc |
*.vssscc |
||||
.builds |
.builds |
||||
*.pidb |
*.pidb |
||||
*.log |
*.log |
||||
*.scc |
*.scc |
||||
|
|
||||
# Visual C++ cache files |
# Visual C++ cache files |
||||
ipch/ |
ipch/ |
||||
*.aps |
*.aps |
||||
*.ncb |
*.ncb |
||||
*.opensdf |
*.opensdf |
||||
*.sdf |
*.sdf |
||||
*.cachefile |
*.cachefile |
||||
|
|
||||
# Visual Studio profiler |
# Visual Studio profiler |
||||
*.psess |
*.psess |
||||
*.vsp |
*.vsp |
||||
*.vspx |
*.vspx |
||||
|
|
||||
# Guidance Automation Toolkit |
# Guidance Automation Toolkit |
||||
*.gpState |
*.gpState |
||||
|
|
||||
# ReSharper is a .NET coding add-in |
# ReSharper is a .NET coding add-in |
||||
_ReSharper*/ |
_ReSharper*/ |
||||
*.[Rr]e[Ss]harper |
*.[Rr]e[Ss]harper |
||||
|
|
||||
# TeamCity is a build add-in |
# TeamCity is a build add-in |
||||
_TeamCity* |
_TeamCity* |
||||
|
|
||||
# DotCover is a Code Coverage Tool |
# DotCover is a Code Coverage Tool |
||||
*.dotCover |
*.dotCover |
||||
|
|
||||
# NCrunch |
# NCrunch |
||||
*.ncrunch* |
*.ncrunch* |
||||
.*crunch*.local.xml |
.*crunch*.local.xml |
||||
|
|
||||
# Installshield output folder |
# Installshield output folder |
||||
[Ee]xpress/ |
[Ee]xpress/ |
||||
|
|
||||
# DocProject is a documentation generator add-in |
# DocProject is a documentation generator add-in |
||||
DocProject/buildhelp/ |
DocProject/buildhelp/ |
||||
DocProject/Help/*.HxT |
DocProject/Help/*.HxT |
||||
DocProject/Help/*.HxC |
DocProject/Help/*.HxC |
||||
DocProject/Help/*.hhc |
DocProject/Help/*.hhc |
||||
DocProject/Help/*.hhk |
DocProject/Help/*.hhk |
||||
DocProject/Help/*.hhp |
DocProject/Help/*.hhp |
||||
DocProject/Help/Html2 |
DocProject/Help/Html2 |
||||
DocProject/Help/html |
DocProject/Help/html |
||||
|
|
||||
# Click-Once directory |
# Click-Once directory |
||||
publish/ |
publish/ |
||||
|
|
||||
# Publish Web Output |
# Publish Web Output |
||||
*.Publish.xml |
*.Publish.xml |
||||
*.pubxml |
*.pubxml |
||||
|
|
||||
# NuGet Packages Directory |
# NuGet Packages Directory |
||||
## TODO: If you have NuGet Package Restore enabled, uncomment the next line |
## TODO: If you have NuGet Package Restore enabled, uncomment the next line |
||||
packages/ |
packages/ |
||||
|
|
||||
# Windows Azure Build Output |
# Windows Azure Build Output |
||||
csx |
csx |
||||
*.build.csdef |
*.build.csdef |
||||
|
|
||||
# Windows Store app package directory |
# Windows Store app package directory |
||||
AppPackages/ |
AppPackages/ |
||||
|
|
||||
# Others |
# Others |
||||
sql/ |
sql/ |
||||
*.Cache |
*.Cache |
||||
ClientBin/ |
ClientBin/ |
||||
[Ss]tyle[Cc]op.* |
[Ss]tyle[Cc]op.* |
||||
~$* |
~$* |
||||
*~ |
*~ |
||||
*.dbmdl |
*.dbmdl |
||||
*.[Pp]ublish.xml |
*.[Pp]ublish.xml |
||||
*.pfx |
*.pfx |
||||
*.publishsettings |
*.publishsettings |
||||
|
|
||||
# RIA/Silverlight projects |
# RIA/Silverlight projects |
||||
Generated_Code/ |
Generated_Code/ |
||||
|
|
||||
# Backup & report files from converting an old project file to a newer |
# Backup & report files from converting an old project file to a newer |
||||
# Visual Studio version. Backup files are not needed, because we have git ;-) |
# Visual Studio version. Backup files are not needed, because we have git ;-) |
||||
_UpgradeReport_Files/ |
_UpgradeReport_Files/ |
||||
Backup*/ |
Backup*/ |
||||
UpgradeLog*.XML |
UpgradeLog*.XML |
||||
UpgradeLog*.htm |
UpgradeLog*.htm |
||||
|
|
||||
# SQL Server files |
# SQL Server files |
||||
App_Data/*.mdf |
App_Data/*.mdf |
||||
App_Data/*.ldf |
App_Data/*.ldf |
||||
|
|
||||
############# |
############# |
||||
## Windows detritus |
## Windows detritus |
||||
############# |
############# |
||||
|
|
||||
# Windows image file caches |
# Windows image file caches |
||||
Thumbs.db |
Thumbs.db |
||||
ehthumbs.db |
ehthumbs.db |
||||
|
|
||||
# Folder config file |
# Folder config file |
||||
Desktop.ini |
Desktop.ini |
||||
|
|
||||
# Recycle Bin used on file shares |
# Recycle Bin used on file shares |
||||
$RECYCLE.BIN/ |
$RECYCLE.BIN/ |
||||
|
|
||||
# Mac crap |
# Mac crap |
||||
.DS_Store |
.DS_Store |
||||
|
|
||||
################# |
################# |
||||
## Monodevelop |
## Monodevelop |
||||
################# |
################# |
||||
*.userprefs |
*.userprefs |
||||
|
|||||
@ -1,7 +1,7 @@ |
|||||
<?xml version="1.0" encoding="utf-8"?> |
<?xml version="1.0" encoding="utf-8"?> |
||||
<packages> |
<packages> |
||||
<package id="Rx-Core" version="2.2.5" targetFramework="net45" /> |
<package id="Rx-Core" version="2.2.5" targetFramework="net45" /> |
||||
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> |
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" /> |
||||
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" /> |
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" /> |
||||
<package id="Splat" version="1.5.1" targetFramework="net45" /> |
<package id="Splat" version="1.5.1" targetFramework="net45" /> |
||||
</packages> |
</packages> |
||||
Loading…
Reference in new issue