Skip to content

Commit c85d038

Browse files
oskarboskarb
committed
Allow git to handle line ending conversions properly (.gitattributes), and normalize all line endings.
1 parent db414f7 commit c85d038

File tree

4,639 files changed

+621659
-621630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,639 files changed

+621659
-621630
lines changed

‎.gitattributes

+35-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
1-
* -text
2-
*.csproj merge=union
3-
*.vbproj merge=union
4-
*.fsproj merge=union
5-
*.dbproj merge=union
6-
*.sln merge=union
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.cs text diff=csharp
7+
*.xaml text
8+
*.txt text
9+
*.tt text
10+
*.ps1 text
11+
*.cmd text
12+
*.msbuild text
13+
*.md text
14+
15+
*.sln text eol=crlf merge=union
16+
*.csproj text merge=union
17+
*.vbproj text merge=union
18+
*.fsproj text merge=union
19+
*.dbproj text merge=union
20+
21+
22+
# Binary files
23+
*.png binary
24+
*.jpg binary
25+
*.dll binary
26+
*.exe binary
27+
28+
29+
30+
31+
32+
33+
34+
35+

‎.gitignore

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Top-level .gitignore.
2-
# Rules that apply mainly for for Visual Studio projects should go in src/.gitignore
3-
# to avoid applying to e.g. the Tools and lib directories.
4-
5-
build
6-
*.bak
7-
NHibernate.VisualState.xml
8-
available-test-configurations
9-
current-test-configuration
10-
11-
# This will be copied from the build directory to the lib directory in order
12-
# to satisfy later build steps. But it should not be committed.
13-
NHibernate.dll
1+
# Top-level .gitignore.
2+
# Rules that apply mainly for for Visual Studio projects should go in src/.gitignore
3+
# to avoid applying to e.g. the Tools and lib directories.
4+
5+
build
6+
*.bak
7+
NHibernate.VisualState.xml
8+
available-test-configurations
9+
current-test-configuration
10+
11+
# This will be copied from the build directory to the lib directory in order
12+
# to satisfy later build steps. But it should not be committed.
13+
NHibernate.dll

‎.hgignore

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
# Ignore file for Visual Studio 2008/2010
2-
3-
# use glob syntax
4-
syntax: glob
5-
6-
*.obj
7-
*.exe
8-
*.pdb
9-
*.user
10-
*.aps
11-
*.pch
12-
*.vspscc
13-
*_i.c
14-
*_p.c
15-
*.ncb
16-
*.suo
17-
*.tlb
18-
*.tlh
19-
*.bak
20-
*.cache
21-
*.ilk
22-
*.log
23-
*.lib
24-
*.sbr
25-
*.scc
26-
[Bb]in
27-
[Db]ebug*/
28-
obj/
29-
[Rr]elease*/
30-
*resharper*
31-
_ReSharper*/
32-
[Tt]est[Rr]esult*
33-
[Bb]uild[Ll]og.*
34-
*.[Pp]ublish.xml
35-
glob:NHibernate.dll
36-
glob:nhibernate\build\
37-
glob:AssemblyInfo.cs
1+
# Ignore file for Visual Studio 2008/2010
2+
3+
# use glob syntax
4+
syntax: glob
5+
6+
*.obj
7+
*.exe
8+
*.pdb
9+
*.user
10+
*.aps
11+
*.pch
12+
*.vspscc
13+
*_i.c
14+
*_p.c
15+
*.ncb
16+
*.suo
17+
*.tlb
18+
*.tlh
19+
*.bak
20+
*.cache
21+
*.ilk
22+
*.log
23+
*.lib
24+
*.sbr
25+
*.scc
26+
[Bb]in
27+
[Db]ebug*/
28+
obj/
29+
[Rr]elease*/
30+
*resharper*
31+
_ReSharper*/
32+
[Tt]est[Rr]esult*
33+
[Bb]uild[Ll]og.*
34+
*.[Pp]ublish.xml
35+
glob:NHibernate.dll
36+
glob:nhibernate\build\
37+
glob:AssemblyInfo.cs

‎HowInstall.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Required Bins : Minimal required assemblies to work with NHibernate
2-
3-
4-
Required for LazyLoading :
5-
NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading
6-
Details are available in releasenotes.txt and in this post
7-
http://nhforge.org/blogs/nhibernate/archive/2008/11/09/nh2-1-0-bytecode-providers.aspx
1+
Required Bins : Minimal required assemblies to work with NHibernate
2+
3+
4+
Required for LazyLoading :
5+
NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading
6+
Details are available in releasenotes.txt and in this post
7+
http://nhforge.org/blogs/nhibernate/archive/2008/11/09/nh2-1-0-bytecode-providers.aspx

