build: Reorganize structure of tests

- `src/tests` moved to `tests`
- `src/Recyclarr.sln` moved to `Recyclarr.sln`

.editorconfig

@@ -1591,7 +1591,7 @@ indent_size = 4
 [*.json]
 ij_javascript_array_initializer_right_brace_on_new_line = false
 
-[src/tests/**.cs]
+[tests/**.cs]
 dotnet_diagnostic.ca1707.severity = none
 
 # CA1861: Avoid constant arrays as arguments

.github/workflows/build.yml

@@ -8,6 +8,7 @@ on:
       - ".github/workflows/reusable-docker.yml"
       - ".github/workflows/reusable-build.yml"
       - "src/**"
+      - "tests/**"
       - "schemas/**"
       - "docker/**"
       - "ci/**"
@@ -18,6 +19,7 @@ on:
       - ".github/workflows/reusable-docker.yml"
       - ".github/workflows/reusable-build.yml"
       - "src/**"
+      - "tests/**"
       - "schemas/**"
       - "docker/**"
       - "ci/**"

.github/workflows/inspect-code.yml

@@ -34,12 +34,11 @@ jobs:
           dotnet-version: ${{ env.dotnetVersion }}
 
       - name: Restore
-        run: dotnet restore src
+        run: dotnet restore
 
       - name: Inspect Code
         uses: muno92/resharper_inspectcode@v1
         with:
-          workingDirectory: src
           solutionPath: Recyclarr.sln
           minimumSeverity: warning
           include: '**.cs'
@@ -62,11 +61,10 @@ jobs:
         run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
 
       - name: Build
-        run: dotnet build src
+        run: dotnet build
 
       - name: Run Code Cleanup
         run: ../ci/code_cleanup.sh "${{ env.baseRef }}"
-        working-directory: src
 
       - name: Check Diff
         run: |

.github/workflows/markdown-lint.yml

@@ -9,11 +9,13 @@ on:
       - "**.md"
       - .github/workflows/markdown-lint.yml
       - "!src/**"
+      - "!tests/**"
   pull_request:
     paths:
       - "**.md"
       - .github/workflows/markdown-lint.yml
       - "!src/**"
+      - "!tests/**"
 
 jobs:
   markdownlint:
@@ -28,3 +30,4 @@ jobs:
           globs: |
             **.md
             !src/**
+            !tests/**

.github/workflows/reusable-build.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Test
         if: endsWith(inputs.runtime, 'x64') && !inputs.skip-test
-        run: dotnet test src -c Release --logger GitHubActions
+        run: dotnet test -c Release --logger GitHubActions
 
       - name: Publish
         shell: pwsh

.github/workflows/sonarcloud.yml

@@ -11,6 +11,7 @@ on:
       - .github/workflows/sonarcloud.yml
       - sonar-project.properties
       - "src/**"
+      - "tests/**"
 
 env:
   dotnetVersion: 8.0.x

.idea/.idea.Recyclarr/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dotnet-test-explorer.testProjectPath": "src/**/*Tests.csproj",
+  "dotnet-test-explorer.testProjectPath": "tests/**/*.Tests.csproj",
   "files.trimFinalNewlines": true,
   "files.insertFinalNewline": true,
   "recyclarr.runtime": "linux-musl-x64"

Recyclarr.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32825.248
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Cli", "Recyclarr.Cli\Recyclarr.Cli.csproj", "{CD5C6F99-C587-4B7C-86AE-550FA4A5594A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Cli", "src\Recyclarr.Cli\Recyclarr.Cli.csproj", "{CD5C6F99-C587-4B7C-86AE-550FA4A5594A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.TestLibrary", "tests\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj", "{49F28A82-468F-4C48-9A59-D41B8FE26D6E}"
 EndProject
@@ -15,36 +15,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{305C2AC5
 		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Common", "Recyclarr.Common\Recyclarr.Common.csproj", "{18CF1FCA-7983-4423-8B7E-4A830108C624}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Common", "src\Recyclarr.Common\Recyclarr.Common.csproj", "{18CF1FCA-7983-4423-8B7E-4A830108C624}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Tests", "tests\Recyclarr.Tests\Recyclarr.Tests.csproj", "{A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Gui", "Recyclarr.Gui\Recyclarr.Gui.csproj", "{53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Gui", "src\Recyclarr.Gui\Recyclarr.Gui.csproj", "{53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{18E17C53-F600-40AE-82C1-3CD1E547C307}"
 	ProjectSection(SolutionItems) = preProject
 		tests\Directory.Build.props = tests\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Config", "Recyclarr.Config\Recyclarr.Config.csproj", "{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Config", "src\Recyclarr.Config\Recyclarr.Config.csproj", "{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Yaml", "Recyclarr.Yaml\Recyclarr.Yaml.csproj", "{62D0B120-75A0-4C86-B088-FD42E3FA1508}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Yaml", "src\Recyclarr.Yaml\Recyclarr.Yaml.csproj", "{62D0B120-75A0-4C86-B088-FD42E3FA1508}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashGuide", "Recyclarr.TrashGuide\Recyclarr.TrashGuide.csproj", "{37220364-7C1E-4561-A369-C32BA195A0C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashGuide", "src\Recyclarr.TrashGuide\Recyclarr.TrashGuide.csproj", "{37220364-7C1E-4561-A369-C32BA195A0C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Json", "Recyclarr.Json\Recyclarr.Json.csproj", "{A9E2F11E-73F8-48CC-8770-0AFD41E80141}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Json", "src\Recyclarr.Json\Recyclarr.Json.csproj", "{A9E2F11E-73F8-48CC-8770-0AFD41E80141}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Platform", "Recyclarr.Platform\Recyclarr.Platform.csproj", "{CB296D81-813B-48C3-9D4B-A52951EF26BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Platform", "src\Recyclarr.Platform\Recyclarr.Platform.csproj", "{CB296D81-813B-48C3-9D4B-A52951EF26BF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.VersionControl", "Recyclarr.VersionControl\Recyclarr.VersionControl.csproj", "{0495507A-0307-43EA-B97F-EDF2C0241839}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.VersionControl", "src\Recyclarr.VersionControl\Recyclarr.VersionControl.csproj", "{0495507A-0307-43EA-B97F-EDF2C0241839}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Repo", "Recyclarr.Repo\Recyclarr.Repo.csproj", "{6A4E06DF-464E-4DD4-890C-EC5182E96C13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Repo", "src\Recyclarr.Repo\Recyclarr.Repo.csproj", "{6A4E06DF-464E-4DD4-890C-EC5182E96C13}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Settings", "Recyclarr.Settings\Recyclarr.Settings.csproj", "{CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Settings", "src\Recyclarr.Settings\Recyclarr.Settings.csproj", "{CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.ServarrApi", "Recyclarr.ServarrApi\Recyclarr.ServarrApi.csproj", "{5B48995A-1181-46AA-AC38-C040BDD3D7B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.ServarrApi", "src\Recyclarr.ServarrApi\Recyclarr.ServarrApi.csproj", "{5B48995A-1181-46AA-AC38-C040BDD3D7B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Compatibility", "Recyclarr.Compatibility\Recyclarr.Compatibility.csproj", "{03B4A46E-234D-47C9-8078-0B749800229A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Compatibility", "src\Recyclarr.Compatibility\Recyclarr.Compatibility.csproj", "{03B4A46E-234D-47C9-8078-0B749800229A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Tests.TestLibrary", "tests\Recyclarr.Tests.TestLibrary\Recyclarr.Tests.TestLibrary.csproj", "{DE198BA1-2906-43BB-9CDB-977B9218A670}"
 EndProject

ci/RunSonarScan.ps1

@@ -30,10 +30,10 @@ if ($LASTEXITCODE -ne 0) { throw "Failed: sonarscanner begin" }
 try {
     # Run a full build command because if we just do the tests, it will not build everything.
     # Building everything is important to ensure we analyze all code in the solution.
-    dotnet build src
+    dotnet build
     if ($LASTEXITCODE -ne 0) { throw "Failed: dotnet build" }
 
-    dotnet test src --no-build --collect:"XPLat Code Coverage;Format=opencover"
+    dotnet test --no-build --collect:"XPLat Code Coverage;Format=opencover"
     if ($LASTEXITCODE -ne 0) { throw "Failed: dotnet test" }
 }
 finally {

src/nuget.config

@@ -1,11 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
-
-  <packageSourceMapping>
-    <packageSource key="nuget.org">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>
+</configuration>

src/tests/Recyclarr.IntegrationTests/Recyclarr.IntegrationTests.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <ItemGroup>
-      <ProjectReference Include="..\..\Recyclarr.Common\Recyclarr.Common.csproj" />
-      <ProjectReference Include="..\..\Recyclarr.Compatibility\Recyclarr.Compatibility.csproj" />
-      <ProjectReference Include="..\..\Recyclarr.Platform\Recyclarr.Platform.csproj" />
-      <ProjectReference Include="..\..\Recyclarr.VersionControl\Recyclarr.VersionControl.csproj" />
-      <ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
-      <ProjectReference Include="..\Recyclarr.Tests.TestLibrary\Recyclarr.Tests.TestLibrary.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-      <PackageReference Include="Autofac.Extras.Ordering" />
-    </ItemGroup>
-</Project>

src/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj

@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\Recyclarr.Config\Recyclarr.Config.csproj" />
-    <ProjectReference Include="..\..\Recyclarr.TrashGuide\Recyclarr.TrashGuide.csproj" />
-    <ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
-  </ItemGroup>
-</Project>

tests/Recyclarr.Cli.IntegrationTests/Recyclarr.Cli.IntegrationTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <ProjectReference Include="..\..\Recyclarr.Cli\Recyclarr.Cli.csproj" />
+    <ProjectReference Include="..\..\src\Recyclarr.Cli\Recyclarr.Cli.csproj" />
     <ProjectReference Include="..\Recyclarr.IntegrationTests\Recyclarr.IntegrationTests.csproj" />
   </ItemGroup>
 </Project>

tests/Recyclarr.Cli.Tests/Recyclarr.Cli.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <ProjectReference Include="..\..\Recyclarr.Cli\Recyclarr.Cli.csproj" />
+    <ProjectReference Include="..\..\src\Recyclarr.Cli\Recyclarr.Cli.csproj" />
     <ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
     <ProjectReference Include="..\Recyclarr.Tests.TestLibrary\Recyclarr.Tests.TestLibrary.csproj" />
   </ItemGroup>

tests/Recyclarr.IntegrationTests/Recyclarr.IntegrationTests.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <ItemGroup>
+      <ProjectReference Include="..\..\src\Recyclarr.Common\Recyclarr.Common.csproj" />
+      <ProjectReference Include="..\..\src\Recyclarr.Compatibility\Recyclarr.Compatibility.csproj" />
+      <ProjectReference Include="..\..\src\Recyclarr.Platform\Recyclarr.Platform.csproj" />
+      <ProjectReference Include="..\..\src\Recyclarr.VersionControl\Recyclarr.VersionControl.csproj" />
+      <ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
+      <ProjectReference Include="..\Recyclarr.Tests.TestLibrary\Recyclarr.Tests.TestLibrary.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="Autofac.Extras.Ordering" />
+    </ItemGroup>
+</Project>