Skip to content

Commit 4a5dc80

Browse files
BenjaminMichaelisBenjaminMichaelis
authored
Merge branch 'main' into BMichaelis/Deps
2 parents fab53e5 + 6363156 commit 4a5dc80

32 files changed

Lines changed: 345 additions & 451 deletions

‎.github/workflows/ConvertGuidelinesXmlToMarkdown.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
XmlFileName: "Guidelines(8th Edition).xml"
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
with:
2020
ref: ${{ github.ref }}
2121
token: ${{ secrets.CI_PAT }}
@@ -35,7 +35,7 @@ jobs:
3535
echo "${{ steps.diff.outputs.name }}"
3636
3737
- name: Setup .NET Core
38-
uses: actions/setup-dotnet@v4
38+
uses: actions/setup-dotnet@v5
3939
with:
4040
dotnet-version: |
4141
5.0.x

‎.github/workflows/Deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
build-and-test:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717

1818
- name: Setup .NET
19-
uses: actions/setup-dotnet@v4
19+
uses: actions/setup-dotnet@v5
2020
with:
2121
global-json-file: "./global.json"
2222

@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Upload Artifacts
3939
if: startsWith(github.ref, 'refs/tags/v')
40-
uses: actions/upload-artifact@v4
40+
uses: actions/upload-artifact@v6
4141
with:
4242
name: NuGet
4343
path: ${{ github.workspace }}/PackedNuget
@@ -53,7 +53,7 @@ jobs:
5353

5454
steps:
5555
- name: Download artifact from build job
56-
uses: actions/download-artifact@v4
56+
uses: actions/download-artifact@v7
5757
with:
5858
name: NuGet
5959

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: "Copilot Setup Steps"
2+
3+
# Automatically run the setup steps when they are changed to allow for easy validation, and
4+
# allow manual testing through the repository's "Actions" tab
5+
on:
6+
workflow_dispatch:
7+
push:
8+
paths:
9+
- .github/workflows/copilot-setup-steps.yml
10+
pull_request:
11+
paths:
12+
- .github/workflows/copilot-setup-steps.yml
13+
14+
jobs:
15+
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
16+
copilot-setup-steps:
17+
runs-on: ubuntu-latest
18+
19+
# Set the permissions to the lowest permissions possible needed for your steps.
20+
# Copilot will be given its own token for its operations.
21+
permissions:
22+
# If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
23+
contents: read
24+
25+
# You can define any steps you want, and they will run before the agent starts.
26+
# If you do not check out your code, Copilot will do this for you.
27+
steps:
28+
- name: Checkout code
29+
uses: actions/checkout@v6
30+
31+
- name: Setup .NET
32+
uses: actions/setup-dotnet@v5
33+
with:
34+
global-json-file: "./global.json"
35+
36+
- name: Restore dependencies
37+
run: dotnet restore

‎.github/workflows/dotnetBuild.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
contents: write
2121

2222
steps:
23-
- uses: fastify/github-action-merge-dependabot@v3.10.1
23+
- uses: fastify/github-action-merge-dependabot@v3.11.2
2424
with:
2525
use-github-auto-merge: true
2626

@@ -29,10 +29,10 @@ jobs:
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333

3434
- name: Setup .NET
35-
uses: actions/setup-dotnet@v4
35+
uses: actions/setup-dotnet@v5
3636
with:
3737
global-json-file: "./global.json"
3838

@@ -43,4 +43,12 @@ jobs:
4343
run: dotnet build -p:ContinuousIntegrationBuild=True --no-restore --configuration Release
4444

4545
- name: Test
46-
run: dotnet test --no-build --configuration Release --verbosity normal
46+
run: dotnet test --no-build --configuration Release --verbosity normal --logger trx --results-directory ./TestResults
47+
48+
- name: Create Failed Tests Playlist
49+
if: always()
50+
uses: BenjaminMichaelis/trx-to-vsplaylist@v3
51+
with:
52+
trx-file-path: './TestResults/*.trx'
53+
test-outcomes: 'Failed'
54+
artifact-name: 'failed-tests-playlist'

‎.github/workflows/manuallyRunXmlToMD.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
XmlFileName: "Guidelines(8th Edition).xml"
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
with:
2424
ref: ${{ github.ref }}
2525
token: ${{ secrets.CI_PAT }}
2626

2727
- name: Setup .NET Core
28-
uses: actions/setup-dotnet@v4
28+
uses: actions/setup-dotnet@v5
2929
with:
3030
dotnet-version: 5.0.201
3131

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4-
<LangVersion>12.0</LangVersion>
4+
<LangVersion>14.0</LangVersion>
55
</PropertyGroup>
66
</Project>

