Skip to content

Commit 87d1c0b

Browse files
mikependonmikependon
authored
Merge branch 'master' into dependabot/nuget/RepoDb.PostgreSql/RepoDb.PostgreSql.IntegrationTests/Npgsql-8.0.3
2 parents 65e3c19 + 13b12b3 commit 87d1c0b

104 files changed

Lines changed: 3868 additions & 2509 deletions

File tree

Some content is hidden

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

‎.editorconfig‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Top-most EditorConfig file
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 4
7+
tab_width = 4
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
end_of_line = lf
11+
12+
[*.{csproj,props,build}]
13+
indent_size = 2
14+
15+
[*.{cs,vb}]
16+
# Organize usings
17+
dotnet_separate_import_directive_groups = false
18+
dotnet_sort_system_directives_first = true
19+
20+
[*.cs]
21+
# CS1574: XML comment has cref attribute that could not be resolved
22+
dotnet_diagnostic.CS1574.severity = none

‎.github/workflows/build-pr.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Build & Run Tests for PR
2+
on:
3+
pull_request:
4+
5+
env:
6+
REPODB_SQLSERVER_CONSTR_MASTER: "Server=tcp:127.0.0.1,41433;Database=master;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
7+
REPODB_SQLSERVER_CONSTR_REPODB: "Server=tcp:127.0.0.1,41433;Database=RepoDb;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
8+
REPODB_SQLSERVER_CONSTR_REPODBTEST: "Server=tcp:127.0.0.1,41433;Database=RepoDbTest;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
9+
REPODB_POSTGRESQL_CONSTR_POSTGRESDB: "Server=127.0.0.1;Port=45432;Database=postgres;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
10+
REPODB_POSTGRESQL_CONSTR: "Server=127.0.0.1;Port=45432;Database=RepoDb;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
11+
REPODB_POSTGRESQL_CONSTR_BULK: "Server=127.0.0.1;Port=45432;Database=RepoDbBulk;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
12+
REPODB_MYSQL_CONSTR_SYS: "Server=127.0.0.1;Port=43306;Database=sys;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
13+
REPODB_MYSQL_CONSTR_REPODB: "Server=127.0.0.1;Port=43306;Database=RepoDb;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
14+
REPODB_MYSQL_CONSTR_REPODBTEST: "Server=127.0.0.1;Port=43306;Database=RepoDbTest;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
20+
# Services. See docker-compose.yml
21+
services:
22+
mssql:
23+
image: mcr.microsoft.com/mssql/server:2022-latest
24+
ports:
25+
- 127.0.0.1:41433:1433
26+
env:
27+
ACCEPT_EULA: true
28+
MSSQL_SA_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
29+
30+
postgresql:
31+
image: postgres:latest
32+
ports:
33+
- 127.0.0.1:45432:5432
34+
env:
35+
POSTGRES_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
36+
37+
mysql:
38+
image: mysql:latest
39+
ports:
40+
- 127.0.0.1:43306:3306
41+
env:
42+
MYSQL_ROOT_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
43+
44+
steps:
45+
- name: Check out repository code
46+
uses: actions/checkout@v4
47+
48+
- name: Setup .NET Versions
49+
uses: actions/setup-dotnet@v4
50+
with:
51+
dotnet-version: |
52+
6.0.x
53+
7.0.x
54+
8.0.x
55+
56+
- name: build
57+
run: dotnet build -c release
58+
59+
- name: test
60+
run: dotnet test -c release -f net8.0 --no-build -p:TestingPlatformShowTestsFailure=true -p:TestingPlatformCaptureOutput=false
61+
62+
- name: pack packages
63+
run: dotnet pack -c release -p Version="1.14.0-dev-pr-${{ github.run_number }}" -o release RepoDb.Core/RepoDb.All.sln
64+
65+
- name: Package nupkg files
66+
uses: actions/upload-artifact@v3
67+
with:
68+
name: release
69+
path: release/*nupkg

‎.github/workflows/build.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Build & Run Tests (Push)
2+
on:
3+
push
4+
5+
env:
6+
REPODB_SQLSERVER_CONSTR_MASTER: "Server=tcp:127.0.0.1,41433;Database=master;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
7+
REPODB_SQLSERVER_CONSTR_REPODB: "Server=tcp:127.0.0.1,41433;Database=RepoDb;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
8+
REPODB_SQLSERVER_CONSTR_REPODBTEST: "Server=tcp:127.0.0.1,41433;Database=RepoDbTest;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;"
9+
REPODB_POSTGRESQL_CONSTR_POSTGRESDB: "Server=127.0.0.1;Port=45432;Database=postgres;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
10+
REPODB_POSTGRESQL_CONSTR: "Server=127.0.0.1;Port=45432;Database=RepoDb;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
11+
REPODB_POSTGRESQL_CONSTR_BULK: "Server=127.0.0.1;Port=45432;Database=RepoDbBulk;User Id=postgres;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
12+
REPODB_MYSQL_CONSTR_SYS: "Server=127.0.0.1;Port=43306;Database=sys;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
13+
REPODB_MYSQL_CONSTR_REPODB: "Server=127.0.0.1;Port=43306;Database=RepoDb;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
14+
REPODB_MYSQL_CONSTR_REPODBTEST: "Server=127.0.0.1;Port=43306;Database=RepoDbTest;User ID=root;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;"
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
20+
# Services. See docker-compose.yml
21+
services:
22+
mssql:
23+
image: mcr.microsoft.com/mssql/server:2022-latest
24+
ports:
25+
- 127.0.0.1:41433:1433
26+
env:
27+
ACCEPT_EULA: true
28+
MSSQL_SA_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
29+
30+
postgresql:
31+
image: postgres:latest
32+
ports:
33+
- 127.0.0.1:45432:5432
34+
env:
35+
POSTGRES_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
36+
37+
mysql:
38+
image: mysql:latest
39+
ports:
40+
- 127.0.0.1:43306:3306
41+
env:
42+
MYSQL_ROOT_PASSWORD: ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2
43+
44+
steps:
45+
- name: Check out repository code
46+
uses: actions/checkout@v4
47+
48+
- name: Setup .NET Versions
49+
uses: actions/setup-dotnet@v4
50+
with:
51+
dotnet-version: |
52+
6.0.x
53+
7.0.x
54+
8.0.x
55+
56+
- name: build
57+
run: dotnet build -c release RepoDb.Core/RepoDb.All.sln
58+
59+
- name: test for .Net 8.0
60+
run: dotnet test -c release -f net8.0 --no-build -p:TestingPlatformShowTestsFailure=true -p:TestingPlatformCaptureOutput=false RepoDb.Core/RepoDb.All.sln
61+
62+
- name: pack packages
63+
run: dotnet pack -c release -p Version="1.14.0-dev-${{ github.run_number }}" -o release RepoDb.Core/RepoDb.All.sln
64+
65+
- name: Package nupkg files
66+
uses: actions/upload-artifact@v3
67+
with:
68+
name: release
69+
path: release/*nupkg

‎Directory.Build.props‎

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

0 commit comments

Comments
 (0)