‎NHibernate.nunit

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<NUnitProject>
2-
<Settings activeconfig="Debug" processModel="Multiple" />
3-
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
4-
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
5-
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
6-
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
7-
</Config>
8-
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
9-
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
10-
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
11-
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
12-
</Config>
1+
<NUnitProject>
2+
<Settings activeconfig="Debug" processModel="Multiple" />
3+
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
4+
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
5+
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
6+
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
7+
</Config>
8+
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
9+
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
10+
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
11+
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
12+
</Config>
1313
</NUnitProject>

‎ReleaseProcedure.txt

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
These are the tasks typically needed to create an official NHibernate release.
2-
3-
4-
* In Jira, make sure no open issues have "fix version" set to the release
5-
that is about to happen (as these will show in the release notes).
6-
7-
* Update releasenotes.txt with list of issues from Jira's Release Notes
8-
feature. See if any additions to the list of "known breaking changes"
9-
are necessary.
10-
11-
* Check/update version number in build-common/common.xml.
12-
13-
* Don't forget to commit the above.
14-
15-
* Perform the release build including running all tests (GaRelease.bat or
16-
ShowBuildMenu.bat).
17-
18-
NOTE: If you prefer to keep your source code in a path like e.g.:
19-
C:\Users\Something\Long\Projects\nhibernate-core
20-
you may want to issue a command like:
21-
subst P: C:\Users\Something\Long\Projects
22-
And then change to P:\nhibernate-core before building. This will avoid
23-
displaying a long user-specific path in public symbol files.
24-
25-
* If no error or other issue requiring further changes occurred, tag the
26-
current git HEAD with a tag according to version number. Don't forget to
27-
push the tag to github.
28-
29-
* Upload binary and source zip files to SourceForge. Update the "latest
30-
release".
31-
32-
* Update download link on NHForge.
33-
34-
* Push nuget packages including the symbol packages. The nuget packages
35-
should already be available in the build directory, together with a batch
36-
file to push them.
37-
38-
* In Jira, mark the version as released.
39-
40-
* Post release announcement to nhusers, nhibernate-development and as
41-
project news on SourceForge.
42-
43-
44-
* If this was a stable branch, merge it forward to master. Perhaps some
45-
changes need to be edited out in the merge, but this will reduce the
46-
risk of some issue being left unfixed on master.
47-
48-
49-
* Several weeks or months after the release, in Jira, we will assume all
50-
issues resolved in the release have been verified. Go ahead and close
51-
them.
1+
These are the tasks typically needed to create an official NHibernate release.
2+
3+
4+
* In Jira, make sure no open issues have "fix version" set to the release
5+
that is about to happen (as these will show in the release notes).
6+
7+
* Update releasenotes.txt with list of issues from Jira's Release Notes
8+
feature. See if any additions to the list of "known breaking changes"
9+
are necessary.
10+
11+
* Check/update version number in build-common/common.xml.
12+
13+
* Don't forget to commit the above.
14+
15+
* Perform the release build including running all tests (GaRelease.bat or
16+
ShowBuildMenu.bat).
17+
18+
NOTE: If you prefer to keep your source code in a path like e.g.:
19+
C:\Users\Something\Long\Projects\nhibernate-core
20+
you may want to issue a command like:
21+
subst P: C:\Users\Something\Long\Projects
22+
And then change to P:\nhibernate-core before building. This will avoid
23+
displaying a long user-specific path in public symbol files.
24+
25+
* If no error or other issue requiring further changes occurred, tag the
26+
current git HEAD with a tag according to version number. Don't forget to
27+
push the tag to github.
28+
29+
* Upload binary and source zip files to SourceForge. Update the "latest
30+
release".
31+
32+
* Update download link on NHForge.
33+
34+
* Push nuget packages including the symbol packages. The nuget packages
35+
should already be available in the build directory, together with a batch
36+
file to push them.
37+
38+
* In Jira, mark the version as released.
39+
40+
* Post release announcement to nhusers, nhibernate-development and as
41+
project news on SourceForge.
42+
43+
44+
* If this was a stable branch, merge it forward to master. Perhaps some
45+
changes need to be edited out in the merge, but this will reduce the
46+
risk of some issue being left unfixed on master.
47+
48+
49+
* Several weeks or months after the release, in Jira, we will assume all
50+
issues resolved in the release have been verified. Go ahead and close
51+
them.

0 commit comments

Comments
 (0)