Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit f49a356

Browse files
committed
Merge branch 'release/0.2.0'
2 parents 1c4c4fd + a65a121 commit f49a356

File tree

14 files changed

+69
-159
lines changed

14 files changed

+69
-159
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,19 @@ jobs:
4444
uses: actions/checkout@v2
4545
- name: Fetch all tags and branches
4646
run: git fetch --prune --unshallow
47+
- uses: actions/[email protected]
48+
with:
49+
# codecov needs 2.1
50+
dotnet-version: '2.1.818'
51+
- uses: actions/[email protected]
52+
with:
53+
dotnet-version: '3.1.x'
54+
- uses: actions/[email protected]
55+
with:
56+
dotnet-version: '5.0.x'
57+
- uses: actions/[email protected]
58+
with:
59+
dotnet-version: '6.0.x'
4760
- name: Cache Tools
4861
uses: actions/cache@v2
4962
with:

.github/workflows/codeql-analysis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,20 @@ jobs:
3434
with:
3535
fetch-depth: 0
3636

37+
- uses: actions/[email protected]
38+
with:
39+
# codecov needs 2.1
40+
dotnet-version: '2.1.818'
41+
- uses: actions/[email protected]
42+
with:
43+
dotnet-version: '3.1.x'
44+
- uses: actions/[email protected]
45+
with:
46+
dotnet-version: '5.0.x'
47+
- uses: actions/[email protected]
48+
with:
49+
dotnet-version: '6.0.x'
50+
3751
- name: Cache Tools
3852
uses: actions/cache@v2
3953
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ docs/input/tasks/*
5252
# Wyam related
5353
config.wyam.*
5454
/src/packages/
55+
.idea/

global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"allowPrerelease": true,
4+
"version": "6.0.100",
5+
"rollForward": "latestFeature"
6+
}
7+
}

src/.idea/.idea.Spectre.Console.Registrars.SimpleInjector/.idea/.gitignore

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

src/.idea/.idea.Spectre.Console.Registrars.SimpleInjector/.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/.idea/.idea.Spectre.Console.Registrars.SimpleInjector/.idea/encodings.xml

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

src/.idea/.idea.Spectre.Console.Registrars.SimpleInjector/.idea/indexLayout.xml

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

src/.idea/.idea.Spectre.Console.Registrars.SimpleInjector/.idea/vcs.xml

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

src/Spectre.Console.Registrars.SimpleInjector.Tests/RegistrarFixture.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,12 @@ internal class RegistrarFixture
1212
private readonly List<Action<Container>> containerActions = new List<Action<Container>>();
1313
private readonly List<Action<ITypeRegistrar>> registrarActions = new List<Action<ITypeRegistrar>>();
1414
private Lifestyle lifestyle;
15-
private Type[] multiRegistrationTypes;
1615

1716
internal void GivenLifestyle(Lifestyle lifestyle)
1817
{
1918
this.lifestyle = lifestyle;
2019
}
2120

22-
internal void GivenMultiRegistrationTypes(params Type[] multiRegistrationTypes)
23-
{
24-
this.multiRegistrationTypes = multiRegistrationTypes;
25-
}
26-
2721
internal void GivenOnContainer(Action<Container> action)
2822
{
2923
containerActions.Add(action);
@@ -42,7 +36,7 @@ internal ITypeResolver GetResolver()
4236
action(container);
4337
}
4438

45-
var registrar = new SimpleInjectorRegistrar(container, lifestyle, multiRegistrationTypes);
39+
var registrar = new SimpleInjectorRegistrar(container, lifestyle);
4640
foreach (var action in registrarActions)
4741
{
4842
action(registrar);

0 commit comments

Comments
 (0)