Skip to content

Commit

Permalink
Allow git to handle line ending conversions properly (.gitattributes)…
Browse files Browse the repository at this point in the history
…, and normalize all line endings.
  • Loading branch information
oskarb committed Aug 26, 2014
1 parent db414f7 commit c85d038
Show file tree
Hide file tree
Showing 4,639 changed files with 621,659 additions and 621,630 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
41 changes: 35 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
* -text
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
*.sln merge=union
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.cs text diff=csharp
*.xaml text
*.txt text
*.tt text
*.ps1 text
*.cmd text
*.msbuild text
*.md text

*.sln text eol=crlf merge=union
*.csproj text merge=union
*.vbproj text merge=union
*.fsproj text merge=union
*.dbproj text merge=union


# Binary files
*.png binary
*.jpg binary
*.dll binary
*.exe binary









26 changes: 13 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Top-level .gitignore.
# Rules that apply mainly for for Visual Studio projects should go in src/.gitignore
# to avoid applying to e.g. the Tools and lib directories.

build
*.bak
NHibernate.VisualState.xml
available-test-configurations
current-test-configuration

# This will be copied from the build directory to the lib directory in order
# to satisfy later build steps. But it should not be committed.
NHibernate.dll
# Top-level .gitignore.
# Rules that apply mainly for for Visual Studio projects should go in src/.gitignore
# to avoid applying to e.g. the Tools and lib directories.

build
*.bak
NHibernate.VisualState.xml
available-test-configurations
current-test-configuration

# This will be copied from the build directory to the lib directory in order
# to satisfy later build steps. But it should not be committed.
NHibernate.dll
74 changes: 37 additions & 37 deletions .hgignore
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# Ignore file for Visual Studio 2008/2010
# use glob syntax
syntax: glob
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
*.lib
*.sbr
*.scc
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
*resharper*
_ReSharper*/
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
glob:NHibernate.dll
glob:nhibernate\build\
glob:AssemblyInfo.cs
# Ignore file for Visual Studio 2008/2010

# use glob syntax
syntax: glob

*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
*.lib
*.sbr
*.scc
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
*resharper*
_ReSharper*/
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
glob:NHibernate.dll
glob:nhibernate\build\
glob:AssemblyInfo.cs
14 changes: 7 additions & 7 deletions HowInstall.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Required Bins : Minimal required assemblies to work with NHibernate
Required for LazyLoading :
NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading
Details are available in releasenotes.txt and in this post
http://nhforge.org/blogs/nhibernate/archive/2008/11/09/nh2-1-0-bytecode-providers.aspx
Required Bins : Minimal required assemblies to work with NHibernate


Required for LazyLoading :
NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading
Details are available in releasenotes.txt and in this post
http://nhforge.org/blogs/nhibernate/archive/2008/11/09/nh2-1-0-bytecode-providers.aspx
24 changes: 12 additions & 12 deletions NHibernate.nunit
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<NUnitProject>
<Settings activeconfig="Debug" processModel="Multiple" />
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
</Config>
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
</Config>
<NUnitProject>
<Settings activeconfig="Debug" processModel="Multiple" />
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Debug-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\NHibernate.Test.VisualBasic.dll" />
</Config>
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\NHibernate.TestDatabaseSetup.dll" />
<assembly path="src\NHibernate.Test\bin\Release-2.0\NHibernate.Test.dll" />
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\NHibernate.Test.VisualBasic.dll" />
</Config>
</NUnitProject>
102 changes: 51 additions & 51 deletions ReleaseProcedure.txt
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
These are the tasks typically needed to create an official NHibernate release.
* In Jira, make sure no open issues have "fix version" set to the release
that is about to happen (as these will show in the release notes).
* Update releasenotes.txt with list of issues from Jira's Release Notes
feature. See if any additions to the list of "known breaking changes"
are necessary.
* Check/update version number in build-common/common.xml.
* Don't forget to commit the above.
* Perform the release build including running all tests (GaRelease.bat or
ShowBuildMenu.bat).
NOTE: If you prefer to keep your source code in a path like e.g.:
C:\Users\Something\Long\Projects\nhibernate-core
you may want to issue a command like:
subst P: C:\Users\Something\Long\Projects
And then change to P:\nhibernate-core before building. This will avoid
displaying a long user-specific path in public symbol files.
* If no error or other issue requiring further changes occurred, tag the
current git HEAD with a tag according to version number. Don't forget to
push the tag to github.
* Upload binary and source zip files to SourceForge. Update the "latest
release".
* Update download link on NHForge.
* Push nuget packages including the symbol packages. The nuget packages
should already be available in the build directory, together with a batch
file to push them.
* In Jira, mark the version as released.
* Post release announcement to nhusers, nhibernate-development and as
project news on SourceForge.
* If this was a stable branch, merge it forward to master. Perhaps some
changes need to be edited out in the merge, but this will reduce the
risk of some issue being left unfixed on master.
* Several weeks or months after the release, in Jira, we will assume all
issues resolved in the release have been verified. Go ahead and close
them.
These are the tasks typically needed to create an official NHibernate release.


* In Jira, make sure no open issues have "fix version" set to the release
that is about to happen (as these will show in the release notes).

* Update releasenotes.txt with list of issues from Jira's Release Notes
feature. See if any additions to the list of "known breaking changes"
are necessary.

* Check/update version number in build-common/common.xml.

* Don't forget to commit the above.

* Perform the release build including running all tests (GaRelease.bat or
ShowBuildMenu.bat).

NOTE: If you prefer to keep your source code in a path like e.g.:
C:\Users\Something\Long\Projects\nhibernate-core
you may want to issue a command like:
subst P: C:\Users\Something\Long\Projects
And then change to P:\nhibernate-core before building. This will avoid
displaying a long user-specific path in public symbol files.

* If no error or other issue requiring further changes occurred, tag the
current git HEAD with a tag according to version number. Don't forget to
push the tag to github.

* Upload binary and source zip files to SourceForge. Update the "latest
release".

* Update download link on NHForge.

* Push nuget packages including the symbol packages. The nuget packages
should already be available in the build directory, together with a batch
file to push them.

* In Jira, mark the version as released.

* Post release announcement to nhusers, nhibernate-development and as
project news on SourceForge.


* If this was a stable branch, merge it forward to master. Perhaps some
changes need to be edited out in the merge, but this will reduce the
risk of some issue being left unfixed on master.


* Several weeks or months after the release, in Jira, we will assume all
issues resolved in the release have been verified. Go ahead and close
them.
Loading

0 comments on commit c85d038

Please sign in to comment.