Skip to content

Commit 216f1aa

Browse files
edumserranoedumserrano
authored
Merge branch 'main' into dependabot/github_actions/github-actions-546d33a05d
2 parents c9b0e52 + 3d00fa5 commit 216f1aa

14 files changed

Lines changed: 83 additions & 77 deletions

File tree

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
*.cs text=auto diff=csharp
1414

1515
*.csproj text=auto
16-
*.sln text=auto eol=crlf
16+
*.sln text=auto eol=crlf
17+
*.slnx text=auto eol=crlf

‎.github/markdown-link-check-config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
},
2323
"description": "Avoids 403s from GitHub docs"
2424
}
25-
]
25+
],
26+
"aliveStatusCodes": [429, 200]
2627
}

‎.github/workflows/build-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ${{ matrix.os }}
2828
env:
2929
SLN_DIR: GitHubIssueFormsParser
30-
SLN_FILENAME: GitHubIssueFormsParser.sln
30+
SLN_FILENAME: GitHubIssueFormsParser.slnx
3131
TEST_RESULTS_ARTIFACT_NAME: test-results
3232
CODE_COVERAGE_ARTIFACT_NAME: code-coverage-report
3333
steps:

‎Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://hub.docker.com/_/microsoft-dotnet-runtime/ for list of tags for dotnet runtime
33
# See https://hub.docker.com/_/microsoft-dotnet-sdk for list of tags for dotnet sdk
44

5-
FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine AS base
5+
FROM mcr.microsoft.com/dotnet/runtime:9.0-alpine AS base
66
# install powershell as per https://docs.microsoft.com/en-us/powershell/scripting/install/install-alpine
77
# the official docs install libssl1.1 but that started to fail and I tried ussing libssl3 which seems to work
88
ARG PWSH_VERSION=7.4.1
@@ -28,10 +28,12 @@ RUN chmod +x /opt/microsoft/powershell/7/pwsh
2828
RUN ln -s /opt/microsoft/powershell/7/pwsh /usr/bin/pwsh
2929
# end of install powershell
3030

31-
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
31+
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
3232
WORKDIR /github-issue-forms-parser
3333
COPY ["GitHubIssueFormsParser/NuGet.Config", "GitHubIssueFormsParser/"]
3434
COPY ["GitHubIssueFormsParser/src/GitHubIssuesParserCli/GitHubIssuesParserCli.csproj", "GitHubIssueFormsParser/src/GitHubIssuesParserCli/"]
35+
COPY ["GitHubIssueFormsParser/Directory.Build.props", "GitHubIssueFormsParser/"]
36+
COPY ["GitHubIssueFormsParser/Directory.Packages.props", "GitHubIssueFormsParser/"]
3537
RUN dotnet restore "GitHubIssueFormsParser/src/GitHubIssuesParserCli/GitHubIssuesParserCli.csproj"
3638
COPY . .
3739
WORKDIR "/github-issue-forms-parser/GitHubIssueFormsParser/src/GitHubIssuesParserCli"

‎GitHubIssueFormsParser/.editorconfig‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trim_trailing_whitespace = true
2626
##########################################
2727

2828
# Visual Studio Solution Files
29-
[*.sln]
29+
[*.{sln,slnx}]
3030
indent_style = tab
3131

3232
# Visual Studio XML Project Files
@@ -96,6 +96,7 @@ dotnet_diagnostic.CA1303.severity = none # CA1303: Do not pass literals a
9696
dotnet_diagnostic.CA1308.severity = none # CA1308: Normalize strings to uppercase
9797
# Maintainability rules https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/maintainability-warnings
9898
dotnet_diagnostic.CA1508.severity = none # CA1508: Avoid dead conditional code # This one seems to flag false positives in some cases
99+
dotnet_diagnostic.CA1515.severity = none # CA1515: Consider making public types internal # As of writing this there are several open issues about this rule but this one seems to sum the problem https://github.com/dotnet/roslyn-analyzers/issues/7192. Other issues: https://github.com/dotnet/roslyn-analyzers/issues?q=ca1515
99100
# Naming rules https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/naming-warnings
100101
dotnet_diagnostic.CA1711.severity = none # CA1711: Identifiers should not have incorrect suffix
101102
# Reliability rules https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/reliability-warnings
@@ -399,6 +400,7 @@ dotnet_diagnostic.MA0032.severity = warning # MA0032 Use an overload with a Canc
399400
dotnet_diagnostic.MA0048.severity = none # MA0048 File name must match type name
400401
dotnet_diagnostic.MA0076.severity = none # MA0076 Do not use implicit culture-sensitive ToString in interpolated strings
401402
dotnet_diagnostic.MA0101.severity = none # MA0101 String contains an implicit end of line character
403+
dotnet_diagnostic.MA0165.severity = none # MA0165 Make interpolated string. See https://github.com/meziantou/Meziantou.Analyzer/issues/764
402404

