Skip to content
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.

Sign up for GitHub

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

Using MS.Extensions.DI directly, removing all unneeded code, pulling in the MediatR package directly #802

Merged
merged 3 commits into from
Nov 20, 2022
Merged

Using MS.Extensions.DI directly, removing all unneeded code, pulling in the MediatR package directly #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e22f2f6
Adding all of the MS.Ext.DI extensions to the library
jbogard Nov 19, 2022
c583e1e
Pulling in MS.Extensions.DI and using it directly
jbogard Nov 20, 2022
26cb2c6
Merge branch 'master' into ms-ext-di
jbogard Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,7 @@ exec { & dotnet clean -c Release }

exec { & dotnet build -c Release }

exec { & dotnet test -c Release -r $artifacts --no-build -l trx --verbosity=normal }

$samples = Get-ChildItem .\samples\MediatR.Examples.*

foreach ($sample in $samples) {
Push-Location -Path $sample

try {
exec { & dotnet run -c Release --no-build --no-restore }
} catch {
} finally {
Pop-Location
}
}
exec { & dotnet test -c Release --no-build -l trx --verbosity=normal }

exec { & dotnet pack .\src\MediatR\MediatR.csproj -c Release -o $artifacts --no-build }

86 changes: 0 additions & 86 deletions MediatR.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6267E2ED-942
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR", "src\MediatR\MediatR.csproj", "{12DA3F16-060B-467A-993F-2DF25EE6E6A8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Tests", "test\MediatR.Tests\MediatR.Tests.csproj", "{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples", "samples\MediatR.Examples\MediatR.Examples.csproj", "{18AB74EF-6E32-42C5-B6C4-159624CEDC5D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Autofac", "samples\MediatR.Examples.Autofac\MediatR.Examples.Autofac.csproj", "{DD286AB8-BA96-4476-82DF-371275EA8C10}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.LightInject", "samples\MediatR.Examples.LightInject\MediatR.Examples.LightInject.csproj", "{0A0796F1-A0BE-4D15-A8F3-B6EFA41CAF0B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.SimpleInjector", "samples\MediatR.Examples.SimpleInjector\MediatR.Examples.SimpleInjector.csproj", "{A7FB2047-A4A0-4630-8C4C-31E7FA6ED902}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.StructureMap", "samples\MediatR.Examples.StructureMap\MediatR.Examples.StructureMap.csproj", "{7487E97A-CDA0-454D-8F62-CEE376DD3C3E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Windsor", "samples\MediatR.Examples.Windsor\MediatR.Examples.Windsor.csproj", "{BFF350A1-4FB1-4355-8437-675605BF8C52}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.DryIoc", "samples\MediatR.Examples.DryIoc\MediatR.Examples.DryIoc.csproj", "{24A1217D-8438-45DA-A802-0A3A7A3DDFD1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.AspNetCore", "samples\MediatR.Examples.AspNetCore\MediatR.Examples.AspNetCore.csproj", "{4A255E84-AAC5-4ED9-ABAC-822804DBA4F1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E133765-6B4E-46C2-8C6C-7238E8EABA79}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Expand All @@ -41,16 +23,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\release.yml = .github\workflows\release.yml
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Unity", "samples\MediatR.Examples.Unity\MediatR.Examples.Unity.csproj", "{E6C51E44-59B4-4F4F-AFB3-4032CDDEF07A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Lamar", "samples\MediatR.Examples.Lamar\MediatR.Examples.Lamar.csproj", "{F014598D-8B85-4D7E-942A-3493107ABE43}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.PublishStrategies", "samples\MediatR.Examples.PublishStrategies\MediatR.Examples.PublishStrategies.csproj", "{867EBA13-62F4-4525-8F92-B0AD828EE6D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Benchmarks", "test\MediatR.Benchmarks\MediatR.Benchmarks.csproj", "{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Examples.Stashbox", "samples\MediatR.Examples.Stashbox\MediatR.Examples.Stashbox.csproj", "{575EC49E-BEC8-4DFF-BD22-8464844093FE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediatR.Contracts", "src\MediatR.Contracts\MediatR.Contracts.csproj", "{87F5A238-44B5-4769-82E5-E68B712D6E6D}"
EndProject
Global
Expand All @@ -67,58 +41,10 @@ Global
{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B}.Release|Any CPU.Build.0 = Release|Any CPU
{18AB74EF-6E32-42C5-B6C4-159624CEDC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18AB74EF-6E32-42C5-B6C4-159624CEDC5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18AB74EF-6E32-42C5-B6C4-159624CEDC5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18AB74EF-6E32-42C5-B6C4-159624CEDC5D}.Release|Any CPU.Build.0 = Release|Any CPU
{DD286AB8-BA96-4476-82DF-371275EA8C10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD286AB8-BA96-4476-82DF-371275EA8C10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD286AB8-BA96-4476-82DF-371275EA8C10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD286AB8-BA96-4476-82DF-371275EA8C10}.Release|Any CPU.Build.0 = Release|Any CPU
{0A0796F1-A0BE-4D15-A8F3-B6EFA41CAF0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A0796F1-A0BE-4D15-A8F3-B6EFA41CAF0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A0796F1-A0BE-4D15-A8F3-B6EFA41CAF0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A0796F1-A0BE-4D15-A8F3-B6EFA41CAF0B}.Release|Any CPU.Build.0 = Release|Any CPU
{A7FB2047-A4A0-4630-8C4C-31E7FA6ED902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7FB2047-A4A0-4630-8C4C-31E7FA6ED902}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7FB2047-A4A0-4630-8C4C-31E7FA6ED902}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7FB2047-A4A0-4630-8C4C-31E7FA6ED902}.Release|Any CPU.Build.0 = Release|Any CPU
{7487E97A-CDA0-454D-8F62-CEE376DD3C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7487E97A-CDA0-454D-8F62-CEE376DD3C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7487E97A-CDA0-454D-8F62-CEE376DD3C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7487E97A-CDA0-454D-8F62-CEE376DD3C3E}.Release|Any CPU.Build.0 = Release|Any CPU
{BFF350A1-4FB1-4355-8437-675605BF8C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFF350A1-4FB1-4355-8437-675605BF8C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFF350A1-4FB1-4355-8437-675605BF8C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFF350A1-4FB1-4355-8437-675605BF8C52}.Release|Any CPU.Build.0 = Release|Any CPU
{24A1217D-8438-45DA-A802-0A3A7A3DDFD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24A1217D-8438-45DA-A802-0A3A7A3DDFD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24A1217D-8438-45DA-A802-0A3A7A3DDFD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24A1217D-8438-45DA-A802-0A3A7A3DDFD1}.Release|Any CPU.Build.0 = Release|Any CPU
{4A255E84-AAC5-4ED9-ABAC-822804DBA4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A255E84-AAC5-4ED9-ABAC-822804DBA4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A255E84-AAC5-4ED9-ABAC-822804DBA4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A255E84-AAC5-4ED9-ABAC-822804DBA4F1}.Release|Any CPU.Build.0 = Release|Any CPU
{E6C51E44-59B4-4F4F-AFB3-4032CDDEF07A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6C51E44-59B4-4F4F-AFB3-4032CDDEF07A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6C51E44-59B4-4F4F-AFB3-4032CDDEF07A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6C51E44-59B4-4F4F-AFB3-4032CDDEF07A}.Release|Any CPU.Build.0 = Release|Any CPU
{F014598D-8B85-4D7E-942A-3493107ABE43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F014598D-8B85-4D7E-942A-3493107ABE43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F014598D-8B85-4D7E-942A-3493107ABE43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F014598D-8B85-4D7E-942A-3493107ABE43}.Release|Any CPU.Build.0 = Release|Any CPU
{867EBA13-62F4-4525-8F92-B0AD828EE6D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{867EBA13-62F4-4525-8F92-B0AD828EE6D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{867EBA13-62F4-4525-8F92-B0AD828EE6D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{867EBA13-62F4-4525-8F92-B0AD828EE6D4}.Release|Any CPU.Build.0 = Release|Any CPU
{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1FA62162-F8F1-4CAD-B08E-8DCA603395AD}.Release|Any CPU.Build.0 = Release|Any CPU
{575EC49E-BEC8-4DFF-BD22-8464844093FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{575EC49E-BEC8-4DFF-BD22-8464844093FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{575EC49E-BEC8-4DFF-BD22-8464844093FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{575EC49E-BEC8-4DFF-BD22-8464844093FE}.Release|Any CPU.Build.0 = Release|Any CPU
{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87F5A238-44B5-4769-82E5-E68B712D6E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -130,19 +56,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{12DA3F16-060B-467A-993F-2DF25EE6E6A8} = {6267E2ED-942C-497D-BFC9-B3CE0AFC276F}
{4FB0CFC4-90E3-467F-9704-6FBF637F9B4B} = {962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}
{18AB74EF-6E32-42C5-B6C4-159624CEDC5D} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{DD286AB8-BA96-4476-82DF-371275EA8C10} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{0A0796F1-A0BE-4D15-A8F3-B6EFA41CAF0B} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{A7FB2047-A4A0-4630-8C4C-31E7FA6ED902} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{7487E97A-CDA0-454D-8F62-CEE376DD3C3E} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{BFF350A1-4FB1-4355-8437-675605BF8C52} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{24A1217D-8438-45DA-A802-0A3A7A3DDFD1} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{4A255E84-AAC5-4ED9-ABAC-822804DBA4F1} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{E6C51E44-59B4-4F4F-AFB3-4032CDDEF07A} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{F014598D-8B85-4D7E-942A-3493107ABE43} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{867EBA13-62F4-4525-8F92-B0AD828EE6D4} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{1FA62162-F8F1-4CAD-B08E-8DCA603395AD} = {962C5ACA-AB2B-4E9B-9EBB-7E7EE28CDBB1}
{575EC49E-BEC8-4DFF-BD22-8464844093FE} = {95CFF0CD-87A6-4CB6-A99F-42EAD0829E37}
{87F5A238-44B5-4769-82E5-E68B712D6E6D} = {6267E2ED-942C-497D-BFC9-B3CE0AFC276F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
17 changes: 0 additions & 17 deletions samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions samples/MediatR.Examples.AspNetCore/Program.cs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
View file
Open in desktop

This file was deleted.

86 changes: 0 additions & 86 deletions samples/MediatR.Examples.Autofac/Program.cs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions samples/MediatR.Examples.DryIoc/Program.cs
View file
Open in desktop

This file was deleted.

Loading