Skip to content

Commit bb1bf45

Browse files
gokhanabataygokhanabatay
authored
Merge pull request #33 from nhibernate/master
master update
2 parents cf32e05 + 4dfff6a commit bb1bf45

File tree

477 files changed

+17331
-2386
lines changed

Some content is hidden

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

477 files changed

+17331
-2386
lines changed

‎.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"csharpasyncgenerator.tool": {
6+
"version": "0.19.1",
7+
"commands": [
8+
"async-generator"
9+
]
10+
}
11+
}
12+
}

‎.github/dependabot.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: nuget
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
ignore:
9+
- dependency-name: Microsoft.AspNetCore
10+
versions:
11+
- "> 2.0.0"
12+
- dependency-name: Microsoft.AspNetCore.Mvc
13+
versions:
14+
- "> 2.0.0"
15+
- dependency-name: Microsoft.AspNetCore.Mvc.Razor.ViewCompilation
16+
versions:
17+
- "> 2.0.0"
18+
- dependency-name: Microsoft.AspNetCore.StaticFiles
19+
versions:
20+
- "> 2.0.0"

‎.github/workflows/NetCoreTests.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: .NET Core
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
db:
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
include:
11+
- DB: SqlServer2008
12+
CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
13+
- DB: PostgreSQL
14+
CONNECTION_STRING: "Host=localhost;Username=nhibernate;Password=nhibernate;Database=nhibernate;Enlist=true;"
15+
- DB: Firebird
16+
CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
17+
- DB: MySQL
18+
CONNECTION_STRING: "Server=localhost;Uid=root;Password=nhibernate;Database=nhibernate;Old Guids=True;"
19+
- DB: Oracle
20+
CONNECTION_STRING: "User ID=nhibernate;Password=nhibernate;Metadata Pooling=false;Self Tuning=false;Data Source=(DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521)) (CONNECT_DATA = (SERVER = DEDICATED) (SERVICE_NAME = XEPDB1)))"
21+
- DB: SQLite
22+
runs-on: ubuntu-latest
23+
continue-on-error: ${{matrix.ALLOW_FAILURE == true}}
24+
env:
25+
LANG: en-US.UTF-8 #default POSIX locale doesn't support ignore case comparisons
26+
name: ${{matrix.DB}}
27+
28+
steps:
29+
- name: Set up SqlServer
30+
if: matrix.DB == 'SqlServer2008'
31+
run: |
32+
docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=P@ssw0rd" -e "MSSQL_PID=Express" -p 1433:1433 -d --name sqlexpress mcr.microsoft.com/mssql/server:2019-latest;
33+
34+
- name: Set up MySQL
35+
if: matrix.DB == 'MySQL'
36+
run: |
37+
sudo service mysql stop
38+
docker run --name mysql -e MYSQL_ROOT_PASSWORD=nhibernate -e MYSQL_USER=nhibernate -e MYSQL_PASSWORD=nhibernate -e MYSQL_DATABASE=nhibernate -p 3306:3306 --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 -d mysql:5.7 mysqld --lower_case_table_names=1 --character-set-server=utf8 --collation-server=utf8_general_ci
39+
40+
- name: Set up PostgreSQL
41+
if: matrix.DB == 'PostgreSQL'
42+
run: |
43+
docker run -d -e POSTGRES_USER=nhibernate -e POSTGRES_PASSWORD=nhibernate -e POSTGRES_DB=nhibernate -p 5432:5432 postgres:13
44+
45+
- name: Set up Firebird
46+
if: matrix.DB == 'Firebird'
47+
run: |
48+
docker run --name firebird -e EnableWireCrypt=true -e FIREBIRD_USER=nhibernate -e FIREBIRD_PASSWORD=nhibernate -e ISC_PASSWORD=nhibernate -e FIREBIRD_DATABASE=nhibernate -p 3050:3050 -d jacobalberty/firebird:v3.0
49+
50+
- name: Set up Oracle
51+
if: matrix.DB == 'Oracle'
52+
run: |
53+
docker run -d -p 1521:1521 -e APP_USER=nhibernate -e APP_USER_PASSWORD=nhibernate -e ORACLE_PASSWORD=nhibernate gvenzl/oracle-xe:18-slim
54+
55+
- uses: actions/checkout@v2
56+
- name: Setup .NET
57+
uses: actions/[email protected]
58+
with:
59+
dotnet-version: 2.1.x
60+
61+
- name: Build and Test
62+
run: |
63+
pwsh -noprofile -command "& ./build.ps1 -TaskList Set-Configuration,Test -properties @{'Database' = '${{matrix.DB}}';'ConnectionString'='${{matrix.CONNECTION_STRING}}'}"