‎Directory.Packages.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
7+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
88
<PackageVersion Include="IntelliTect.Analyzers" Version="0.1.8" />
99
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
10-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
11-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
12-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
13-
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.9.2" />
15-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
16-
<PackageVersion Include="MSTest.TestAdapter" Version="3.2.2" />
17-
<PackageVersion Include="MSTest.TestFramework" Version="3.2.2" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
12+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.103" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
16+
<PackageVersion Include="MSTest.TestAdapter" Version="4.1.0" />
17+
<PackageVersion Include="MSTest.TestFramework" Version="4.1.4" />
1818
<PackageVersion Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.23407.1" />
1919
</ItemGroup>
20-
</Project>
20+
</Project>

‎IntelliTect.Analyzer.sln‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,66 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelliTect.Analyzer.Integration.Tests", "IntelliTect.Analyzer\IntelliTect.Analyzer.Integration.Tests\IntelliTect.Analyzer.Integration.Tests.csproj", "{25B557AC-D6C9-4719-A977-3DC1666C5347}"
2121
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntelliTect.Analyzer.CodeFixes", "IntelliTect.Analyzer\IntelliTect.Analyzer.CodeFixes\IntelliTect.Analyzer.CodeFixes.csproj", "{4B831B22-D64D-4BE0-8BDC-E69F728187BB}"
23+
EndProject
2224
Global
2325
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2426
Debug|Any CPU = Debug|Any CPU
27+
Debug|x64 = Debug|x64
28+
Debug|x86 = Debug|x86
2529
Release|Any CPU = Release|Any CPU
30+
Release|x64 = Release|x64
31+
Release|x86 = Release|x86
2632
EndGlobalSection
2733
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2834
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2935
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Debug|x64.ActiveCfg = Debug|Any CPU
37+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Debug|x64.Build.0 = Debug|Any CPU
38+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Debug|x86.ActiveCfg = Debug|Any CPU
39+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Debug|x86.Build.0 = Debug|Any CPU
3040
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Release|Any CPU.ActiveCfg = Release|Any CPU
3141
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Release|x64.ActiveCfg = Release|Any CPU
43+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Release|x64.Build.0 = Release|Any CPU
44+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Release|x86.ActiveCfg = Release|Any CPU
45+
{B21556AE-ABCF-41F9-8585-3C32DE919638}.Release|x86.Build.0 = Release|Any CPU
3246
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3347
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Debug|x64.ActiveCfg = Debug|Any CPU
49+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Debug|x64.Build.0 = Debug|Any CPU
50+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Debug|x86.ActiveCfg = Debug|Any CPU
51+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Debug|x86.Build.0 = Debug|Any CPU
3452
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
3553
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Release|x64.ActiveCfg = Release|Any CPU
55+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Release|x64.Build.0 = Release|Any CPU
56+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Release|x86.ActiveCfg = Release|Any CPU
57+
{2B4BFC2E-4BD4-4651-A0F4-E926EF246ADE}.Release|x86.Build.0 = Release|Any CPU
3658
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3759
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Debug|x64.ActiveCfg = Debug|Any CPU
61+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Debug|x64.Build.0 = Debug|Any CPU
62+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Debug|x86.ActiveCfg = Debug|Any CPU
63+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Debug|x86.Build.0 = Debug|Any CPU
3864
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Release|Any CPU.ActiveCfg = Release|Any CPU
3965
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Release|x64.ActiveCfg = Release|Any CPU
67+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Release|x64.Build.0 = Release|Any CPU
68+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Release|x86.ActiveCfg = Release|Any CPU
69+
{25B557AC-D6C9-4719-A977-3DC1666C5347}.Release|x86.Build.0 = Release|Any CPU
70+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Debug|x64.ActiveCfg = Debug|Any CPU
73+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Debug|x64.Build.0 = Debug|Any CPU
74+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Debug|x86.ActiveCfg = Debug|Any CPU
75+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Debug|x86.Build.0 = Debug|Any CPU
76+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Release|x64.ActiveCfg = Release|Any CPU
79+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Release|x64.Build.0 = Release|Any CPU
80+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Release|x86.ActiveCfg = Release|Any CPU
81+
{4B831B22-D64D-4BE0-8BDC-E69F728187BB}.Release|x86.Build.0 = Release|Any CPU
4082
EndGlobalSection
4183
GlobalSection(SolutionProperties) = preSolution
4284
HideSolutionNode = FALSE

IntelliTect.Analyzer/IntelliTect.Analyzer/CodeFixes/AsyncVoid.cs renamed to IntelliTect.Analyzer/IntelliTect.Analyzer.CodeFixes/AsyncVoid.cs

File renamed without changes.

IntelliTect.Analyzer/IntelliTect.Analyzer/CodeFixes/AttributesOnSeparateLines.cs renamed to IntelliTect.Analyzer/IntelliTect.Analyzer.CodeFixes/AttributesOnSeparateLines.cs

File renamed without changes.

0 commit comments

Comments
 (0)