Skip to content

Commit 7fce0ce

Browse files
hazzikhazzik
committed
Merge remote-tracking branch 'origin/master' into NH-3396
2 parents 0bb091f + f38a6fd commit 7fce0ce

File tree

1,421 files changed

+68841
-14407
lines changed

Some content is hidden

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

1,421 files changed

+68841
-14407
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"csharpasyncgenerator.tool": {
6+
"version": "0.21.1",
7+
"commands": [
8+
"async-generator"
9+
]
10+
},
11+
"gitreleasemanager.tool": {
12+
"version": "0.11.0",
13+
"commands": [
14+
"dotnet-gitreleasemanager"
15+
]
16+
}
17+
}
18+
}

‎.deepsource.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version = 1
2+
3+
test_patterns = ["src/NHibernate.Test/**"]
4+
5+
exclude_patterns = [
6+
"src/NHibernate/**/*.generated.cs",
7+
"src/NHibernate/Async/**/*.cs",
8+
"src/NHibernate.DomainModel/Async/**/*.cs",
9+
"src/NHibernate.Test/Async/**/*.cs"
10+
]
11+
12+
[[analyzers]]
13+
name = "csharp"

‎.github/renovate.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
],
6+
"configMigration": true,
7+
"pruneStaleBranches": false,
8+
"automerge": true,
9+
"platformAutomerge": true,
10+
"rebaseWhen": "never",
11+
"labels": [
12+
"dependencies",
13+
"p: Lowest",
14+
"t: Task"
15+
],
16+
"packageRules": [
17+
{
18+
"matchSourceUrls": [
19+
"https://github.com/nunit/nunit"
20+
],
21+
"groupName": "NUnit"
22+
},
23+
{
24+
"matchPackagePrefixes": [
25+
"Oracle.ManagedDataAccess"
26+
],
27+
"groupName": "Oracle.ManagedDataAccess"
28+
},
29+
{
30+
"matchPackagePrefixes": [
31+
"NHibernate.Caches"
32+
],
33+
"groupName": "NHibernate.Caches"
34+
}
35+
]
36+
}

‎.github/workflows/GenerateAsyncCode.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Generate Async code
2+
3+
on:
4+
pull_request_target:
5+
paths:
6+
- '**.cs'
7+
8+
permissions: {}
9+
10+
jobs:
11+
generate-async:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v3
16+
with:
17+
ref: ${{ github.event.pull_request.head.ref }}
18+
repository: ${{ github.event.pull_request.head.repo.full_name }}
19+
token: ${{ secrets.NHIBERNATE_BOT_TOKEN }}
20+
21+
- name: Setup .NET
22+
uses: actions/setup-dotnet@v3
23+
with:
24+
dotnet-version: 6.0.x
25+
26+
- name: Generate Async code
27+
run: |
28+
pushd src
29+
dotnet tool restore
30+
dotnet restore ./NHibernate.sln
31+
dotnet async-generator
32+
popd
33+
34+
- name: Push changes
35+
run: |
36+
git config user.name github-actions[bot]
37+
git config user.email github-actions[bot]@users.noreply.github.com
38+
if [[ -z "$(git status --porcelain)" ]]; then
39+
echo "No changes to commit"
40+
exit 0
41+
fi
42+
git add -A
43+
git commit -am "Generate async files"
44+
git push

