Skip to content

Commit efaaa70

Browse files
csharper2010csharper2010
committed
2 parents 103949d + 7de0282 commit efaaa70

File tree

539 files changed

+17258
-3142
lines changed

Some content is hidden

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

539 files changed

+17258
-3142
lines changed

‎.config/dotnet-tools.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33
"isRoot": true,
44
"tools": {
55
"csharpasyncgenerator.tool": {
6-
"version": "0.19.1",
6+
"version": "0.20.1",
77
"commands": [
88
"async-generator"
99
]
10+
},
11+
"gitreleasemanager.tool": {
12+
"version": "0.11.0",
13+
"commands": [
14+
"dotnet-gitreleasemanager"
15+
]
1016
}
1117
}
1218
}

‎.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/Async/**/*.cs",
7+
"src/NHibernate.DomainModel/Async/**/*.cs",
8+
"src/NHibernate.Test/Async/**/*.cs"
9+
]
10+
11+
[[analyzers]]
12+
name = "csharp"
13+
enabled = true

‎.github/renovate.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:base"
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+
"matchPackagePrefixes": [
19+
"NUnit"
20+
],
21+
"groupName": "NUnit"
22+
},
23+
{
24+
"matchPackageNames": [
25+
"Microsoft.AspNetCore",
26+
"Microsoft.AspNetCore.Mvc",
27+
"Microsoft.AspNetCore.Mvc.Razor.ViewCompilation",
28+
"Microsoft.AspNetCore.StaticFiles"
29+
],
30+
"groupName": "Microsoft.AspNetCore 2.0",
31+
"allowedVersions": "~2.1.0"
32+
},
33+
{
34+
"matchPackagePrefixes": [
35+
"Oracle.ManagedDataAccess"
36+
],
37+
"groupName": "Oracle.ManagedDataAccess"
38+
}
39+
]
40+
}

‎.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@v2
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: 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;SslMode=none;"
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:21-slim
54+
55+
- uses: actions/checkout@v3
56+
- name: Setup .NET
57+
uses: actions/setup-dotnet@v2
58+
with:
59+
dotnet-version: 6.0.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}}'}"

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ TestResult.xml
1919
.vs/
2020
/build-common/NHibernate.dev.props
2121
/doc/reference/master.xml
22+
/doc/bin/
23+
/doc/obj/
24+
/Tools/bin/
25+
/Tools/obj/

‎.travis.yml

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

‎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>

‎ReleaseProcedure.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ These are the tasks typically needed to create an official NHibernate release.
33
* In GitHub, make sure no open issues have milestone set to the release
44
that is about to happen (as these will show in the milestone).
55

6-
* Create a draft release in Github with GitReleaseManager. If you have used
7-
the NHibernate build menu, it should be available in Tools\gitreleasemanager\x.x.x\
8-
(change x.x.x by its current version in tools).
9-
By example:
6+
* Restore local dotnet tools: `dotnet tool restore`
107

11-
Tools\gitreleasemanager\0.11.0\tools\GitReleaseManager.exe create -o nhibernate -r nhibernate-core -m 5.3 --token yourGitHubTokenWithRepoScope
8+
* Create a draft release in Github with GitReleaseManager. For example:
9+
10+
dotnet gitreleasemanager create -o nhibernate -r nhibernate-core -m 5.3 --token yourGitHubTokenWithRepoScope
1211

1312
(Adjust the -m milestone parameter above, and add "-c branchname" if
1413
releasing another branch than master)

‎ShowBuildMenu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ testSetupMenu() {
172172
}
173173

174174
testRun(){
175-
dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f netcoreapp2.0
176-
dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f netcoreapp2.0
175+
dotnet test ./src/NHibernate.Test/NHibernate.Test.csproj -f net6.0
176+
dotnet test ./src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj -f net6.0
177177
mainMenu
178178
}
179179

0 commit comments

Comments
 (0)