Skip to content

Commit e4ed461

Browse files
tilligtillig
committed
Merge branch 'develop'
2 parents e2b1e84 + 3b924a5 commit e4ed461

78 files changed

Lines changed: 4805 additions & 2448 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: 228 additions & 122 deletions
Large diffs are not rendered by default.

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*.png binary
1414
*.gif binary
1515

16-
*.cs text=auto diff=csharp
16+
*.cs text=auto diff=csharp
1717
*.vb text=auto
1818
*.resx text=auto
1919
*.c text=auto

‎.github/workflows/main.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Continuous Integration
2+
on:
3+
pull_request:
4+
branches:
5+
- develop
6+
- main
7+
push:
8+
branches:
9+
- develop
10+
- main
11+
- feature/*
12+
tags:
13+
- v[0-9]+.[0-9]+.[0-9]+
14+
# If multiple pushes happen quickly in succession, cancel the running build
15+
# and start a new one.
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
cancel-in-progress: true
19+
jobs:
20+
ci:
21+
uses: autofac/.github/.github/workflows/ci.yml@main
22+
secrets: inherit
23+
with:
24+
solution: Autofac.Pooling.sln

‎.gitignore‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ _TeamCity*
8484
# DotCover is a Code Coverage Tool
8585
*.dotCover
8686

87-
# Coverage
88-
coverage.*
89-
codecov.sh
90-
coverage/
91-
9287
# NCrunch
9388
*.ncrunch*
9489
.*crunch*.local.xml
@@ -114,7 +109,6 @@ publish/
114109
*.pubxml
115110

116111
# NuGet Packages Directory
117-
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
118112
packages/
119113

120114
# Windows Azure Build Output
@@ -128,6 +122,8 @@ AppPackages/
128122
sql/
129123
*.Cache
130124
ClientBin/
125+
[Ss]tyle[Cc]op.*
126+
!stylecop.json
131127
~$*
132128
*~
133129
*.dbmdl
@@ -137,6 +133,7 @@ node_modules/
137133
bower_components/
138134
wwwroot/
139135
project.lock.json
136+
*.Designer.cs
140137

141138
# RIA/Silverlight projects
142139
Generated_Code/
@@ -171,3 +168,6 @@ $RECYCLE.BIN/
171168

172169
# JetBrains Rider
173170
.idea
171+
172+
# Reasonix AI assistant
173+
.reasonix/

‎.markdownlint.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"MD013": false
3+
}

‎.pre-commit-config.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: "3e8a8703264a2f4a69428a0aa4dcb512790b2c8c" # frozen: v6.0.0
4+
hooks:
5+
- id: check-json
6+
- id: check-yaml
7+
- id: check-merge-conflict
8+
- id: end-of-file-fixer
9+
- id: trailing-whitespace
10+
- repo: https://github.com/igorshubovych/markdownlint-cli
11+
rev: "c7c1c7640e610068e8e4754e9f1bf109bd987dc7" # post-v0.48.0 with patches
12+
hooks:
13+
- id: markdownlint
14+
args:
15+
- --fix
16+
- repo: https://github.com/tillig/json-sort-cli
17+
rev: "2b7e147e0933bd30b58133b6f287e5c695ff4f0e" # frozen: v3.0.1
18+
hooks:
19+
- id: json-sort
20+
args:
21+
- --autofix

‎.vscode/extensions.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"recommendations": [
3-
"formulahendry.dotnet-test-explorer",
4-
"ms-dotnettools.csharp",
3+
"davidanson.vscode-markdownlint",
54
"editorconfig.editorconfig",
6-
"davidanson.vscode-markdownlint"
5+
"ms-dotnettools.csdevkit",
6+
"travisillig.vscode-json-stable-stringify"
77
]
88
}

‎.vscode/launch.json‎

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

‎.vscode/settings.json‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
11
{
2-
"omnisharp.enableEditorConfigSupport": true,
3-
"omnisharp.enableRoslynAnalyzers": true
2+
"cSpell.words": [
3+
"autofac",
4+
"xunit"
5+
],
6+
"coverage-gutters.coverageBaseDir": "artifacts/logs",
7+
"coverage-gutters.coverageFileNames": [
8+
"**/coverage.cobertura.xml"
9+
],
10+
"dotnet.defaultSolution": "Autofac.Pooling.sln",
11+
"dotnet.unitTestDebuggingOptions": {
12+
"enableStepFiltering": false,
13+
"justMyCode": false,
14+
"requireExactSource": false,
15+
"sourceLinkOptions": {
16+
"*": {
17+
"enabled": true
18+
}
19+
},
20+
"suppressJITOptimizations": true,
21+
"symbolOptions": {
22+
"searchNuGetOrgSymbolServer": true
23+
}
24+
},
25+
"explorer.fileNesting.enabled": true,
26+
"explorer.fileNesting.patterns": {
27+
"*.resx": "$(capture).*.resx, $(capture).designer.cs, $(capture).designer.vb"
28+
},
29+
"files.watcherExclude": {
30+
"**/target": true
31+
}
432
}

