kysect · FrediKats · Mar 2, 2024 · Dec 23, 2023 · Dec 23, 2023 · Dec 23, 2023
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -0,0 +1,46 @@
+name: Build and test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ '*' ]
+
+
+env:
+  working-directory: Sources
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+  DOTNET_NOLOGO: true
+  dotnet-version: 8.0.x
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - run: git config --global core.autocrlf input
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: ${{ env.dotnet-version }}
+
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: ${{ env.working-directory }}
+
+    - name: Build
+      run: dotnet build -c Release --no-restore --verbosity normal
+      working-directory: ${{ env.working-directory }}
+
+    - name: Test
+      run: dotnet test -c Release --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+      working-directory: ${{ env.working-directory }}
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
diff --git a/Sources/.editorconfig b/Sources/.editorconfig
diff --git a/Sources/Directory.Build.props b/Sources/Directory.Build.props
@@ -1,10 +1,10 @@
 <Project>
-    <PropertyGroup>
-        <LangVersion>latest</LangVersion>
-        <NoWarn>$(NoWarn);CS1591;IDE0055</NoWarn>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    </PropertyGroup>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+  </PropertyGroup>
 </Project>
diff --git a/Sources/Directory.Packages.props b/Sources/Directory.Packages.props
@@ -4,30 +4,31 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="codeessentials.Extensions.Logging.Demystifier" Version="1.1.66" />
-    <PackageVersion Include="Kysect.CommonLib" Version="0.1.8" />
-    <PackageVersion Include="Kysect.CommonLib.DependencyInjection" Version="0.1.8" />
-    <PackageVersion Include="Kysect.Editorconfig" Version="1.1.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
-    <PackageVersion Include="Serilog" Version="3.0.1" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="7.0.0" />
-    <PackageVersion Include="Serilog.Settings.Configuration" Version="7.0.1" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
-    <PackageVersion Include="Spectre.Console.Cli" Version="0.47.0" />
+    <PackageVersion Include="Kysect.CommonLib" Version="0.1.19" />
+    <PackageVersion Include="Kysect.CommonLib.DependencyInjection" Version="0.1.19" />
+    <PackageVersion Include="Kysect.Editorconfig" Version="1.1.8" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
+    <PackageVersion Include="Serilog" Version="3.1.1" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageVersion Include="Spectre.Console.Cli" Version="0.48.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageVersion Include="Markdig" Version="0.33.0" />
+    <PackageVersion Include="Markdig" Version="0.35.0" />
     <PackageVersion Include="FluentAssertions" Version="[6.12.0, )" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="NUnit.Analyzers" Version="3.6.1" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.0.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.1" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="20.0.15" />
   </ItemGroup>
 </Project>
diff --git a/Sources/Kysect.Configuin.CodeStyleDoc/Markdown/MarkdownCodeStyleFormatter.cs b/Sources/Kysect.Configuin.CodeStyleDoc/Markdown/MarkdownCodeStyleFormatter.cs
@@ -32,7 +32,7 @@ public string FormatRule(ICodeStyleElement element)
         {
             CodeStyleRoslynStyleRuleConfiguration styleRule => FormatStyleRule(styleRule),
             CodeStyleRoslynQualityRuleConfiguration qualityRule => FormatQualityRule(qualityRule),
-            _ => throw SwitchDefaultExceptions.OnUnexpectedType(nameof(element), element)
+            _ => throw SwitchDefaultExceptions.OnUnexpectedType(element)
         };
     }
 

diff --git a/Sources/Kysect.Configuin.Console/Program.cs b/Sources/Kysect.Configuin.Console/Program.cs
@@ -14,10 +14,8 @@ public static void Main(string[] args)
 
         IServiceCollection registrations = DependencyBuilder.InitializeServiceProvider();
 
-#if DEBUG
         if (args.Length == 0)
             args = PrepareTestCommand(registrations);
-#endif
 
         var registrar = new TypeRegistrar(registrations);
         var app = new CommandApp(registrar);

diff --git a/Sources/Kysect.Configuin.DotnetFormatIntegration/FileSystem/TemporaryFileReplacer.cs b/Sources/Kysect.Configuin.DotnetFormatIntegration/FileSystem/TemporaryFileReplacer.cs
@@ -1,5 +1,5 @@
 using Kysect.CommonLib.BaseTypes.Extensions;
