Skip to content

Commit 6e40710

Browse files
committed
Updated dependencies, changed workflow
1 parent fc20d7e commit 6e40710

File tree

6 files changed

+31
-19
lines changed

6 files changed

+31
-19
lines changed

.github/workflows/main.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,28 @@ jobs:
126126
with:
127127
fetch-depth: 0
128128

129-
- name: Create sonar-project.properties
130-
run: echo -n -e "sonar.organization=egil\nsonar.projectKey=egil_bUnit\nsonar.sources=./src\nsonar.tests=./tests\n" > sonar-project.properties
129+
- uses: dotnet/nbgv@master
130+
with:
131+
setAllVars: true
132+
133+
- uses: actions/setup-dotnet@v1
134+
with:
135+
dotnet-version: '3.1.x'
136+
- uses: actions/setup-dotnet@v1
137+
with:
138+
dotnet-version: '5.0.100-rc.1.20452.10'
139+
140+
- name: Install dotnet-sonarscanner
141+
run: dotnet tool install --global dotnet-sonarscanner
131142

132-
- name: SonarCloud Scan
133-
uses: sonarsource/sonarcloud-github-action@master
143+
- name: Running dotnet-sonarscanner
144+
shell: bash
134145
env:
135-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136146
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
147+
run: |
148+
dotnet sonarscanner begin /k:"egil_bUnit" /o:"egil" /n:"bUnit" /v:"$NBGV_NuGetPackageVersion" /d:sonar.login="$SONAR_TOKEN" /d:sonar.host.url=https://sonarcloud.io
149+
dotnet build bunit.sln
150+
dotnet sonarscanner end /d:sonar.login="$SONAR_TOKEN"
137151
138152
code-ql:
139153
if: github.event_name != 'pull_request'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,4 @@ bunit.docs/log.txt
334334

335335
.store
336336
*coverage*.info
337+
.sonarqube

src/Directory.Build.props

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
2424
<Deterministic>true</Deterministic>
2525
<EnableNETAnalyzers>true</EnableNETAnalyzers>
26+
<AnalysisLevel>latest</AnalysisLevel>
2627
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
2728
</PropertyGroup>
2829

@@ -45,13 +46,9 @@
4546
<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-rc.1.*" />
4647
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0-rc.1.*" />
4748
</ItemGroup>
48-
49-
<ItemGroup Condition="$(MSBuildProjectName) != 'bunit.template' AND $(MSBuildProjectName) != 'bunit'">
50-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="All" />
51-
</ItemGroup>
5249

5350
<ItemGroup>
5451
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
55-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
52+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
5653
</ItemGroup>
5754
</Project>

src/bunit.web/bunit.web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="AngleSharp" Version="0.14.0" />
28-
<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
28+
<PackageReference Include="AngleSharp.Css" Version="0.14.2" />
2929
<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
3030
<PackageReference Include="AngleSharp.Wrappers" Version="1.2.0" />
3131
</ItemGroup>

src/bunit.xunit/bunit.xunit.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<ItemGroup>
1818
<PackageReference Include="SourceFileFinder" Version="1.0.0" />
1919
<PackageReference Include="System.Reflection.Metadata" Version="1.8.1" />
20-
<PackageReference Include="xunit.assert" Version="2.4.0" />
21-
<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
22-
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
20+
<PackageReference Include="xunit.assert" Version="2.4.1" />
21+
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
22+
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

tests/Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<Nullable>enable</Nullable>
77
<WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
88
<EnableNETAnalyzers>true</EnableNETAnalyzers>
9+
<AnalysisLevel>latest</AnalysisLevel>
910
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11+
<SonarQubeTestProject>true</SonarQubeTestProject>
1012
</PropertyGroup>
1113

1214
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' AND $(MSBuildProjectName) != 'bunit.testassets'">
@@ -25,15 +27,13 @@
2527

2628
<ItemGroup Condition="$(MSBuildProjectName) != 'bunit.testassets'">
2729
<PackageReference Include="AngleSharp" Version="0.14.0" />
28-
<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
30+
<PackageReference Include="AngleSharp.Css" Version="0.14.2" />
2931
<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
30-
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
32-
<PackageReference Include="Moq" Version="4.14.5" />
32+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
33+
<PackageReference Include="Moq" Version="4.14.6" />
3334
<PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
3435
<PackageReference Include="xunit" Version="2.4.1" />
3536
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
3637
<PackageReference Include="coverlet.msbuild" Version="2.9.0" PrivateAssets="All" />
37-
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0" PrivateAssets="All" />
3838
</ItemGroup>
3939
</Project>

0 commit comments

Comments
 (0)