‎.vscode/tasks.json‎

Lines changed: 88 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,88 @@
1-
{
2-
"tasks": [
3-
{
4-
"args": [
5-
"watch",
6-
"run",
7-
"${workspaceFolder}/test/Autofac.Pooling.Tests/Autofac.Pooling.Tests.csproj",
8-
"/property:GenerateFullPaths=true",
9-
"/consoleloggerparameters:NoSummary"
10-
],
11-
"command": "dotnet",
12-
"label": "watch",
13-
"problemMatcher": "$msCompile",
14-
"type": "process"
15-
},
16-
{
17-
"args": [
18-
"build",
19-
"/property:GenerateFullPaths=true",
20-
"/consoleloggerparameters:NoSummary"
21-
],
22-
"command": "dotnet",
23-
"group": {
24-
"isDefault": true,
25-
"kind": "build"
26-
},
27-
"label": "build",
28-
"presentation": {
29-
"reveal": "silent"
30-
},
31-
"problemMatcher": "$msCompile",
32-
"type": "shell"
33-
}
34-
],
35-
"version": "2.0.0"
36-
}
1+
{
2+
"linux": {
3+
"options": {
4+
"shell": {
5+
"args": [
6+
"-NoProfile",
7+
"-Command"
8+
],
9+
"executable": "pwsh"
10+
}
11+
}
12+
},
13+
"osx": {
14+
"options": {
15+
"shell": {
16+
"args": [
17+
"-NoProfile",
18+
"-Command"
19+
],
20+
"executable": "/usr/local/bin/pwsh"
21+
}
22+
}
23+
},
24+
"tasks": [
25+
{
26+
"command": "If (Test-Path ${workspaceFolder}/artifacts/logs) { Remove-Item ${workspaceFolder}/artifacts/logs -Recurse -Force }; New-Item -Path ${workspaceFolder}/artifacts/logs -ItemType Directory -Force | Out-Null",
27+
"label": "create log directory",
28+
"type": "shell"
29+
},
30+
{
31+
"args": [
32+
"build",
33+
"${workspaceFolder}/Autofac.Pooling.sln",
34+
"--tl:off",
35+
"/property:GenerateFullPaths=true",
36+
"/consoleloggerparameters:NoSummary"
37+
],
38+
"command": "dotnet",
39+
"group": {
40+
"isDefault": true,
41+
"kind": "build"
42+
},
43+
"label": "build",
44+
"problemMatcher": "$msCompile",
45+
"type": "shell"
46+
},
47+
{
48+
"args": [
49+
"test",
50+
"${workspaceFolder}/Autofac.Pooling.sln",
51+
"/property:GenerateFullPaths=true",
52+
"/consoleloggerparameters:NoSummary",
53+
"--results-directory",
54+
"artifacts/logs",
55+
"--logger:trx",
56+
"--collect:XPlat Code Coverage",
57+
"--settings:build/Coverage.runsettings",
58+
"--filter",
59+
"FullyQualifiedName!~Bench"
60+
],
61+
"command": "dotnet",
62+
"dependsOn": [
63+
"create log directory"
64+
],
65+
"group": {
66+
"isDefault": true,
67+
"kind": "test"
68+
},
69+
"label": "test",
70+
"problemMatcher": "$msCompile",
71+
"type": "process"
72+
}
73+
],
74+
"version": "2.0.0",
75+
"windows": {
76+
"options": {
77+
"shell": {
78+
"args": [
79+
"-NoProfile",
80+
"-ExecutionPolicy",
81+
"Bypass",
82+
"-Command"
83+
],
84+
"executable": "pwsh.exe"
85+
}
86+
}
87+
}
88+
}

0 commit comments

Comments
 (0)