403405
##########################################
404406
# Rules for Microsoft.VisualStudio.Threading.Analyzers

‎GitHubIssueFormsParser/Directory.Build.props‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,43 +41,46 @@
4141
</PropertyGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.172">
44+
<PackageReference Include="Meziantou.Analyzer">
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageReference>
48-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
48+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
4949
<PrivateAssets>all</PrivateAssets>
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5151
</PackageReference>
52-
<PackageReference Include="Roslynator.Analyzers" Version="4.12.8">
52+
<PackageReference Include="Roslynator.Analyzers">
5353
<PrivateAssets>all</PrivateAssets>
5454
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5555
</PackageReference>
56-
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.8">
56+
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers">
5757
<PrivateAssets>all</PrivateAssets>
5858
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5959
</PackageReference>
60-
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.8">
60+
<PackageReference Include="Roslynator.Formatting.Analyzers">
6161
<PrivateAssets>all</PrivateAssets>
6262
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6363
</PackageReference>
64-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
64+
<PackageReference Include="StyleCop.Analyzers.Unstable">
6565
<PrivateAssets>all</PrivateAssets>
6666
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6767
</PackageReference>
6868
</ItemGroup>
6969

7070
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
71-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
71+
<PackageReference Include="coverlet.msbuild">
7272
<PrivateAssets>all</PrivateAssets>
7373
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7474
</PackageReference>
75-
<PackageReference Include="NSubstitute" Version="5.1.0" />
76-
<PackageReference Include="Shouldly" Version="4.2.1" />
77-
<PackageReference Include="xunit.analyzers" Version="1.16.0" />
78-
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
79-
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
80-
<PackageReference Include="LiquidTestReports.Custom" Version="1.0.9" />
75+
<PackageReference Include="NSubstitute" />
76+
<PackageReference Include="Shouldly" />
77+
<PackageReference Update="xunit.analyzers">
78+
<PrivateAssets>all</PrivateAssets>
79+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
80+
</PackageReference>
81+
<PackageReference Include="NSubstitute.Analyzers.CSharp" />
82+
<PackageReference Include="GitHubActionsTestLogger" />
83+
<PackageReference Include="LiquidTestReports.Custom" />
8184
</ItemGroup>
8285

8386
</Project>

‎GitHubIssueFormsParser/Directory.Packages.props‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="CliFx" Version="2.3.6" />
8+
<PackageVersion Include="SlugGenerator" Version="2.0.2" />
9+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
11+
<PackageVersion Include="xunit" Version="2.9.3" />
12+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
13+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
14+
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.201" />
15+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
16+
<PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
17+
<PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.13.1" />
18+
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.1" />
19+
<PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
20+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
21+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
22+
<PackageVersion Include="Shouldly" Version="4.3.0" />
23+
<PackageVersion Include="xunit.analyzers" Version="1.21.0" />
24+
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
25+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
26+
<PackageVersion Include="LiquidTestReports.Custom" Version="1.0.9" />
27+
</ItemGroup>
28+
</Project>

‎GitHubIssueFormsParser/GitHubIssueFormsParser.sln‎

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

‎GitHubIssueFormsParser/GitHubIssueFormsParser.slnx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Solution>
2+
<Folder Name="/src/">
3+
<Project Path="src/GitHubIssuesParserCli/GitHubIssuesParserCli.csproj" />
4+
</Folder>
5+
<Folder Name="/tests/">
6+
<Project Path="tests/GitHubIssuesParserCli.Tests/GitHubIssuesParserCli.Tests.csproj" />
7+
</Folder>
8+
</Solution>

‎GitHubIssueFormsParser/global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "8.0.x",
4-
"rollForward": "disable",
3+
"version": "9.0.300",
4+
"rollForward": "latestMinor",
55
"allowPrerelease": false
66
}
77
}

0 commit comments

Comments
 (0)