Skip to content

Commit 75a1618

Browse files
committed
Unify build metadata with core Autofac.
1 parent 3e7f55e commit 75a1618

8 files changed

Lines changed: 104 additions & 58 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ publish/
109109
*.pubxml
110110

111111
# NuGet Packages Directory
112-
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
113112
packages/
114113

115114
# Windows Azure Build Output
@@ -123,6 +122,8 @@ AppPackages/
123122
sql/
124123
*.Cache
125124
ClientBin/
125+
[Ss]tyle[Cc]op.*
126+
!stylecop.json
126127
~$*
127128
*~
128129
*.dbmdl
@@ -132,6 +133,7 @@ node_modules/
132133
bower_components/
133134
wwwroot/
134135
project.lock.json
136+
*.Designer.cs
135137

136138
# RIA/Silverlight projects
137139
Generated_Code/

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"recommendations": [
33
"davidanson.vscode-markdownlint",
44
"editorconfig.editorconfig",
5-
"ms-dotnettools.csharp"
5+
"ms-dotnettools.csdevkit",
6+
"travisillig.vscode-json-stable-stringify"
67
]
78
}

.vscode/settings.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,26 @@
77
"coverage-gutters.coverageFileNames": [
88
"**/coverage.cobertura.xml"
99
],
10-
"omnisharp.enableEditorConfigSupport": true
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+
}
1132
}

.vscode/tasks.json

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,37 @@
11
{
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+
},
224
"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+
},
330
{
431
"args": [
532
"build",
633
"Autofac.Pooling.sln",
34+
"--tl:off",
735
"/property:GenerateFullPaths=true",
836
"/consoleloggerparameters:NoSummary"
937
],
@@ -13,12 +41,48 @@
1341
"kind": "build"
1442
},
1543
"label": "build",
16-
"presentation": {
17-
"reveal": "silent"
18-
},
1944
"problemMatcher": "$msCompile",
2045
"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"
2172
}
2273
],
23-
"version": "2.0.0"
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+
}
2488
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MIT License
1+
The MIT License (MIT)
22

33
Copyright (c) 2020 Autofac Project
44

build/CodeAnalysisDictionary.xml

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

codecov.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
codecov:
22
branch: develop
3-
require_ci_to_pass: yes
3+
require_ci_to_pass: true
4+
coverage:
5+
status:
6+
project:
7+
default:
8+
threshold: 1%

default.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<Exec Command="dotnet build &quot;%(SolutionFile.FullPath)&quot; -c $(Configuration) /p:Version=$(Version)" />
5858
</Target>
5959
<Target Name="Package">
60-
<MakeDir Directories="$(PackageDirectory)" />
61-
<Exec Command="dotnet pack &quot;%(SourceProject.Identity)&quot; -c $(Configuration) --no-build --output &quot;$(PackageDirectory)&quot; /p:Version=$(Version)" />
60+
<MakeDir Directories="$([System.IO.Path]::Combine($(PackageDirectory),%(PublishProject.Filename)))" />
61+
<Exec Command="dotnet pack &quot;%(SolutionFile.FullPath)&quot; -c $(Configuration) --output &quot;$(PackageDirectory)&quot; /p:Version=$(Version)" />
6262
</Target>
6363
<Target Name="Test">
6464
<MakeDir Directories="$(LogDirectory)" />

0 commit comments

Comments
 (0)