-using Kysect.CommonLib.FileSystem.Extensions;
+using Kysect.CommonLib.FileSystem;
 using Microsoft.Extensions.Logging;
 
 namespace Kysect.Configuin.DotnetFormatIntegration.FileSystem;
@@ -25,7 +25,7 @@ public IFileMoveUndoOperation MoveFile(string sourcePath, string targetPath)
             var targetFileInfo = new FileInfo(targetPath);
             DirectoryInfo targetFileDirectory = targetFileInfo.Directory.ThrowIfNull();
             string tempFileDirectory = Path.Combine(targetFileDirectory.FullName, ".congifuing");
-            DirectoryExtensions.EnsureFileExists(tempFileDirectory);
+            DirectoryExtensions.EnsureDirectoryExists(new System.IO.Abstractions.FileSystem(), tempFileDirectory);
 
             string tempFilePath = Path.Combine(tempFileDirectory, targetFileInfo.Name);
             _logger.LogInformation("Target path already exists. Save target file to temp path {tempPath}", tempFilePath);

diff --git a/.../Kysect.Configuin.DotnetFormatIntegration/Kysect.Configuin.DotnetFormatIntegration.csproj b/.../Kysect.Configuin.DotnetFormatIntegration/Kysect.Configuin.DotnetFormatIntegration.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Kysect.CommonLib" />
     <PackageReference Include="Kysect.Editorconfig" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" />
   </ItemGroup>
 
 </Project>
diff --git a/Sources/Kysect.Configuin.RoslynModels/RoslynRuleType.cs b/Sources/Kysect.Configuin.RoslynModels/RoslynRuleType.cs
@@ -16,7 +16,7 @@ public static string ToAlias(this RoslynRuleType ruleType)
         {
             RoslynRuleType.StyleRule => "IDE",
             RoslynRuleType.QualityRule => "CA",
-            _ => throw SwitchDefaultExceptions.OnUnexpectedEnum(nameof(ruleType), ruleType)
+            _ => throw SwitchDefaultExceptions.OnUnexpectedType(ruleType)
         };
     }
 }
diff --git a/Sources/Kysect.Configuin.Tests/Kysect.Configuin.Tests.csproj b/Sources/Kysect.Configuin.Tests/Kysect.Configuin.Tests.csproj
@@ -25,7 +25,10 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit.Analyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="coverlet.collector">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Sources/Kysect.Configuin.Tests/TemporaryFileMoverTests.cs b/Sources/Kysect.Configuin.Tests/TemporaryFileMoverTests.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using Kysect.CommonLib.FileSystem.Extensions;
+using Kysect.CommonLib.FileSystem;
 using Kysect.Configuin.DotnetFormatIntegration.FileSystem;
 using Kysect.Configuin.Tests.Tools;
 using NUnit.Framework;
@@ -20,7 +20,7 @@ public TemporaryFileMoverTests()
     [SetUp]
     public void Setup()
     {
-        DirectoryExtensions.EnsureFileExists(TestGenerated);
+        DirectoryExtensions.EnsureDirectoryExists(new System.IO.Abstractions.FileSystem(), TestGenerated);
     }
 
     [TearDown]

diff --git a/Sources/Kysect.Configuin.sln b/Sources/Kysect.Configuin.sln
@@ -19,9 +19,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.Configuin.MsLearn",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.Configuin.EditorConfig", "Kysect.Configuin.EditorConfig\Kysect.Configuin.EditorConfig.csproj", "{AF0452EC-1E00-4490-9B1A-C3FA9810B2C9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kysect.Configuin.ConfigurationRoot", "Kysect.Configuin.ConfigurationRoot\Kysect.Configuin.ConfigurationRoot.csproj", "{71590EE8-BD16-4E45-8299-4D1CA3B0EC42}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.Configuin.ConfigurationRoot", "Kysect.Configuin.ConfigurationRoot\Kysect.Configuin.ConfigurationRoot.csproj", "{71590EE8-BD16-4E45-8299-4D1CA3B0EC42}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kysect.Configuin.CodeStyleDoc", "Kysect.Configuin.CodeStyleDoc\Kysect.Configuin.CodeStyleDoc.csproj", "{372CD01F-754F-4D95-8F59-F08F9BC645A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kysect.Configuin.CodeStyleDoc", "Kysect.Configuin.CodeStyleDoc\Kysect.Configuin.CodeStyleDoc.csproj", "{372CD01F-754F-4D95-8F59-F08F9BC645A6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{947325E5-C0FB-4DB1-8BBB-9371FFC6CDEE}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution