Skip to content

Commit 2e80a28

Browse files
committed
code style and update to global.json to only go to latest patch version
1 parent c506d9c commit 2e80a28

4 files changed

Lines changed: 26 additions & 8 deletions

File tree

.github/workflows/CI.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,19 @@ jobs:
2424
- uses: actions/setup-dotnet@v1
2525
with:
2626
dotnet-version: '3.1.202'
27-
- name: Building and verifying library
27+
- name: Building library
2828
run: |
2929
dotnet restore src
3030
dotnet build src/bunit.core/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3131
dotnet build src/bunit.web/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3232
dotnet build src/bunit.xunit/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
33+
dotnet build src/bunit/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3334
dotnet build src/bunit.testassets/ -c Release --no-restore
34-
dotnet test src -c Release --no-restore --verbosity normal /nowarn:CS1591
35+
- name: Running unit tests
36+
run: |
37+
dotnet test src/bunit.core.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
38+
dotnet test src/bunit.web.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
39+
dotnet test src/bunit.xunit.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
3540
- name: Creating library package
3641
run: |
3742
dotnet pack src/bunit.core/ -c Release -o ${GITHUB_WORKSPACE}/lib -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true

.github/workflows/nuget-pack-push.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,19 @@ jobs:
2828
- uses: actions/setup-dotnet@v1
2929
with:
3030
dotnet-version: '3.1.202'
31-
- name: Building and verifying library
31+
- name: Building library
3232
run: |
3333
dotnet restore src
3434
dotnet build src/bunit.core/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3535
dotnet build src/bunit.web/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3636
dotnet build src/bunit.xunit/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3737
dotnet build src/bunit/ -c Release --no-restore -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true
3838
dotnet build src/bunit.testassets/ -c Release --no-restore
39-
dotnet test src -c Release --no-restore --verbosity normal /nowarn:CS1591
39+
- name: Running unit tests
40+
run: |
41+
dotnet test src/bunit.core.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
42+
dotnet test src/bunit.web.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
43+
dotnet test src/bunit.xunit.tests/ -c Release --no-restore --verbosity normal /nowarn:CS1591
4044
- name: Creating library package
4145
run: |
4246
dotnet pack src/bunit.core/ -c Release -o ${GITHUB_WORKSPACE}/lib -p:version=$VERSION -p:RepositoryBranch=$BRANCH -p:ContinuousIntegrationBuild=true -p:DeterministicSourcePaths=true

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"version": "3.1.202",
4-
"rollForward": "latestMinor"
4+
"rollForward": "latestPatch"
55
}
66
}

src/bunit.core.tests/RazorTesting/FixtureBaseTest.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ public async Task Test001()
3434

3535
void Setup(FixtureComponent fixture) => callLog.Add(nameof(Setup));
3636
Task SetupAsync(FixtureComponent fixture)
37-
{ callLog.Add(nameof(SetupAsync)); return Task.CompletedTask; }
37+
{
38+
callLog.Add(nameof(SetupAsync));
39+
return Task.CompletedTask;
40+
}
3841
void Test(FixtureComponent fixture) => callLog.Add(nameof(Test));
3942
}
4043

@@ -57,9 +60,15 @@ public async Task Test002()
5760

5861
void Setup(FixtureComponent fixture) => callLog.Add(nameof(Setup));
5962
Task SetupAsync(FixtureComponent fixture)
60-
{ callLog.Add(nameof(SetupAsync)); return Task.CompletedTask; }
63+
{
64+
callLog.Add(nameof(SetupAsync));
65+
return Task.CompletedTask;
66+
}
6167
Task TestAsync(FixtureComponent fixture)
62-
{ callLog.Add(nameof(TestAsync)); return Task.CompletedTask; }
68+
{
69+
callLog.Add(nameof(TestAsync));
70+
return Task.CompletedTask;
71+
}
6372
}
6473

6574
[Fact(DisplayName = "Run fails when no ChildContent is provided")]

0 commit comments

Comments
 (0)