Skip to content

Commit be7fab1

Browse files
authored
Merge pull request #41 from bdach/tooling-updates
Tooling updates
2 parents 962e670 + 6b74d48 commit be7fab1

4 files changed

Lines changed: 19 additions & 20 deletions

File tree

.config/dotnet-tools.json

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2023.3.3",
6+
"version": "2025.2.3",
77
"commands": [
88
"jb"
9-
]
10-
},
11-
"nvika": {
12-
"version": "4.0.0",
13-
"commands": [
14-
"nvika"
15-
]
9+
],
10+
"rollForward": false
1611
},
1712
"codefilesanity": {
1813
"version": "0.0.36",
1914
"commands": [
2015
"CodeFileSanity"
21-
]
16+
],
17+
"rollForward": false
2218
}
2319
}
24-
}
20+
}

.github/workflows/ci.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414

1515
- name: Install .NET 8.0.x
16-
uses: actions/setup-dotnet@v4
16+
uses: actions/setup-dotnet@v5
1717
with:
1818
dotnet-version: "8.0.x"
1919

@@ -37,20 +37,21 @@ jobs:
3737
exit $exit_code
3838
3939
- name: InspectCode
40-
run: dotnet jb inspectcode $(pwd)/osu.Server.QueueProcessor.sln --build --output="inspectcodereport.xml" --caches-home="inspectcode" --verbosity=WARN
41-
42-
- name: NVika
43-
run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors
40+
uses: JetBrains/ReSharper-InspectCode@v0.11
41+
with:
42+
solution: ./osu.Server.QueueProcessor.sln
43+
caches-home: inspectcode
44+
verbosity: WARN
4445

4546
test:
4647
name: Test
4748
runs-on: ubuntu-latest
4849
steps:
4950
- name: Checkout
50-
uses: actions/checkout@v4
51+
uses: actions/checkout@v6
5152

5253
- name: Install .NET 8.0.x
53-
uses: actions/setup-dotnet@v4
54+
uses: actions/setup-dotnet@v5
5455
with:
5556
dotnet-version: "8.0.x"
5657

.github/workflows/pack.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010

1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
- name: Install .NET 8.0.x
15-
uses: actions/setup-dotnet@v4
15+
uses: actions/setup-dotnet@v5
1616
with:
1717
dotnet-version: "8.0.x"
1818
env:

osu.Server.QueueProcessor.sln.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToConstant_002ELocal/@EntryIndexedValue">WARNING</s:String>
8282
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLambdaExpression/@EntryIndexedValue">WARNING</s:String>
8383
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToLocalFunction/@EntryIndexedValue">HINT</s:String>
84+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToPrimaryConstructor/@EntryIndexedValue">DO_NOT_SHOW</s:String>
8485
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToStaticClass/@EntryIndexedValue">WARNING</s:String>
8586
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertToUsingDeclaration/@EntryIndexedValue">HINT</s:String>
8687
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ConvertTypeCheckPatternToNullCheck/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -251,6 +252,7 @@
251252
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnusedType_002EGlobal/@EntryIndexedValue">HINT</s:String>
252253
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseAwaitUsing/@EntryIndexedValue">DO_NOT_SHOW</s:String>
253254
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionCountProperty/@EntryIndexedValue">WARNING</s:String>
255+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseCollectionExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
254256
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseConfigureAwaitFalseForAsyncDisposable/@EntryIndexedValue">WARNING</s:String>
255257
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInFormatString/@EntryIndexedValue">WARNING</s:String>
256258
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseFormatSpecifierInInterpolation/@EntryIndexedValue">WARNING</s:String>

0 commit comments

Comments
 (0)