-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Extensions consolidation #32912
Merged
Merged
Extensions consolidation #32912
Changes from all commits
Commits
Show all changes
606 commits
Select commit
Hold shift + click to select a range
3f80448
Merge pull request dotnet/Extensions#2219 from dotnet-maestro-bot/mer…
wtgodbe fd3c939
Merge pull request dotnet/Extensions#2216 from dotnet-maestro-bot/mer…
wtgodbe a1e6309
Merge pull request dotnet/Extensions#2220 from dotnet-maestro-bot/mer…
wtgodbe 69f0b11
Merge branch 'master' into merge/release/3.0-to-master
dougbu a45878a
Merge branch 'release/3.0' => 'master' (dotnet/Extensions#2222)
dougbu 10c6124
Fix dotnet/Extensions#2044 by updating doc comment (dotnet/Extensions…
analogrelay 7578412
Merge branch 'release/3.0' into merge/release/3.0-preview9-to-release…
pranavkm 07e8a46
Merge branch 'release/3.0-preview9' => 'release/3.0' (dotnet/Extensio…
dougbu 47956ea
Merge branch 'release/3.0' => 'master' (dotnet/Extensions#2228)
dougbu d58fb21
Merge branch 'master' into merge/release/3.0-to-master
dougbu ca56f2e
Merge branch 'release/3.0' => 'master' (dotnet/Extensions#2229)
dougbu cc63097
Merge branch 'master' into merge/release/3.0-to-master
dougbu 0a07165
Merge branch 'release/3.0' => 'master' (dotnet/Extensions#2233)
dougbu 2f1fc86
Corrected casing in comment. (dotnet/Extensions#2235)
dlemstra 82e4269
Merge branch 'master' into merge/release/3.0-to-master
wtgodbe b29f4e1
Merge pull request dotnet/Extensions#2239 from dotnet-maestro-bot/mer…
wtgodbe 9fc548b
Add XML Docs for pubternal types
Pilchie bec0c1f
Merge pull request dotnet/Extensions#2240 from dotnet-maestro-bot/mer…
pranavkm 197cc5b
Merge branch 'master' into merge/release/3.0-to-master
dougbu 244fe58
Merge branch 'release/3.0' => 'master' (dotnet/Extensions#2242)
dougbu 3b8db3a
Merge pull request dotnet/Extensions#2246 from dotnet-maestro-bot/mer…
BrennanConroy ff62677
Merge branch 'master' into merge/release/3.1-to-master
dougbu 5adfade
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2249)
dougbu e7e393c
Merge branch 'master' into merge/release/3.1-to-master
dougbu 9def091
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2256)
dougbu d378108
Merge branch 'master' into merge/release/3.1-to-master
dougbu b761d9b
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2261)
dougbu 916de85
Merge branch 'master' into merge/release/3.1-to-master
dougbu 69ba608
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2264)
dougbu 3ceeb79
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2270)
dougbu 1d38ad2
Merge branch 'master' into merge/release/3.1-to-master
dougbu 74e706e
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2277)
dougbu cefb0f2
Update DI and Hosting to use Microsoft.Bcl.AsyncInterfaces (dotnet/Ex…
kevinchalet 0df6447
Merge branch 'master' into merge/release/3.1-to-master
dougbu a3aaf64
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
36de1da
Merge pull request dotnet/Extensions#2286 from dotnet-maestro-bot/mer…
8c9ce37
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2284)
dougbu 44ec31c
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
d91b18f
Merge branch 'master' into merge/release/3.1-to-master
f44b9a0
Merge pull request dotnet/Extensions#2292 from dotnet-maestro-bot/mer…
eb199b2
Merge pull request dotnet/Extensions#2291 from dotnet-maestro-bot/mer…
f0ec7fc
Merge pull request dotnet/Extensions#2294 from dotnet-maestro-bot/mer…
043e29e
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 178a8e8
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2297)
dougbu 60f077c
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2298)
dougbu 9826118
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 19ad2d3
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu a8e5c50
Merge branch 'master' into merge/release/3.1-to-master
dougbu 5b47526
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2306)
dougbu f6cfe94
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2301)
dougbu 1cbee63
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2307)
dougbu 171cfde
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 6b80179
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2311)
dougbu 95ccccf
Merge branch 'master' into merge/release/3.1-to-master
dougbu b0e0f3a
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2312)
dougbu 702e313
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 5b8f7ce
Merge branch 'master' into merge/release/3.1-to-master
dougbu e675045
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2321)
dougbu a4f3167
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2317)
dougbu 206c7dd
Merge pull request dotnet/Extensions#2322 from dotnet-maestro-bot/mer…
e5d3ea0
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
pranavkm a93a861
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 094b343
Merge branch 'master' into merge/release/3.1-to-master
dougbu dcb15db
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2327)
dougbu 1de13a3
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2328)
dougbu 18132bf
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2335)
dougbu 115b476
Support netcoreapp3.1 TFM (dotnet/Extensions#2336)
7ac5d1a
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
mmitche 9eec6d7
Merge pull request dotnet/Extensions#2337 from dotnet-maestro-bot/mer…
mmitche efe878d
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 54b79f9
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2351)
dougbu 2ee96f6
Update ref assembly generation to use DefaultNetCoreTargetFramework p…
fd1c039
Update ref assembly generation to use DefaultNetCoreTargetFramework p…
d504299
Merge branch 'release/3.1'
feb5cf0
Update ref assembly
0aca63c
Fix tests and tools
5aa7544
Skip F# tests
6ea1296
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2341)
dougbu de16757
Merge branch 'master' into merge/release/3.1-to-master
dougbu c28017f
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2368)
dougbu d5ed264
Merge branch 'master' into merge/release/3.1-to-master
dougbu 05b16d8
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2371)
dougbu 380a4f4
Refactor xUnit extensibility
rynowak a8ff26f
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2
dougbu 62fa489
Merge branch 'release/2.1' => 'release/2.2' (dotnet/Extensions#2383)
dougbu 7331106
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2382)
dougbu 96f302e
Merge branch 'release/2.2' into release/3.0
dougbu 6c9ffe4
Merge branch 'release/2.2' => 'release/3.0' (dotnet/Extensions#2384)
dougbu eb3c264
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 049848c
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2393)
dougbu 8c42ca9
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2394)
dougbu d47fc1f
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 1a367ce
Merge pull request dotnet/Extensions#2401 from dotnet-maestro-bot/mer…
wtgodbe f3cd840
Merge pull request dotnet/Extensions#2407 from dotnet-maestro-bot/mer…
3200594
[release/3.1] Update dependencies from dotnet/core-setup (dotnet/Exte…
dotnet-maestro[bot] e2519fb
Merge branch 'master' into merge/release/3.1-to-master
dougbu 5b41f03
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2408)
dougbu aa567db
Merge pull request dotnet/Extensions#2391 from aspnet/Embedded30
wtgodbe 7930ec5
Merge pull request dotnet/Extensions#2399 from aspnet/Basline
wtgodbe 831b771
Merge branches
wtgodbe 2305834
Merge pull request dotnet/Extensions#2413 from dotnet-maestro-bot/mer…
wtgodbe 2dd2dd7
Merge branch 'master' into merge/release/3.1-to-master
dougbu 6212d8a
Merge pull request dotnet/Extensions#2411 from dotnet-maestro-bot/mer…
wtgodbe fbf380c
Merge branch 'master' into merge/release/3.1-to-master
dougbu 8d955dc
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2433)
dougbu 535df38
Fixing a typo in ChainedBuilderExtensions (dotnet/Extensions#2442)
francisspor 913319f
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
wtgodbe 78f9d24
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
wtgodbe 27b6da1
Merge pull request dotnet/Extensions#2443 from dotnet-maestro-bot/mer…
wtgodbe 5d08c74
Merge branch 'release/3.1' into merge/release/3.1-preview1-to-release…
wtgodbe 5c9db70
Merge pull request dotnet/Extensions#2453 from dotnet-maestro-bot/mer…
wtgodbe 3016499
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 4146af5
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2452)
dougbu eac7130
Merge branch 'master' into merge/release/3.1-to-master
dougbu af12e06
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2447)
dougbu e02c672
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu c46d6e0
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2457)
dougbu 85a5e5a
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2458)
dougbu c7b23fa
Merge branch 'release/3.1' into merge/release/3.1-preview1-to-release…
dougbu d1512dc
Add disposable singleton test cases (dotnet/Extensions#2465)
tomakita 598da8b
Merge branch 'release/3.1-preview1' => 'release/3.1' (dotnet/Extensio…
dougbu 3e09bff
Merge branch 'master' into merge/release/3.1-to-master
dougbu 485a0cf
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2468)
dougbu 8386d33
Merge branch 'release/3.1' into merge/release/3.1-preview1-to-release…
dougbu d18b4e3
Merge branch 'release/3.1-preview1' => 'release/3.1' (dotnet/Extensio…
dougbu a379d74
Merge branch 'master' into merge/release/3.1-to-master
dougbu 39e43c5
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2471)
dougbu 46e0880
Updating the documentation for SourceName (dotnet/Extensions#2400)
amgdy 862a8d5
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 4a4adef
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2473)
dougbu c75633d
Merge pull request dotnet/Extensions#2474 from dotnet-maestro-bot/mer…
rynowak e89dcad
[automated] Merge branch 'release/3.1' => 'master'
Tratcher 56fac32
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 8d6bdc6
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2489)
dougbu 27d84ef
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2490)
dougbu 38c127b
Compile using ref assemblies (dotnet/Extensions#2483)
1be3307
Fix IL builder's undefined behavior for defaulted value types.
brandondahler 3c83f71
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu 6a96c18
Merge branch 'master' into merge/release/3.1-to-master
dougbu 6d42789
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2493)
dougbu 659936e
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu fe6a1b7
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2508)
dougbu 05a3081
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2494)
dougbu f03cea7
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2509)
dougbu d016d46
Fix typo (dotnet/Extensions#2512)
DAXaholic 9083b63
Merge branch 'master' into merge/release/3.1-to-master
dougbu 1f1230d
Merge pull request dotnet/Extensions#2510 from dotnet-maestro-bot/mer…
wtgodbe 7216592
Split off original test modification into new test, add other value t…
brandondahler 7ee250e
Add comment explaining purpose of loop in the test.
brandondahler 174331f
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
dougbu c21fc85
Merge branch 'release/3.0' => 'release/3.1' (dotnet/Extensions#2526)
dougbu ca7a888
Merge branch 'master' into merge/release/3.1-to-master
dougbu c875abc
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2517)
dougbu f6bd0b0
Merge branch 'master' into merge/release/3.1-to-master
dougbu 069df20
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2529)
dougbu 8af8483
Merge branch 'master' into merge/release/3.1-to-master
dougbu dc171fc
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2532)
dougbu bb78987
Merge branch 'master' into merge/release/3.1-to-master
dougbu 8dd6b5b
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2534)
dougbu 6db6c27
Provide capability to use UTC time notation for console logs (dotnet/…
tomkerkhove 1b19492
Merge pull request dotnet/Extensions#2540 from dotnet-maestro-bot/mer…
davidfowl 342cdc1
Merge branch 'master' into merge/release/3.1-to-master
davidfowl 204c954
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2545)
davidfowl 8f937e7
Merge pull request dotnet/Extensions#2501 from brandondahler/bugfix/D…
davidfowl cb3848d
Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…
BrennanConroy 6cd1bd1
Merge pull request dotnet/Extensions#2578 from dotnet-maestro-bot/mer…
BrennanConroy b0b0573
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
mmitche 8c07615
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
BrennanConroy d08a623
[master] Update dependencies from dotnet/core-setup dotnet/arcade (do…
dotnet-maestro[bot] 5d42baa
Merge pull request dotnet/Extensions#2583 from dotnet-maestro-bot/mer…
BrennanConroy b90c2bd
Merge branch 'master' into merge/release/3.1-to-master
BrennanConroy 3a417bf
Merge pull request dotnet/Extensions#2585 from dotnet-maestro-bot/mer…
BrennanConroy 0e98ab4
Merge branch 'master' into merge/release/3.1-to-master
sebastienros 5128eac
Add event name for hosting logs (dotnet/Extensions#2627)
Kahbazi 38eee54
Merge pull request dotnet/Extensions#2631 from dotnet-maestro-bot/mer…
sebastienros 77ee7b5
Merge branch 'master' into merge/release/3.1-to-master
sebastienros ff0fa0c
Merge pull request dotnet/Extensions#2636 from dotnet-maestro-bot/mer…
sebastienros e688552
Merge branch 'release/3.1'
Tratcher 74233fa
Merge pull request dotnet/Extensions#2667 from dotnet-maestro-bot/mer…
Tratcher 1ebc1bb
Merge branch 'master' into merge/release/3.1-to-master
dougbu 49f138d
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2674)
dougbu cd9e739
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2
wtgodbe 34191fc
Merge branchess
wtgodbe 9330e4e
Merge pull request dotnet/Extensions#2696 from dotnet-maestro-bot/mer…
wtgodbe 74cc9ca
Merge pull request dotnet/Extensions#2704 from dotnet-maestro-bot/mer…
wtgodbe 39595a5
Merge pull request dotnet/Extensions#2702 from dotnet-maestro-bot/mer…
wtgodbe 9eb9165
Merge branch 'release/3.1' into merge/release/3.0-to-release/3.1
wtgodbe 2d924e8
merge branches
wtgodbe b3d5400
Merge pull request dotnet/Extensions#2707 from dotnet-maestro-bot/mer…
wtgodbe ceba3de
Merge pull request dotnet/Extensions#2712 from dotnet-maestro-bot/mer…
wtgodbe 5228483
Merge branch 'master' into merge/release/3.1-to-master
wtgodbe 4773422
Merge pull request dotnet/Extensions#2714 from dotnet-maestro-bot/mer…
wtgodbe fed7901
Updated PR with my changes
jkotalik 0f52f8d
Merge pull request dotnet/Extensions#2721 from dotnet-maestro-bot/mer…
jkotalik f69f07d
Fix wrong parameter description (dotnet/Extensions#2730)
DAXaholic df4ed41
Merge branch 'master' into merge/release/3.1-to-master
pranavkm 8920f83
doc improvements (dotnet/Extensions#2675)
mairaw d6fd1c7
Merge pull request dotnet/Extensions#2736 from dotnet-maestro-bot/mer…
pranavkm 4b9e06e
[automated] Merge branch 'release/3.0' => 'release/3.1' (dotnet/Exten…
dotnet-maestro-bot 275034b
Merge branch 'master' into merge/release/3.1-to-master
pranavkm df5b029
updating inline <code> to <c>
eddynaka e02c7db
Apply suggestions from code review
eddynaka 98cde60
updating inline <code> to <c> (dotnet/Extensions#2751)
analogrelay 5c7c494
Merge pull request dotnet/Extensions#2749 from dotnet-maestro-bot/mer…
pranavkm c2e2ce5
Merge branch 'master' into merge/release/3.1-to-master
sebastienros 5541219
Merge pull request dotnet/Extensions#2771 from dotnet-maestro-bot/mer…
sebastienros a01ad27
Merge pull request dotnet/Extensions#2783 from dotnet-maestro-bot/mer…
dougbu f126f1a
Merge branch 'master' into merge/release/3.1-to-master
dougbu b4fa53c
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2790)
dougbu a432e94
Allow ExecuteAsync cancellation propagation (dotnet/Extensions#2823)
klettier 5c54e63
Preserve functional test logs on CI (dotnet/Extensions#2819)
0f94b8a
Update links for repository move/rename (dotnet/Extensions#2840)
Pilchie 2d54f6f
XML documentation comments for StringValues. (dotnet/Extensions#2780)
benbhall 7afab2e
Set argument if no option has found (dotnet/Extensions#2822)
Kahbazi 1a6ff96
Guard for Custom Implementation of IHostApplicationLifetime (dotnet/…
Kahbazi 6e87c4a
Merge branch 'release/2.1' into release/3.1
jkotalik ff73a7e
Merge branch 'release/3.1'
jkotalik 33e26df
Merge pull request dotnet/Extensions#2860 from dotnet-maestro-bot/mer…
jkotalik a179239
Merge branch 'release/2.1' => 'release/3.1' (dotnet/Extensions#2859)
dougbu 83990ae
Remove ref project from Microsoft.AspNetCore.Testing (dotnet/Extensio…
8fee50c
Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…
96589c2
Merge pull request dotnet/Extensions#2864 from dotnet-maestro-bot/mer…
rynowak edd606e
Merge branch 'master' into merge/release/3.1-to-master
rynowak 456e261
Merge pull request dotnet/Extensions#2876 from dotnet-maestro-bot/mer…
rynowak e809ad5
Merge branch 'master' into merge/release/3.1-to-master
rynowak d37b014
Merge pull request dotnet/Extensions#2881 from dotnet-maestro-bot/mer…
rynowak 6cd8c04
Revert "Remove ref project from Microsoft.AspNetCore.Testing (dotnet/…
wtgodbe cb9e1ae
Contributing: fixed some typos (dotnet/Extensions#2886)
MaherJendoubi 3f14ec0
Correct a typo (dotnet/Extensions#2851)
96e7db0
Merge branch 'release/3.1'
66b24a4
Merge pull request dotnet/Extensions#2883 from dotnet-maestro-bot/mer…
73afec4
Add case sensitivity test for options (dotnet/Extensions#2829)
HaoK 2cec4e4
Remove Mono.WebAssembly.Interop (dotnet/Extensions#2934)
pranavkm aa4cad4
Typo in comment: who's => whose (dotnet/Extensions#2964)
arialdomartini 10dccbc
Clarify doc-comments in IHostApplicationLifetime (dotnet/Extensions#2…
willdean 81a9181
Revert "Revert "Remove ref project from Microsoft.AspNetCore.Testing …
wtgodbe d2b5a30
Merge branch 'release/2.1' into release/3.1
ajaybhargavb 18a5196
Merge pull request dotnet/Extensions#2973 from dotnet-maestro-bot/mer…
Pilchie 20763d6
Document that StringValue ctor accepts a null string (dotnet/Extensio…
breyed 726be18
Merge branch 'master' into merge/release/3.1-to-master
dougbu 3fbdd75
Merge branch 'release/3.1' => 'master' (dotnet/Extensions#2969)
dougbu 96a73b6
Migrate aspnetcore components (dotnet/Extensions#2974)
d298b09
Fix closure allocation in scope DisposeAsync (dotnet/Extensions#3024)
JamesNK e3d4dfe
Normalize all file headers to the expected Apache 2.0 license
sharwell 78c05c3
Switch file headers to the MIT license
sharwell af59643
Update license in reference assemblies
sharwell 74431bc
Restore blank lines
sharwell 519d931
Merge pull request dotnet/Extensions#3028 from sharwell/mit-license
1650655
Merge branch 'runtime-consolidation' from Extensions into 'primitives…
maryamariyan 3df8292
Update build scripts to enable Microsoft.Extensions projects incremen…
maryamariyan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
433 changes: 433 additions & 0 deletions
433
src/libraries/Common/src/Extensions/ActivatorUtilities/ActivatorUtilities.cs
Large diffs are not rendered by default.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
...raries/Common/src/Extensions/ActivatorUtilities/ActivatorUtilitiesConstructorAttribute.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System; | ||
|
||
#if ActivatorUtilities_In_DependencyInjection | ||
namespace Microsoft.Extensions.DependencyInjection | ||
#else | ||
namespace Microsoft.Extensions.Internal | ||
#endif | ||
{ | ||
/// <summary> | ||
/// Marks the constructor to be used when activating type using <see cref="ActivatorUtilities"/>. | ||
/// </summary> | ||
|
||
#if ActivatorUtilities_In_DependencyInjection | ||
public | ||
#else | ||
// Do not take a dependency on this class unless you are explicitly trying to avoid taking a | ||
// dependency on Microsoft.AspNetCore.DependencyInjection.Abstractions. | ||
internal | ||
#endif | ||
class ActivatorUtilitiesConstructorAttribute: Attribute | ||
{ | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
.../src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<Project> | ||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> | ||
|
||
<ItemGroup> | ||
<Compile Include="$(MSBuildThisFileDirectory)..\ParameterDefaultValue\ParameterDefaultValue.cs"> | ||
<Pack>true</Pack> | ||
<PackagePath>$(ContentTargetFolders)\cs\netstandard1.0\</PackagePath> | ||
</Compile> | ||
</ItemGroup> | ||
|
||
<Target Name="Compile" /> | ||
<Target Name="CopyFilesToOutputDirectory" /> | ||
</Project> |
26 changes: 26 additions & 0 deletions
26
src/libraries/Common/src/Extensions/ActivatorUtilities/ObjectFactory.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System; | ||
|
||
#if ActivatorUtilities_In_DependencyInjection | ||
namespace Microsoft.Extensions.DependencyInjection | ||
#else | ||
namespace Microsoft.Extensions.Internal | ||
#endif | ||
{ | ||
|
||
/// <summary> | ||
/// The result of <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>. | ||
/// </summary> | ||
/// <param name="serviceProvider">The <see cref="IServiceProvider"/> to get service arguments from.</param> | ||
/// <param name="arguments">Additional constructor arguments.</param> | ||
/// <returns>The instantiated type.</returns> | ||
#if ActivatorUtilities_In_DependencyInjection | ||
public | ||
#else | ||
internal | ||
#endif | ||
delegate object ObjectFactory(IServiceProvider serviceProvider, object[] arguments); | ||
} |
74 changes: 74 additions & 0 deletions
74
src/libraries/Common/src/Extensions/BenchmarkRunner/AspNetCoreBenchmarkAttribute.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
using BenchmarkDotNet.Configs; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly)] | ||
internal class AspNetCoreBenchmarkAttribute : Attribute, IConfigSource | ||
{ | ||
public AspNetCoreBenchmarkAttribute() | ||
: this(typeof(DefaultCoreConfig)) | ||
{ | ||
} | ||
|
||
public AspNetCoreBenchmarkAttribute(Type configType) | ||
: this(configType, typeof(DefaultCoreValidationConfig)) | ||
{ | ||
} | ||
|
||
public AspNetCoreBenchmarkAttribute(Type configType, Type validationConfigType) | ||
{ | ||
ConfigTypes = new Dictionary<string, Type>() | ||
{ | ||
{ NamedConfiguration.Default, typeof(DefaultCoreConfig) }, | ||
{ NamedConfiguration.Validation, typeof(DefaultCoreValidationConfig) }, | ||
{ NamedConfiguration.Profile, typeof(DefaultCoreProfileConfig) }, | ||
{ NamedConfiguration.Debug, typeof(DefaultCoreDebugConfig) }, | ||
{ NamedConfiguration.PerfLab, typeof(DefaultCorePerfLabConfig) }, | ||
}; | ||
|
||
if (configType != null) | ||
{ | ||
ConfigTypes[NamedConfiguration.Default] = configType; | ||
} | ||
|
||
if (validationConfigType != null) | ||
{ | ||
ConfigTypes[NamedConfiguration.Validation] = validationConfigType; | ||
} | ||
} | ||
|
||
public IConfig Config | ||
{ | ||
get | ||
{ | ||
if (!ConfigTypes.TryGetValue(ConfigName ?? NamedConfiguration.Default, out var configType)) | ||
{ | ||
var message = $"Could not find a configuration matching {ConfigName}. " + | ||
$"Known configurations: {string.Join(", ", ConfigTypes.Keys)}"; | ||
throw new InvalidOperationException(message); | ||
} | ||
|
||
return (IConfig)Activator.CreateInstance(configType, Array.Empty<object>()); | ||
} | ||
} | ||
|
||
public Dictionary<string, Type> ConfigTypes { get; } | ||
|
||
public static string ConfigName { get; set; } = NamedConfiguration.Default; | ||
|
||
public static class NamedConfiguration | ||
{ | ||
public static readonly string Default = "default"; | ||
public static readonly string Validation = "validation"; | ||
public static readonly string Profile = "profile"; | ||
public static readonly string Debug = "debug"; | ||
public static readonly string PerfLab = "perflab"; | ||
} | ||
} | ||
} |
47 changes: 47 additions & 0 deletions
47
src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreConfig.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using BenchmarkDotNet.Columns; | ||
using BenchmarkDotNet.Configs; | ||
using BenchmarkDotNet.Diagnosers; | ||
using BenchmarkDotNet.Engines; | ||
using BenchmarkDotNet.Exporters; | ||
using BenchmarkDotNet.Jobs; | ||
using BenchmarkDotNet.Loggers; | ||
using BenchmarkDotNet.Toolchains.CsProj; | ||
using BenchmarkDotNet.Toolchains.DotNetCli; | ||
using BenchmarkDotNet.Validators; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
internal class DefaultCoreConfig : ManualConfig | ||
{ | ||
public DefaultCoreConfig() | ||
{ | ||
Add(ConsoleLogger.Default); | ||
Add(MarkdownExporter.GitHub); | ||
|
||
Add(MemoryDiagnoser.Default); | ||
Add(StatisticColumn.OperationsPerSecond); | ||
Add(DefaultColumnProviders.Instance); | ||
|
||
Add(JitOptimizationsValidator.FailOnError); | ||
|
||
Add(Job.Core | ||
#if NETCOREAPP2_1 | ||
.With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21)) | ||
#elif NETCOREAPP3_0 | ||
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0"))) | ||
#elif NETCOREAPP3_1 | ||
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1"))) | ||
#elif NETCOREAPP5_0 | ||
.With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp5.0", null, ".NET Core 5.0"))) | ||
#else | ||
#error Target frameworks need to be updated. | ||
#endif | ||
.With(new GcMode { Server = true }) | ||
.With(RunStrategy.Throughput)); | ||
} | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreDebugConfig.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using BenchmarkDotNet.Configs; | ||
using BenchmarkDotNet.Engines; | ||
using BenchmarkDotNet.Jobs; | ||
using BenchmarkDotNet.Loggers; | ||
using BenchmarkDotNet.Validators; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
internal class DefaultCoreDebugConfig : ManualConfig | ||
{ | ||
public DefaultCoreDebugConfig() | ||
{ | ||
Add(ConsoleLogger.Default); | ||
Add(JitOptimizationsValidator.DontFailOnError); | ||
|
||
Add(Job.InProcess | ||
.With(RunStrategy.Throughput)); | ||
} | ||
} | ||
} |
49 changes: 49 additions & 0 deletions
49
src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCorePerfLabConfig.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using BenchmarkDotNet.Columns; | ||
using BenchmarkDotNet.Configs; | ||
using BenchmarkDotNet.Diagnosers; | ||
using BenchmarkDotNet.Engines; | ||
using BenchmarkDotNet.Exporters; | ||
using BenchmarkDotNet.Exporters.Csv; | ||
using BenchmarkDotNet.Jobs; | ||
using BenchmarkDotNet.Loggers; | ||
using BenchmarkDotNet.Validators; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
internal class DefaultCorePerfLabConfig : ManualConfig | ||
{ | ||
public DefaultCorePerfLabConfig() | ||
{ | ||
Add(ConsoleLogger.Default); | ||
|
||
Add(MemoryDiagnoser.Default); | ||
Add(StatisticColumn.OperationsPerSecond); | ||
Add(new ParamsSummaryColumn()); | ||
Add(DefaultColumnProviders.Statistics, DefaultColumnProviders.Diagnosers, DefaultColumnProviders.Target); | ||
|
||
// TODO: When upgrading to BDN 0.11.1, use Add(DefaultColumnProviders.Descriptor); | ||
// DefaultColumnProviders.Target is deprecated | ||
|
||
Add(JitOptimizationsValidator.FailOnError); | ||
|
||
Add(Job.InProcess | ||
.With(RunStrategy.Throughput)); | ||
|
||
Add(MarkdownExporter.GitHub); | ||
|
||
Add(new CsvExporter( | ||
CsvSeparator.Comma, | ||
new Reports.SummaryStyle | ||
{ | ||
PrintUnitsInHeader = true, | ||
PrintUnitsInContent = false, | ||
TimeUnit = Horology.TimeUnit.Microsecond, | ||
SizeUnit = SizeUnit.KB | ||
})); | ||
} | ||
} | ||
} |
33 changes: 33 additions & 0 deletions
33
src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreProfileConfig.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using BenchmarkDotNet.Columns; | ||
using BenchmarkDotNet.Configs; | ||
using BenchmarkDotNet.Diagnosers; | ||
using BenchmarkDotNet.Engines; | ||
using BenchmarkDotNet.Exporters; | ||
using BenchmarkDotNet.Jobs; | ||
using BenchmarkDotNet.Loggers; | ||
using BenchmarkDotNet.Validators; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
internal class DefaultCoreProfileConfig : ManualConfig | ||
{ | ||
public DefaultCoreProfileConfig() | ||
{ | ||
Add(ConsoleLogger.Default); | ||
Add(MarkdownExporter.GitHub); | ||
|
||
Add(MemoryDiagnoser.Default); | ||
Add(StatisticColumn.OperationsPerSecond); | ||
Add(DefaultColumnProviders.Instance); | ||
|
||
Add(JitOptimizationsValidator.FailOnError); | ||
|
||
Add(Job.InProcess | ||
.With(RunStrategy.Throughput)); | ||
} | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreValidationConfig.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using BenchmarkDotNet.Configs; | ||
using BenchmarkDotNet.Jobs; | ||
using BenchmarkDotNet.Loggers; | ||
using BenchmarkDotNet.Toolchains.InProcess; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
internal class DefaultCoreValidationConfig : ManualConfig | ||
{ | ||
public DefaultCoreValidationConfig() | ||
{ | ||
Add(ConsoleLogger.Default); | ||
|
||
Add(Job.Dry.With(InProcessToolchain.Instance)); | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
...Common/src/Extensions/BenchmarkRunner/Microsoft.AspNetCore.BenchmarkRunner.Sources.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<Project> | ||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> | ||
|
||
<Target Name="Compile" /> | ||
<Target Name="CopyFilesToOutputDirectory" /> | ||
</Project> |
16 changes: 16 additions & 0 deletions
16
src/libraries/Common/src/Extensions/BenchmarkRunner/ParameterizedJobConfigAttribute.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using System; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly)] | ||
internal class ParameterizedJobConfigAttribute: AspNetCoreBenchmarkAttribute | ||
{ | ||
public ParameterizedJobConfigAttribute(Type configType) : base(configType) | ||
{ | ||
} | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
src/libraries/Common/src/Extensions/BenchmarkRunner/ParamsDisplayInfoColumn.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
// See the LICENSE file in the project root for more information. | ||
|
||
using BenchmarkDotNet.Columns; | ||
using BenchmarkDotNet.Reports; | ||
using BenchmarkDotNet.Running; | ||
|
||
namespace BenchmarkDotNet.Attributes | ||
{ | ||
public class ParamsSummaryColumn : IColumn | ||
{ | ||
public string Id => nameof(ParamsSummaryColumn); | ||
public string ColumnName { get; } = "Params"; | ||
public bool IsDefault(Summary summary, Benchmark benchmark) => false; | ||
public string GetValue(Summary summary, Benchmark benchmark) => benchmark.Parameters.DisplayInfo; | ||
public bool IsAvailable(Summary summary) => true; | ||
public bool AlwaysShow => true; | ||
public ColumnCategory Category => ColumnCategory.Params; | ||
public int PriorityInCategory => 0; | ||
public override string ToString() => ColumnName; | ||
public bool IsNumeric => false; | ||
public UnitType UnitType => UnitType.Dimensionless; | ||
public string GetValue(Summary summary, Benchmark benchmark, ISummaryStyle style) => GetValue(summary, benchmark); | ||
public string Legend => $"Summary of all parameter values"; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JunTaoLuo here's the workaround we're going to use temporarily to permit package overlap between extensions and runtime.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good