‎.travis.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎HowInstall.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Required Bins : Minimal required assemblies to work with NHibernate
44
Required for LazyLoading :
55
NHibernate 2.1 has a new important feature regarding dynamic-proxy systems for lazy-loading
66
Details are available in releasenotes.txt and in this post
7-
http://nhibernate.info/blog/2008/11/09/nh2-1-0-bytecode-providers.html
7+
https://nhibernate.info/blog/2008/11/09/nh2-1-0-bytecode-providers.html

‎README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ Welcome to NHibernate
44
NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed,
55
fully featured and used in thousands of successful projects.
66

7-
The NHibernate community website - <http://nhibernate.info> - has a range of resources to help you get started,
7+
The NHibernate community website - <https://nhibernate.info> - has a range of resources to help you get started,
88
including [howtos][A1], [blogs][A2] and [reference documentation][A3].
99

10-
[A1]: http://nhibernate.info/doc/
11-
[A2]: http://nhibernate.info/blog/
12-
[A3]: http://nhibernate.info/doc/nh/en/index.html
10+
[A1]: https://nhibernate.info/doc/
11+
[A2]: https://nhibernate.info/blog/
12+
[A3]: https://nhibernate.info/doc/nh/en/index.html
1313

1414
Latest Release Version
1515
--------------
1616

