Skip to content

Commit 62b65a9

Browse files
kristiandupontkristiandupont
committed
Update/merge .gitignore and .gitattributes
1 parent 73203c4 commit 62b65a9

File tree

4 files changed

+515
-31
lines changed

4 files changed

+515
-31
lines changed

‎.gitattributes

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
# Auto detect text files and perform LF normalization
2-
* text=auto
2+
* text
3+
4+
# Don't check these into the repo as LF to work around TeamCity bug
5+
*.xml -text
6+
*.targets -text
37

48
# Custom for Visual Studio
59
*.cs diff=csharp
10+
*.sln merge=union
11+
*.csproj merge=union
12+
*.vbproj merge=union
13+
*.fsproj merge=union
14+
*.dbproj merge=union
615

716
# Standard to msysgit
817
*.doc diff=astextplain
@@ -15,3 +24,11 @@
1524
*.PDF diff=astextplain
1625
*.rtf diff=astextplain
1726
*.RTF diff=astextplain
27+
28+
# Denote all files that are truly binary and should not be modified.
29+
*.dll binary
30+
*.exe binary
31+
*.png binary
32+
*.ico binary
33+
*.snk binary
34+
*.pdb binary

‎.gitignore

+210-30
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,156 @@
1-
*.bz2
1+
# Created by https://www.gitignore.io/api/visualstudio,xcode,windows,osx
2+
3+
### VisualStudio ###
4+
## Ignore Visual Studio temporary files, build results, and
5+
## files generated by popular Visual Studio add-ons.
6+
7+
# User-specific files
8+
*.suo
9+
*.user
10+
*.userosscache
11+
*.sln.docstates
12+
13+
# User-specific files (MonoDevelop/Xamarin Studio)
214
*.userprefs
3-
/realm/*.sdf
4-
/realm/ipch
5-
/realm/*.opensdf
6-
.vs
7-
/tightdb/native/tightdb_c_cs/tightdb_c_cs2012/x64
8-
/tightdb/native/tightdb_c_cs/tightdb_c_cs2012/release
9-
packages
10-
realm/Tools/RealmWeaver.Fody.dll
11-
realm/wrappers/DerivedData
12-
realm/wrappers/core
13-
realm/wrappers/realm-core*.bz2
14-
/tightdb/examples/TutorialSolution/obj
15+
16+
# Build results
17+
[Dd]ebug/
18+
[Dd]ebugPublic/
19+
[Rr]elease/
20+
[Rr]eleases/
21+
x64/
22+
x86/
23+
build/
24+
bld/
25+
[Bb]in/
26+
[Oo]bj/
27+
28+
# Visual Studio 2015 cache/options directory
29+
.vs/
30+
# Uncomment if you have tasks that create the project's static files in wwwroot
31+
#wwwroot/
32+
33+
# MSTest test Results
34+
[Tt]est[Rr]esult*/
35+
[Bb]uild[Ll]og.*
36+
37+
# NUNIT
38+
*.VisualState.xml
39+
TestResult.xml
40+
41+
# Build Results of an ATL Project
42+
[Dd]ebugPS/
43+
[Rr]eleasePS/
44+
dlldata.c
45+
46+
# DNX
47+
project.lock.json
48+
artifacts/
49+
50+
*_i.c
51+
*_p.c
52+
*_i.h
53+
*.ilk
54+
*.meta
55+
*.obj
56+
*.pch
57+
*.pdb
58+
*.pgc
59+
*.pgd
60+
*.rsp
61+
*.sbr
62+
*.tlb
63+
*.tli
64+
*.tlh
65+
*.tmp
66+
*.tmp_proj
67+
*.log
68+
*.vspscc
69+
*.vssscc
70+
.builds
71+
*.pidb
72+
*.svclog
73+
*.scc
74+
75+
# Visual C++ cache files
76+
ipch/
77+
*.aps
78+
*.ncb
79+
*.opensdf
80+
*.sdf
81+
*.cachefile
82+
83+
# Visual Studio profiler
84+
*.psess
85+
*.vsp
86+
*.vspx
87+
88+
# ReSharper is a .NET coding add-in
89+
_ReSharper*/
90+
*.[Rr]e[Ss]harper
91+
*.DotSettings.user
92+
93+
# JustCode is a .NET coding add-in
94+
.JustCode
95+
96+
# TeamCity is a build add-in
97+
_TeamCity*
98+
99+
# DotCover is a Code Coverage Tool
100+
*.dotCover
101+
102+
# NCrunch
103+
_NCrunch_*
104+
.*crunch*.local.xml
105+
nCrunchTemp_*
106+
107+
# NuGet Packages
108+
*.nupkg
109+
# The packages folder can be ignored because of Package Restore
110+
**/packages/*
111+
# except build/, which is used as an MSBuild target.
112+
!**/packages/build/
113+
# Uncomment if necessary however generally it will be regenerated when needed
114+
#!**/packages/repositories.config
115+
116+
# Visual Studio cache files
117+
# files ending in .cache can be ignored
118+
*.[Cc]ache
119+
# but keep track of directories ending in .cache
120+
!*.[Cc]ache/
121+
122+
# Others
123+
ClientBin/
124+
[Ss]tyle[Cc]op.*
125+
~$*
126+
*~
127+
*.dbmdl
128+
*.dbproj.schemaview
129+
*.pfx
130+
*.publishsettings
131+
node_modules/
132+
orleans.codegen.cs
133+
134+
# Backup & report files from converting an old project file
135+
# to a newer Visual Studio version. Backup files are not needed,
136+
# because we have git ;-)
137+
_UpgradeReport_Files/
138+
Backup*/
139+
UpgradeLog*.XML
140+
UpgradeLog*.htm
141+
142+
15143

16144
### Xcode ###
145+
# Xcode
146+
#
147+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
148+
149+
## Build generated
17150
build/
151+
DerivedData
152+
153+
## Various settings
18154
*.pbxuser
19155
!default.pbxuser
20156
*.mode1v3
@@ -24,23 +160,67 @@ build/
24160
*.perspectivev3
25161
!default.perspectivev3
26162
xcuserdata
163+
164+
## Other
27165
*.xccheckout
28166
*.moved-aside
29-
DerivedData*.xcuserstate
30167
*.xcuserstate
31-
/realm/Tests/*.ncrunchproject
32-
/tightdb/examples/TutorialSolution/*.dll
33-
/tightdb/examples/TutorialSolution/*.user
34-
/tightdb/examples/TutorialSolution/bin
35-
/realm/Tools/RealmNetWeaver.Fody.dll
36-
*.ncrunchproject
37-
*.opensdf
38-
*.sdf
39-
realm/doxyout
40-
realm/doxyoutCS
41-
*.a
42-
*.so
43-
Resource.Designer.cs
44-
realm/doxyoutCS_docOnly
45-
46-
*.ncrunchproject
168+
169+
170+
### Windows ###
171+
# Windows image file caches
172+
Thumbs.db
173+
ehthumbs.db
174+
175+
# Folder config file
176+
Desktop.ini
177+
178+
# Recycle Bin used on file shares
179+
$RECYCLE.BIN/
180+
181+
# Windows Installer files
182+
*.cab
183+
*.msi
184+
*.msm
185+
*.msp
186+
187+
# Windows shortcuts
188+
*.lnk
189+
190+
191+
### OSX ###
192+
.DS_Store
193+
.AppleDouble
194+
.LSOverride
195+
196+
# Icon must end with two \r
197+
Icon
198+
199+
200+
# Thumbnails
201+
._*
202+
203+
# Files that might appear in the root of a volume
204+
.DocumentRevisions-V100
205+
.fseventsd
206+
.Spotlight-V100
207+
.TemporaryItems
208+
.Trashes
209+
.VolumeIcon.icns
210+
211+
# Directories potentially created on remote AFP share
212+
.AppleDB
213+
.AppleDesktop
214+
Network Trash Folder
215+
Temporary Items
216+
.apdisk
217+
218+
# Misc.
219+
packages
220+
Tools/RealmWeaver.Fody.dll
221+
wrappers/DerivedData
222+
wrappers/core
223+
wrappers/realm-core*.bz2
224+
doxyout
225+
doxyoutCS
226+
doxyoutCS_docOnly

0 commit comments

Comments
 (0)