Remove old StyleCop and use built-in analyzer.

2026-06-08 15:25:44 +02:00
parent 5b89d794ca
commit 8a80499d73
16 changed files with 6 additions and 37 deletions
@@ -2,7 +2,10 @@
  <PropertyGroup>
    <TargetFramework>net10.0</TargetFramework>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisLevel>10-recommended</AnalysisLevel>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <Version>1.0.4</Version>
  </PropertyGroup>
 </Project>
@@ -28,7 +28,6 @@
    <PackageVersion Include="Npgsql" Version="10.0.3" />
    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
    <PackageVersion Include="OpenSearch.Client" Version="1.8.0" />
-    <PackageVersion Include="Rsdo.StyleCop" Version="1.0.0" />
    <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
    <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
    <PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.0" />
@@ -28,7 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
 		Directory.Packages.props = Directory.Packages.props
-		nuget.config = nuget.config
 		.gitignore = .gitignore
 	EndProjectSection
 EndProject
@@ -10,13 +10,6 @@ RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
        nodejs \
    && rm -rf /var/lib/apt/lists/*

-# COPY LOCAL NUGET PACKAGES
-WORKDIR /nuget
-COPY local-packages/. .
-
-# ADD LOCAL NUGET SOURCE
-RUN dotnet nuget add source /nuget
-
 # RESTORE PACKAGES (with project files only)
 WORKDIR /src/apps
 COPY src/apps/Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj Rsdo.Concordancer.Api/Rsdo.Concordancer.Api.csproj
@@ -57,4 +50,4 @@ RUN dotnet publish "Rsdo.Concordancer.Api.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Rsdo.Concordancer.Api.dll"]
+ENTRYPOINT ["dotnet", "Rsdo.Concordancer.Api.dll"]
@@ -6,7 +6,6 @@
        <PackageReference Include="Hangfire" />
        <PackageReference Include="Hangfire.PostgreSql" />
        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
-        <PackageReference Include="Rsdo.StyleCop" />
        <PackageReference Include="Serilog.AspNetCore" />
        <PackageReference Include="Serilog.Expressions" />
        <PackageReference Include="Serilog.Settings.Configuration" />
@@ -3,13 +3,6 @@ WORKDIR /app

 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build

-# COPY LOCAL NUGET PACKAGES
-WORKDIR /nuget
-COPY local-packages/. .
-
-# ADD LOCAL NUGET SOURCE
-RUN dotnet nuget add source /nuget
-
 # RESTORE PACKAGES (with project files only)
 WORKDIR /src/apps
 COPY src/apps/Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj Rsdo.Concordancer.SystemManager/Rsdo.Concordancer.SystemManager.csproj 
@@ -44,4 +37,4 @@ RUN dotnet publish "Rsdo.Concordancer.SystemManager.csproj" -c Release -o /app/p
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-CMD tail -f /dev/null
+CMD tail -f /dev/null
@@ -7,7 +7,6 @@
    <ItemGroup>
      <PackageReference Include="Autofac" />
      <PackageReference Include="CommandLineParser" />
-      <PackageReference Include="Rsdo.StyleCop" />
    </ItemGroup>

    <ItemGroup>
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <ItemGroup>
-      <PackageReference Include="Rsdo.StyleCop" />
-    </ItemGroup>
-
    <ItemGroup>
      <ProjectReference Include="..\Rsdo.Concordancer.ServiceModel\Rsdo.Concordancer.ServiceModel.csproj" />
    </ItemGroup>
@@ -6,7 +6,6 @@
      <PackageReference Include="FluentMigrator.Runner" />
      <PackageReference Include="FluentMigrator.Runner.Postgres" />
      <PackageReference Include="Npgsql" />
-      <PackageReference Include="Rsdo.StyleCop" />
    </ItemGroup>

    <ItemGroup>
@@ -5,7 +5,6 @@
      <PackageReference Include="Microsoft.Extensions.Configuration" />
      <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
      <PackageReference Include="OpenSearch.Client" />
-      <PackageReference Include="Rsdo.StyleCop" />
    </ItemGroup>

    <ItemGroup>
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <ItemGroup>
-      <PackageReference Include="Rsdo.StyleCop" />
      <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
    </ItemGroup>

@@ -12,7 +12,6 @@
      <PackageReference Include="Newtonsoft.Json" />
      <PackageReference Include="Npgsql" />
      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
-      <PackageReference Include="Rsdo.StyleCop" />
    </ItemGroup>

    <ItemGroup>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="local-packages" value="./../local-packages" />
-  </packageSources>
-</configuration>
@@ -6,7 +6,6 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="Rsdo.StyleCop" />
        <PackageReference Include="xunit" />
        <PackageReference Include="xunit.runner.visualstudio">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -6,7 +6,6 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="Rsdo.StyleCop" />
        <PackageReference Include="xunit" />
        <PackageReference Include="xunit.runner.visualstudio">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>