Skip to content

Commit

Permalink
Merge branch 'master' into dnSpy
Browse files Browse the repository at this point in the history
  • Loading branch information
spacehamster committed Jul 29, 2020
2 parents 465548d + 8dc6b7a commit d69ce7a
Show file tree
Hide file tree
Showing 2,427 changed files with 797,156 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ version | git hash
2018.4.5 | fe1fb53ecc6e26f9c19a7018d4ac19f22c25e964
2018.4.5-mbe | 9afd58f5bc5e32934d43f3b66488a9547dd2dcaf
2018.4.10 | fe1fb53ecc6e26f9c19a7018d4ac19f22c25e964
2018.4.10-mbe | 33140fdd1d0484ea241552c4d7f0526efc16e84c
2018.4.15 | fe1fb53ecc6e26f9c19a7018d4ac19f22c25e964
2018.4.15-mbe | fc58448f0d127d58604135f1ed06b7c91d0b5b21
2019.1.0 | 3a543c233aa42c6a5c786118747d73140745427b
Expand Down
28 changes: 28 additions & 0 deletions unity-2018.4.10-mbe/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# see http://editorconfig.org/ for docs on this file

root = true

[*]
end_of_line = lf
trim_trailing_whitespace = false
insert_final_newline = false
indent_style = tab
indent_size = 4

# this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
# the settings are meant to closely match what VS does to minimize unnecessary diffs. this duplicates some settings in *
# but let's be explicit here to be safe (in case someone wants to copy-paste this out to another .editorconfig).
[*.{vcxproj,vcxproj.filters,csproj,props,targets}]
indent_style = space
indent_size = 2
end_of_line = crlf
charset = utf-8-bom
trim_trailing_whitespace = true
insert_final_newline = false
[*.{sln,sln.template}]
indent_style = tab
indent_size = 4
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = false
69 changes: 69 additions & 0 deletions unity-2018.4.10-mbe/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# ensure LF endings on all checkouts
configure.ac crlf=input
config.rpath crlf=input
configure.host crlf=input
mkinstalldirs crlf=input
*.sh crlf=input
*.sources crlf=input
.gitattributes crlf=input
*akefile* crlf=input

# ensure native line endings on checkout
*.c crlf
*.h crlf
*.cs crlf
*.il crlf

# don't do anything to line-endings. Let CRLFs go into the repo, and CRLF on checkout
*.bat -crlf
*.sln -crlf
*.*proj* -crlf
*.xml -crlf

# CRLF Handling
# -------------
#
# The ideal situation would be to do no EOL normalization. Each file
# would have a default EOL, and tools on Windows and Linux would handle
# both EOL formats.
#
# We're not in the ideal world. A popular editor on Windows (possibly
# Visual Studio) silently introduces EOL corruption -- it displays an
# LF-file normally, but any newly added lines have CRLF. On Linux,
# Emacs and versions of VI handle LF-files and CRLF-files properly.
# However, emacs doesn't like files with both LF and CRLF EOLs. Editing
# the file without additional action will increase the EOL corruption
# in the file.
#
# Another vector for mixed EOLs is scripts. We mostly don't have scripts
# that add new lines -- so we rarely see this. However, one major event
# in the tree was the addition of copyright headers using a script. That
# script introduced EOL corruption.
#
# Any automated EOL normalization of files already in the repository will
# cause difficulties in traversing histories, assigning blame, etc. So, we
# don't want to change what's in the repository significantly, even if it
# causes trouble.
#
# What we do now:
#
# a) we ensure that there's no further corruption of LF-files. So, we use
# git's 'crlf' attribute on those files to ensure that things are fine
# when we work on Windows. We could use 'crlf=input', but it doesn't buy
# us much -- we might as well be working with consistent EOLs for files in
# working directories as well as in the repository
#
# b) if the file already of CRLFs, we don't do any normalization. We use '-crlf'
# so that git doesn't do any EOL-conversion of the file. As I said, this
# is mostly harmless on Linux. We can't mark these files as 'crlf' or use
# the new (git 1.7.2) 'eol=crlf' attribute, since it changes the contents
# _inside_ the repository [1], and hence makes history traversal annoying.
# So, we live with occasional EOL corruption.
#
# c) We can handle mixed-EOL files on a case-by-case basis, converting them to
# LF- or CRLF-files based on which causes fewer lines to change
#
# d) We try to ensure no further headaches, by declaring EOL normalization on
# code files, and Unix-flavoured files, like shell-scripts, makefiles, etc.
#
# [1] GIT use LFs as the normalized internal representation.
139 changes: 139 additions & 0 deletions unity-2018.4.10-mbe/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
##############################################################################
# General
##############################################################################

# OS junk files
[Tt]humbs.db
*.DS_Store

# Visual Studio / MonoDevelop
*.[Oo]bj
*.exe
*.dll
*.pdb
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.ilk
*.log
*.lib
*.sbr
*.sdf
*.opensdf
*.resources
*.res
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
*.gpState
.vscode/
*.exp

# Tooling
_ReSharper*/
*.resharper
.idea/*
[Tt]est[Rr]esult*
*.orig
*.rej

# NuGet packages
!.nuget/*
[Pp]ackages/*
![Pp]ackages/repositories.config

# Temporary Files
~.*
~$*

# Autotools-generated files
/Makefile
Makefile.in
aclocal.m4
autom4te.cache
/build/
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.scan
cygconfig.h
depcomp
install-sh
libtool
ltmain.sh
missing
mkinstalldirs
releases
stamp-h
stamp-h1
stamp-h.in
/test-driver
*~
*.swp
*.o
.deps

# Libtool
libtool.m4
lt~obsolete.m4
ltoptions.m4
ltsugar.m4
ltversion.m4

# Dolt (libtool replacement)
doltlibtool
doltcompile

# pkg-config
*.pc

# Emacs
semantic.cache

# gtags
GPATH
GRTAGS
GSYMS
GTAGS

# Doxygen
docs/doxygen*
docs/perlmod*

# Bee
artifacts
.vs
external/buildscripts/build.gen*

# Allow
!external/buildscripts/bee.exe

##############################################################################
# Mono-specific patterns
##############################################################################

.dirstamp
compile
mono.h
mono-*.tar.*
tmpinst-dir.stamp
msvc/scripts/inputs/
extensions-config.h

Loading

0 comments on commit d69ce7a

Please sign in to comment.