From e8ce3cc398959dbdc7bb85bc5fab9cbdfaf5a9eb Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 21:21:21 +1100
Subject: [PATCH 01/36] Change folder selection to use artist paths

---
 src/NzbDrone.Core/Music/Services/RefreshArtistService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NzbDrone.Core/Music/Services/RefreshArtistService.cs b/src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
index 4d4efdf6e..5d4bebbb7 100644
--- a/src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
+++ b/src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
@@ -294,7 +294,7 @@ private void RescanArtists(List<Artist> artists, bool isNew, CommandTrigger trig
             var rescanAfterRefresh = _configService.RescanAfterRefresh;
             var shouldRescan = true;
             var filter = FilterFilesType.Matched;
-            var folders = _rootFolderService.All().Select(x => x.Path).ToList();
+            var folders = artists.Select(x => x.Path).ToList();
 
             if (isNew)
             {

From 2051e20380ae613f8a112c4d54051445ebb05daf Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:11:29 +1100
Subject: [PATCH 02/36] Add Docker build workflow

---
 .github/workflows/docker-build.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/docker-build.yml

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
new file mode 100644
index 000000000..223f6dfc5
--- /dev/null
+++ b/.github/workflows/docker-build.yml
@@ -0,0 +1,25 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: mcphelps/lidarr-fix:latest

From ca4c129ff1fbb629db9879cad890f3c6a470b9d4 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:13:37 +1100
Subject: [PATCH 03/36] Add Dockerfile for Lidarr application

---
 Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..f4708ae97
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+WORKDIR /src
+COPY . .
+RUN dotnet publish src/Lidarr.sln \
+    --configuration Release \
+    --output /app \
+    --runtime linux-x64 \
+    --self-contained false
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+WORKDIR /app
+COPY --from=build /app .
+EXPOSE 8686
+VOLUME /config
+ENTRYPOINT ["dotnet", "Lidarr.dll", "-nobrowser", "-data=/config"]

From b173016147dde52907b6e2272427efff3e9c4a47 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:14:06 +1100
Subject: [PATCH 04/36] Update docker-build.yml


From 9aed7aa1107e4922bfcbca2f2b2de71a2466cf14 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:16:18 +1100
Subject: [PATCH 05/36] Update Dockerfile

---
 Dockerfile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f4708ae97..6cc67085f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,10 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
 COPY . .
-RUN dotnet publish src/Lidarr.sln \
+RUN dotnet build src/NzbDrone.Core/NzbDrone.Core.csproj \
     --configuration Release \
-    --output /app \
-    --runtime linux-x64 \
-    --self-contained false
+    --framework net6.0
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
-WORKDIR /app
-COPY --from=build /app .
-EXPOSE 8686
-VOLUME /config
-ENTRYPOINT ["dotnet", "Lidarr.dll", "-nobrowser", "-data=/config"]
+FROM lscr.io/linuxserver/lidarr:latest
+COPY --from=build /src/src/NzbDrone.Core/bin/Release/net6.0/NzbDrone.Core.dll \
+    /app/NzbDrone.Core.dll

From 6dbc039e3f5aa112ebed4707980208d2c6a929b1 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:17:52 +1100
Subject: [PATCH 06/36] Update Dockerfile to remove build stage

---
 Dockerfile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6cc67085f..5ab72347b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,2 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY . .
-RUN dotnet build src/NzbDrone.Core/NzbDrone.Core.csproj \
-    --configuration Release \
-    --framework net6.0
-
 FROM lscr.io/linuxserver/lidarr:latest
-COPY --from=build /src/src/NzbDrone.Core/bin/Release/net6.0/NzbDrone.Core.dll \
-    /app/NzbDrone.Core.dll
+COPY src/NzbDrone.Core/bin/Release/net6.0/NzbDrone.Core.dll /app/NzbDrone.Core.dll

From 934574b9794146584116f0ac702f39cbb47c80a8 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:19:05 +1100
Subject: [PATCH 07/36] Update Docker build workflow for .NET setup

---
 .github/workflows/docker-build.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 223f6dfc5..9ce38f04c 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -11,6 +11,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '6.0.x'
+
+      - name: Restore dependencies
+        run: dotnet restore src/NzbDrone.Core/NzbDrone.Core.csproj
+
+      - name: Build NzbDrone.Core
+        run: dotnet build src/NzbDrone.Core/NzbDrone.Core.csproj --configuration Release --framework net6.0 --no-restore
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -22,4 +33,4 @@ jobs:
         with:
           context: .
           push: true
-          tags: mcphelps/lidarr-fix:latest
+          tags: YOURDOCKERHUBUSERNAME/lidarr-fix:latest

From f6517d0afc9d9604f856fcc7fe7c7542ad1185d7 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:19:29 +1100
Subject: [PATCH 08/36] Update Dockerfile


From 9e96bab23b5ccd4af0cc064d7c0031132fb3e9b3 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:21:27 +1100
Subject: [PATCH 09/36] Add step to list src folder in Docker build workflow

Added a step to list the contents of the src folder.
---
 .github/workflows/docker-build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 9ce38f04c..a5fe97c02 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -10,6 +10,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: List src folder
+        run: ls src/
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4

From a66f600de867d345aa97439fcb7011de8ad16fb6 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:22:59 +1100
Subject: [PATCH 10/36] Update Docker build workflow for Lidarr project

Removed the src folder listing step and updated the project restore command to use the Lidarr solution file.
---
 .github/workflows/docker-build.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index a5fe97c02..201cf66f2 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -13,16 +13,13 @@ jobs:
         with:
           submodules: recursive
 
-      - name: List src folder
-        run: ls src/
-
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '6.0.x'
 
       - name: Restore dependencies
-        run: dotnet restore src/NzbDrone.Core/NzbDrone.Core.csproj
+        run: dotnet restore src/Lidarr.sln
 
       - name: Build NzbDrone.Core
         run: dotnet build src/NzbDrone.Core/NzbDrone.Core.csproj --configuration Release --framework net6.0 --no-restore

From d529bce9c93f94fdc9e689792c1793918c4dcb98 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:27:57 +1100
Subject: [PATCH 11/36] Add step to list NzbDrone.Core folder contents

Added a step to list the contents of the NzbDrone.Core folder before building.
---
 .github/workflows/docker-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 201cf66f2..3c99c427a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -21,6 +21,9 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore src/Lidarr.sln
 
+      - name: List NzbDrone.Core folder
+        run: ls src/NzbDrone.Core/
+
       - name: Build NzbDrone.Core
         run: dotnet build src/NzbDrone.Core/NzbDrone.Core.csproj --configuration Release --framework net6.0 --no-restore
 

From 0834369fde3943c2cff71cab49ca6e31bbbfc24d Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:28:46 +1100
Subject: [PATCH 12/36] Update Docker image tag to mcphelps/lidarr-fix:latest

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 3c99c427a..d162b0320 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -38,4 +38,4 @@ jobs:
         with:
           context: .
           push: true
-          tags: YOURDOCKERHUBUSERNAME/lidarr-fix:latest
+          tags: mcphelps/lidarr-fix:latest

From d082a1793ec73aa6b1a8fb840c9826d093e36dee Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:30:34 +1100
Subject: [PATCH 13/36] Update Dockerfile to copy Lidarr.Core.dll

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5ab72347b..ed037101b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
 FROM lscr.io/linuxserver/lidarr:latest
-COPY src/NzbDrone.Core/bin/Release/net6.0/NzbDrone.Core.dll /app/NzbDrone.Core.dll
+COPY src/NzbDrone.Core/bin/Release/net6.0/Lidarr.Core.dll /app/Lidarr.Core.dll

From e5bf4331c844c55ea985bf063b67fae436bf0c72 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:30:51 +1100
Subject: [PATCH 14/36] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index d162b0320..930d53570 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -21,11 +21,8 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore src/Lidarr.sln
 
-      - name: List NzbDrone.Core folder
-        run: ls src/NzbDrone.Core/
-
       - name: Build NzbDrone.Core
-        run: dotnet build src/NzbDrone.Core/NzbDrone.Core.csproj --configuration Release --framework net6.0 --no-restore
+        run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --framework net6.0 --no-restore
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

From 99e68a4a4e93644dd037b84e8bd64df8b6949fe9 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:32:35 +1100
Subject: [PATCH 15/36] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 930d53570..cd7d75f22 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -16,13 +16,13 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
 
       - name: Restore dependencies
         run: dotnet restore src/Lidarr.sln
 
       - name: Build NzbDrone.Core
-        run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --framework net6.0 --no-restore
+        run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

From 2a83e9c3d772439011f33a6f61e362b137e1c793 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:32:48 +1100
Subject: [PATCH 16/36] Update COPY command to use wildcard for Lidarr.Core.dll

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ed037101b..053b029d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
 FROM lscr.io/linuxserver/lidarr:latest
-COPY src/NzbDrone.Core/bin/Release/net6.0/Lidarr.Core.dll /app/Lidarr.Core.dll
+COPY src/NzbDrone.Core/bin/Release/*/Lidarr.Core.dll /app/Lidarr.Core.dll

From f5659251564ec0667667d4e373e1a32e01b57ecf Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:34:28 +1100
Subject: [PATCH 17/36] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index cd7d75f22..b77cd0b96 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -22,7 +22,7 @@ jobs:
         run: dotnet restore src/Lidarr.sln
 
       - name: Build NzbDrone.Core
-        run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore
+        run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -35,4 +35,4 @@ jobs:
         with:
           context: .
           push: true
-          tags: mcphelps/lidarr-fix:latest
+          tags:

From 4ff20e316a4dfade4eea469a9aa167b21f17ebcc Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:36:39 +1100
Subject: [PATCH 18/36] Add Dockerfile path to build configuration

---
 .github/workflows/docker-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b77cd0b96..84d49cd38 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -34,5 +34,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          file: ./Dockerfile
           push: true
-          tags:
+          tags: |
+            mcphelps/lidarr-fix:latest

From 5ec431b620c3f39a14d81109c93061bf9efd0379 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:38:27 +1100
Subject: [PATCH 19/36] Update COPY command for Lidarr.Core.dll

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 053b029d4..0ff5768f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
 FROM lscr.io/linuxserver/lidarr:latest
-COPY src/NzbDrone.Core/bin/Release/*/Lidarr.Core.dll /app/Lidarr.Core.dll
+COPY Lidarr.Core.dll /app/Lidarr.Core.dll

From 7bb43f0156521d4eeca73e74da9c7a1abe77a753 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:38:46 +1100
Subject: [PATCH 20/36] Add step to copy DLL to root in Docker build workflow

Added a step to copy the Lidarr.Core.dll to the root directory after building.
---
 .github/workflows/docker-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 84d49cd38..402320838 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -24,6 +24,9 @@ jobs:
       - name: Build NzbDrone.Core
         run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false
 
+      - name: Copy DLL to root
+        run: cp src/NzbDrone.Core/bin/Release/*/Lidarr.Core.dll ./Lidarr.Core.dll
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:

From f6eb3c00c94b6e440f657693cbbae2bca1395de8 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:40:18 +1100
Subject: [PATCH 21/36] Update DLL handling in Docker build workflow

Replaced the copy command with a find command to locate DLLs.
---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 402320838..b84c6c477 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Build NzbDrone.Core
         run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false
 
-      - name: Copy DLL to root
-        run: cp src/NzbDrone.Core/bin/Release/*/Lidarr.Core.dll ./Lidarr.Core.dll
+      - name: Find DLL
+        run: find src/NzbDrone.Core -name "*.dll" | head -20
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

From c30528268b3ab7ed096826f90cb4467d990e2b4d Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:42:12 +1100
Subject: [PATCH 22/36] Update DLL search path in Docker build workflow

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b84c6c477..fecc92681 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -25,7 +25,7 @@ jobs:
         run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false
 
       - name: Find DLL
-        run: find src/NzbDrone.Core -name "*.dll" | head -20
+        run: find /home/runner/work -name "Lidarr.Core.dll" 2>/dev/null || echo "DLL not found anywhere"
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

From 254a121aa1ce283ab2de85756ab2389a5cd827a6 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:43:53 +1100
Subject: [PATCH 23/36] Replace DLL search with copy command in workflow

---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index fecc92681..34692300a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Build NzbDrone.Core
         run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false
 
-      - name: Find DLL
-        run: find /home/runner/work -name "Lidarr.Core.dll" 2>/dev/null || echo "DLL not found anywhere"
+      - name: Copy DLL to root
+        run: cp _output/net8.0/Lidarr.Core.dll ./Lidarr.Core.dll
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

From af78f97de6b0fb265307de9e9942892b1768f0f1 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 22:55:51 +1100
Subject: [PATCH 24/36] Update Lidarr.Core.dll copy path in Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0ff5768f7..2bca87de9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
 FROM lscr.io/linuxserver/lidarr:latest
-COPY Lidarr.Core.dll /app/Lidarr.Core.dll
+COPY Lidarr.Core.dll /app/lidarr/bin/Lidarr.Core.dll

From c8b127936cc6e9df0896de80348d233673deaae4 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:05:00 +1100
Subject: [PATCH 25/36] Update Docker build workflow to apply code fix

Added steps to apply and verify a fix in RefreshArtistService.cs.
---
 .github/workflows/docker-build.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 34692300a..0c1f8ca7b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -11,8 +11,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          ref: v3.1.0.4875
           submodules: recursive
 
+      - name: Apply fix
+        run: |
+          sed -i 's/_rootFolderService.All().Select(x => x.Path).ToList();/artists.Select(x => x.Path).ToList();/' src/NzbDrone.Core/Music/RefreshArtistService.cs
+
+      - name: Verify fix applied
+        run: grep -n "artists.Select(x => x.Path).ToList()" src/NzbDrone.Core/Music/RefreshArtistService.cs
+
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:

From e0bcfe4878182452b94c2750f3476083ffe513da Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:06:29 +1100
Subject: [PATCH 26/36] Fetch upstream tag before applying Docker build fix

Added a step to fetch and checkout the upstream tag v3.1.0.4875 before applying the fix.
---
 .github/workflows/docker-build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 0c1f8ca7b..72e992d43 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -11,9 +11,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: v3.1.0.4875
           submodules: recursive
 
+      - name: Fetch upstream tag
+        run: |
+          git remote add upstream https://github.com/Lidarr/Lidarr.git
+          git fetch upstream refs/tags/v3.1.0.4875:refs/tags/v3.1.0.4875
+          git checkout v3.1.0.4875
+
       - name: Apply fix
         run: |
           sed -i 's/_rootFolderService.All().Select(x => x.Path).ToList();/artists.Select(x => x.Path).ToList();/' src/NzbDrone.Core/Music/RefreshArtistService.cs

From e09d4028301e5a96c7ce4dc0e9309d4bf7b2deaa Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:07:39 +1100
Subject: [PATCH 27/36] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 72e992d43..4d96795c6 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -18,6 +18,10 @@ jobs:
           git remote add upstream https://github.com/Lidarr/Lidarr.git
           git fetch upstream refs/tags/v3.1.0.4875:refs/tags/v3.1.0.4875
           git checkout v3.1.0.4875
+          git submodule update --init --recursive
+
+      - name: Check file exists
+        run: find src/NzbDrone.Core/Music -name "RefreshArtistService.cs"
 
       - name: Apply fix
         run: |

From 1c75901d2d910378045c711802a232a5c03ca443 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:09:05 +1100
Subject: [PATCH 28/36] Update Docker workflow to fix RefreshArtistService

---
 .github/workflows/docker-build.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 4d96795c6..0a18bafb9 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -20,15 +20,12 @@ jobs:
           git checkout v3.1.0.4875
           git submodule update --init --recursive
 
-      - name: Check file exists
-        run: find src/NzbDrone.Core/Music -name "RefreshArtistService.cs"
-
       - name: Apply fix
         run: |
-          sed -i 's/_rootFolderService.All().Select(x => x.Path).ToList();/artists.Select(x => x.Path).ToList();/' src/NzbDrone.Core/Music/RefreshArtistService.cs
+          sed -i 's/_rootFolderService.All().Select(x => x.Path).ToList();/artists.Select(x => x.Path).ToList();/' src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
 
       - name: Verify fix applied
-        run: grep -n "artists.Select(x => x.Path).ToList()" src/NzbDrone.Core/Music/RefreshArtistService.cs
+        run: grep -n "artists.Select(x => x.Path).ToList()" src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4

From 73fb51301668151ae282d1d7a8fac89a9e12156e Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:11:19 +1100
Subject: [PATCH 29/36] Enhance Docker build workflow with Dockerfile
 management

Added steps to save and restore Dockerfile during the workflow.
---
 .github/workflows/docker-build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 0a18bafb9..809d238cb 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -13,6 +13,9 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Save Dockerfile
+        run: cp Dockerfile /tmp/Dockerfile
+
       - name: Fetch upstream tag
         run: |
           git remote add upstream https://github.com/Lidarr/Lidarr.git
@@ -20,6 +23,9 @@ jobs:
           git checkout v3.1.0.4875
           git submodule update --init --recursive
 
+      - name: Restore Dockerfile
+        run: cp /tmp/Dockerfile ./Dockerfile
+
       - name: Apply fix
         run: |
           sed -i 's/_rootFolderService.All().Select(x => x.Path).ToList();/artists.Select(x => x.Path).ToList();/' src/NzbDrone.Core/Music/Services/RefreshArtistService.cs

From e812e7d8e4393a1792d11d05998a93e7009d38a8 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:14:57 +1100
Subject: [PATCH 30/36] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2bca87de9..ed4d86ea5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
 FROM lscr.io/linuxserver/lidarr:latest
-COPY Lidarr.Core.dll /app/lidarr/bin/Lidarr.Core.dll
+COPY _output/net8.0/ /app/lidarr/bin/

From 3c3a8ceb4bf1dcb7ff610a686c6ff1e0e090d5c5 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:17:39 +1100
Subject: [PATCH 31/36] Update Docker build workflow to restore specific
 project

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 809d238cb..28bfcd8a1 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -39,7 +39,7 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Restore dependencies
-        run: dotnet restore src/Lidarr.sln
+        run: dotnet restore src/NzbDrone.Core/Lidarr.Core.csproj
 
       - name: Build NzbDrone.Core
         run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false

From 74f6889436b5397dcd65f8b27fa65c5e5e5ee12e Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:23:01 +1100
Subject: [PATCH 32/36] Update COPY command in Dockerfile


From b4c9c7bea7baaae60fbdda6633ca5bf65b96e1c2 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:23:31 +1100
Subject: [PATCH 33/36] Update Docker build workflow for Lidarr project

---
 .github/workflows/docker-build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 28bfcd8a1..b0a279a70 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -41,11 +41,11 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore src/NzbDrone.Core/Lidarr.Core.csproj
 
-      - name: Build NzbDrone.Core
-        run: dotnet build src/NzbDrone.Core/Lidarr.Core.csproj --configuration Release --no-restore -p:RunAnalyzers=false
+      - name: Build
+        run: dotnet build src/NzbDrone.Host/Lidarr.Host.csproj --configuration Release --no-restore -p:RunAnalyzers=false
 
-      - name: Copy DLL to root
-        run: cp _output/net8.0/Lidarr.Core.dll ./Lidarr.Core.dll
+      - name: Copy output to root
+        run: cp -r _output/net8.0 ./output
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

From d70919fef22715fd0be1849c253aa8b1e6a425b8 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Wed, 18 Mar 2026 23:24:59 +1100
Subject: [PATCH 34/36] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b0a279a70..6d53c576b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -39,7 +39,9 @@ jobs:
           dotnet-version: '8.0.x'
 
       - name: Restore dependencies
-        run: dotnet restore src/NzbDrone.Core/Lidarr.Core.csproj
+        run: |
+          dotnet restore src/NzbDrone.Core/Lidarr.Core.csproj
+          dotnet restore src/NzbDrone.Host/Lidarr.Host.csproj
 
       - name: Build
         run: dotnet build src/NzbDrone.Host/Lidarr.Host.csproj --configuration Release --no-restore -p:RunAnalyzers=false

From 470eb231b1c59496dd4f2f891b14b06823ffa710 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Fri, 20 Mar 2026 09:52:45 +1100
Subject: [PATCH 35/36] Delete .github/workflows/docker-build.yml

---
 .github/workflows/docker-build.yml | 65 ------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 .github/workflows/docker-build.yml

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
deleted file mode 100644
index 6d53c576b..000000000
--- a/.github/workflows/docker-build.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  push:
-    branches: [ develop ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Save Dockerfile
-        run: cp Dockerfile /tmp/Dockerfile
-
-      - name: Fetch upstream tag
-        run: |
-          git remote add upstream https://github.com/Lidarr/Lidarr.git
-          git fetch upstream refs/tags/v3.1.0.4875:refs/tags/v3.1.0.4875
-          git checkout v3.1.0.4875
-          git submodule update --init --recursive
-
-      - name: Restore Dockerfile
-        run: cp /tmp/Dockerfile ./Dockerfile
-
-      - name: Apply fix
-        run: |
-          sed -i 's/_rootFolderService.All().Select(x => x.Path).ToList();/artists.Select(x => x.Path).ToList();/' src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
-
-      - name: Verify fix applied
-        run: grep -n "artists.Select(x => x.Path).ToList()" src/NzbDrone.Core/Music/Services/RefreshArtistService.cs
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '8.0.x'
-
-      - name: Restore dependencies
-        run: |
-          dotnet restore src/NzbDrone.Core/Lidarr.Core.csproj
-          dotnet restore src/NzbDrone.Host/Lidarr.Host.csproj
-
-      - name: Build
-        run: dotnet build src/NzbDrone.Host/Lidarr.Host.csproj --configuration Release --no-restore -p:RunAnalyzers=false
-
-      - name: Copy output to root
-        run: cp -r _output/net8.0 ./output
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and Push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: |
-            mcphelps/lidarr-fix:latest

From 8a46430d3b009d3147a2fa5e4a9f9e3a88608cc4 Mon Sep 17 00:00:00 2001
From: Matthew Phelps <146899553+kerneldraft@users.noreply.github.com>
Date: Fri, 20 Mar 2026 09:52:53 +1100
Subject: [PATCH 36/36] Delete Dockerfile

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index ed4d86ea5..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM lscr.io/linuxserver/lidarr:latest
-COPY _output/net8.0/ /app/lidarr/bin/