‎.github/workflows/NetCoreTests.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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_INIT: |
14+
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;
15+
- DB: SqlServer2008-MicrosoftDataSqlClientDriver
16+
CONNECTION_STRING: "Server=localhost;initial catalog=nhibernate;User Id=sa;Password=P@ssw0rd;packet size=4096;"
17+
DB_INIT: |
18+
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;
19+
- DB: PostgreSQL
20+
CONNECTION_STRING: "Host=localhost;Username=nhibernate;Password=nhibernate;Database=nhibernate;Enlist=true;"
21+
DB_INIT: |
22+
docker run -d -e POSTGRES_USER=nhibernate -e POSTGRES_PASSWORD=nhibernate -e POSTGRES_DB=nhibernate -p 5432:5432 postgres:13
23+
- DB: Firebird
24+
CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
25+
DB_INIT: |
26+
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
27+
- DB: Firebird4
28+
CONNECTION_STRING: "DataSource=localhost;Database=nhibernate;User=SYSDBA;Password=nhibernate;charset=utf8;"
29+
DB_INIT: |
30+
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:v4.0
31+
- DB: MySQL
32+
CONNECTION_STRING: "Server=localhost;Uid=root;Password=nhibernate;Database=nhibernate;Old Guids=True;SslMode=none;"
33+
DB_INIT: |
34+
sudo service mysql stop
35+
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
36+
- DB: Oracle
37+
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)))"
38+
DB_INIT: |
39+
docker run -d -p 1521:1521 -e APP_USER=nhibernate -e APP_USER_PASSWORD=nhibernate -e ORACLE_PASSWORD=nhibernate gvenzl/oracle-xe:21-slim
40+
- DB: SQLite
41+
runs-on: ubuntu-latest
42+
continue-on-error: ${{matrix.ALLOW_FAILURE == true}}
43+
env:
44+
LANG: en-US.UTF-8 #default POSIX locale doesn't support ignore case comparisons
45+
name: ${{matrix.DB}}
46+
47+
steps:
48+
- name: Set up ${{matrix.DB}}
49+
run: ${{matrix.DB_INIT}}
50+
- uses: actions/checkout@v3
51+
- name: Setup .NET
52+
uses: actions/setup-dotnet@v3
53+
with:
54+
dotnet-version: 6.0.x
55+
56+
- name: Build and Test
57+
run: |
58+
pwsh -noprofile -command "& ./build.ps1 -TaskList Set-Configuration,Test -properties @{'Database' = '${{matrix.DB}}';'ConnectionString'='${{matrix.CONNECTION_STRING}}'}"

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ TestResult.xml
1818
.idea/
1919
.vs/
2020
/build-common/NHibernate.dev.props
21+
/doc/reference/master.xml
22+
/doc/bin/
23+
/doc/obj/
24+
/Tools/bin/
25+
/Tools/obj/

‎.travis.yml‎

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

‎GitReleaseManager.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ issue-labels-exclude:
1313
- "r: Obsolete"
1414
- "r: Rejected"
1515
- "r: Replaced"
16+
- "r: Reverted"
1617
- "t: Fix"
1718
issue-labels-alias:
1819
- name: "t: Bug"

‎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

‎NHibernate.nunit‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<NUnitProject>
22
<Settings activeconfig="Debug" processModel="Multiple" />
33
<Config name="Debug" binpathtype="Auto" runtimeFramework="net-4.0">
4-
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\net461\NHibernate.TestDatabaseSetup.dll" />
5-
<assembly path="src\NHibernate.Test\bin\Debug\net461\NHibernate.Test.dll" />
6-
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\net461\NHibernate.Test.VisualBasic.dll" />
4+
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Debug\net48\NHibernate.TestDatabaseSetup.dll" />
5+
<assembly path="src\NHibernate.Test\bin\Debug\net48\NHibernate.Test.dll" />
6+
<assembly path="src\NHibernate.Test.VisualBasic\bin\Debug\net48\NHibernate.Test.VisualBasic.dll" />
77
</Config>
88
<Config name="Release" binpathtype="Auto" runtimeFramework="net-4.0">
9-
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\net461\NHibernate.TestDatabaseSetup.dll" />
10-
<assembly path="src\NHibernate.Test\bin\Release\net461\NHibernate.Test.dll" />
11-
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\net461\NHibernate.Test.VisualBasic.dll" />
9+
<assembly path="src\NHibernate.TestDatabaseSetup\bin\Release\net48\NHibernate.TestDatabaseSetup.dll" />
10+
<assembly path="src\NHibernate.Test\bin\Release\net48\NHibernate.Test.dll" />
11+
<assembly path="src\NHibernate.Test.VisualBasic\bin\Release\net48\NHibernate.Test.VisualBasic.dll" />
1212
</Config>
1313
</NUnitProject>

0 commit comments

Comments
 (0)