1717
The quickest way to get the latest release of NHibernate is to add it to your project using
18-
NuGet (<http://nuget.org/List/Packages/NHibernate>).
18+
NuGet (<https://nuget.org/List/Packages/NHibernate>).
1919

2020
Alternatively binaries are available from SourceForge at <http://sourceforge.net/projects/nhibernate>.
2121

@@ -58,8 +58,8 @@ If you find any bugs, please report them using the [GitHub issue tracker][C1]. A
5858
test-case that demonstrates the issue is usually required. Instructions on providing a test-case
5959
can be found in [contributing guidelines][C3] or [here][C2].
6060

61-
[C1]: http://github.com/nhibernate/nhibernate-core/issues
62-
[C2]: http://nhibernate.info/blog/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
61+
[C1]: https://github.com/nhibernate/nhibernate-core/issues
62+
[C2]: https://nhibernate.info/blog/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.html
6363
[C3]: CONTRIBUTING.md
6464

6565
Licenses
@@ -103,7 +103,7 @@ of NHibernate (in no particular order):
103103
[Apache Software Foundation]: http://www.apache.org
104104
[JetBrains]: http://www.jetbrains.com
105105
[ReSharper]: http://www.jetbrains.com/resharper
106-
[LinFu]: http://code.google.com/p/linfu
106+
[LinFu]: https://github.com/philiplaureano/LinFu
107107
[article]: http://www.codeproject.com/KB/recipes/sets.aspx
108-
[Relinq]: http://relinq.codeplex.com/
108+
[Relinq]: https://github.com/re-motion/Relinq
109109
[AsyncGenerator]: http://github.com/maca88/AsyncGenerator

‎ShowBuildMenu.sh

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -178,36 +178,15 @@ testRun(){
178178
}
179179

180180
generateAsync(){
181-
dotnet restore ./src/NHibernate.sln
182-
183-
getAsyncGeneratorPath
184181
cd src
185-
dotnet ../"$async_generator_path"
182+
dotnet tool restore
183+
dotnet restore ./NHibernate.sln
184+
dotnet async-generator
186185
cd ..
187186

188187
mainMenu
189188
}
190189

191-
getAsyncGeneratorPath(){
192-
if [ "$async_generator_path" ]
193-
then
194-
return
195-
fi
196-
197-
cd Tools
198-
199-
async_generator_version="$(cat packages.csproj | grep Include=\"CSharpAsyncGenerator.CommandLine | cut -d\" -f4)"
200-
async_generator_path="csharpasyncgenerator.commandline/$async_generator_version/tools"
201-
202-
if [ ! -d $async_generator_path ]
203-
then
204-
dotnet restore "./packages.csproj" --packages .
205-
fi
206-
207-
async_generator_path="Tools/$async_generator_path/netcoreapp2.1/AsyncGenerator.CommandLine.dll"
208-
cd ..
209-
}
210-
211190
mainMenu() {
212191
echo "========================= NHIBERNATE BUILD MENU =========================="
213192
echo "--- TESTING ---"

‎Tools/packages.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="CSharpAsyncGenerator.CommandLine" Version="0.18.2" />
1514
<PackageReference Include="vswhere" Version="2.1.4" />
1615
<PackageReference Include="NUnit.Console" Version="3.10.0" />
1716
<PackageReference Include="GitReleaseManager" Version="0.11.0" />

‎appveyor.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ environment:
88
CONNECTION_STRING: Host=localhost;Port=5432;Username=postgres;Password=Password12!;Database=nhibernate;Enlist=true;
99
- DB: Firebird
1010
- DB: MySQL
11-
CONNECTION_STRING: Server=127.0.0.1;Uid=root;Pwd=Password12!;Database=nhibernate;Old Guids=True;
11+
CONNECTION_STRING: Server=127.0.0.1;Uid=root;Pwd=Password12!;Database=nhibernate;Old Guids=True;SslMode=none;
1212
- DB: SQLite
1313
init:
1414
# Required for having windows endlines in sources zip
1515
- git config --global core.autocrlf true
16-
matrix:
17-
allow_failures:
18-
- DB: MySQL
1916
build: off
2017
before_test:
2118
- ps: |-

‎build-common/NHibernate.props

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<Import Condition="Exists('NHibernate.dev.props')" Project="NHibernate.dev.props"/>
33

44
<PropertyGroup>
5-
<NhVersion Condition="'$(NhVersion)' == ''" >5.3</NhVersion>
5+
<NhVersion Condition="'$(NhVersion)' == ''" >5.4</NhVersion>
66
<VersionPatch Condition="'$(VersionPatch)' == ''">0</VersionPatch>
77
<!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
8-
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
8+
<VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
99

1010
<VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
1111
<VersionSuffix Condition="'$(VersionSuffix)' != '' AND '$(BuildNumber)' != ''">$(VersionSuffix).$(BuildNumber)</VersionSuffix>
@@ -25,8 +25,9 @@
2525
<Authors>NHibernate community, Hibernate community</Authors>
2626
<NeutralLanguage>en-US</NeutralLanguage>
2727

28-
<PackageProjectUrl>http://nhibernate.info</PackageProjectUrl>
28+
<PackageProjectUrl>https://nhibernate.info</PackageProjectUrl>
2929
<PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
30+
<PackageIcon>NHibernate-NuGet.png</PackageIcon>
3031
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
3132
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
3233
<PackageReleaseNotes Condition="'$(VersionSuffix)' == ''">https://github.com/nhibernate/nhibernate-core/blob/$(VersionPrefix)/releasenotes.txt</PackageReleaseNotes>
@@ -41,6 +42,6 @@
4142
<DisableImplicitPackageTargetFallback>True</DisableImplicitPackageTargetFallback>
4243
</PropertyGroup>
4344
<ItemGroup>
44-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
45+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
4546
</ItemGroup>
4647
</Project>

‎build-common/common.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
</target>
4949

5050
<target name="common.tools-restore" depends="common.init">
51+
<exec workingdir="${root.dir}" program="dotnet" verbose="true">
52+
<arg line="tool restore" />
53+
</exec>
5154
<exec workingdir="${root.dir}/Tools" program="dotnet" verbose="true">
5255
<arg line="restore ./packages.csproj --packages ." />
5356
</exec>

‎default.build

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,9 @@
6464
<property name="tool.path" value="${tools.dir}/${tool.id}/${tool.version}/" />
6565
</target>
6666

67-
<target name="find-async-generator-console">
68-
<property name="tool.id" value="CSharpAsyncGenerator.CommandLine" />
69-
<call target="get-tool-info" />
70-
<property name="async-generator-console" value="${tool.path}tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll" />
71-
</target>
72-
73-
<target name="generate-async" depends="solution-restore find-async-generator-console">
67+
<target name="generate-async" depends="solution-restore">
7468
<exec workingdir="${root.dir}/src" program="dotnet" verbose="true">
75-
<arg line=".${async-generator-console}" />
69+
<arg line="async-generator" />
7670
</exec>
7771
</target>
7872

‎doc/reference/modules/nhibernate_mapping_attributes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<abstract id="mapping-attributes-abstract">
66
<title>What is NHibernate.Mapping.Attributes?</title>
77
<formalpara>
8-
<title>NHibernate.Mapping.Attributes is an add-in for <ulink url="http://nhibernate.info/">NHibernate</ulink> contributed by Pierre Henri Kuaté
8+
<title>NHibernate.Mapping.Attributes is an add-in for <ulink url="https://nhibernate.info/">NHibernate</ulink> contributed by Pierre Henri Kuaté
99
(aka <emphasis>KPixel</emphasis>); the former implementation was made by John Morris.</title>
1010
<para>NHibernate require mapping streams to bind your domain model to your database. Usually, they are written (and maintained) in separated hbm.xml files.</para>
1111
</formalpara>

‎doc/reference/modules/preface.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</listitem>
6767
<listitem>
6868
<para>
69-
The Community Area on the <ulink url="http://nhibernate.info/">NHibernate website</ulink> is a good source for
69+
The Community Area on the <ulink url="https://nhibernate.info/">NHibernate website</ulink> is a good source for
7070
design patterns and various integration solutions (ASP.NET, Windows Forms).
7171
</para>
7272
</listitem>

‎doc/reference/modules/query_criteria.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,13 @@ using (ITransaction txn = session.BeginTransaction())
364364
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.For<Cat>()
365365
.SetProjection( Projections.Avg("Weight") );
366366
session.CreateCriteria<Cat>()
367-
.Add( Subqueries.Gt("Weight", avgWeight) )
367+
.Add( Subqueries.PropertyGt("Weight", avgWeight) )
368368
.List<Cat>();]]></programlisting>
369369

370370
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.For<Cat>()
371371
.SetProjection( Projections.Property("Weight") );
372372
session.CreateCriteria<Cat>()
373-
.Add( Subqueries.GeAll("Weight", weights) )
373+
.Add( Subqueries.PropertyGeAll("Weight", weights) )
374374
.List<Cat>();]]></programlisting>
375375

376376
<para>
@@ -381,7 +381,7 @@ session.CreateCriteria<Cat>()
381381
.SetProjection( Projections.Avg("Weight") )
382382
.Add( Expression.EqProperty("cat2.Sex", "cat.Sex") );
383383
session.CreateCriteria(typeof(Cat), "cat")
384-
.Add( Subqueries.Gt("weight", avgWeightForSex) )
384+
.Add( Subqueries.PropertyGt("Weight", avgWeightForSex) )
385385
.List<Cat>();]]></programlisting>
386386

387387
</sect1>

‎doc/reference/modules/toolset_guide.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ new SchemaExport(cfg).Create(false, true);]]></programlisting>
370370
</table>
371371
<para>
372372
A more detailed guide of <literal>hbm2net</literal> is available in
373-
http://nhibernate.info/blog/2009/12/12/t4-hbm2net-alpha-2.html
373+
https://nhibernate.info/blog/2009/12/12/t4-hbm2net-alpha-2.html
374374
</para>
375375
376376

0 commit comments

Comments
 (0)