fix builds (#1412)

.editorconfig

@@ -85,6 +85,6 @@ indent_style = space
 indent_size = 2
 
 
-[*.{cs,vb}]
-# disable CA1848: Use the LoggerMessage delegates
+[*.cs]
+# disable CA1848: Use the LoggerMessage delegates`
 dotnet_diagnostic.ca1848.severity = none

ErsatzTV.Application/.editorconfig

@@ -1,3 +1,5 @@
-[*.{cs,vb}]
+[*.cs]
 # disable CA1711: Identifiers should not have incorrect suffix
 dotnet_diagnostic.ca1711.severity = none
+# disable CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.ca1848.severity = none

ErsatzTV.Core/.editorconfig

@@ -0,0 +1,3 @@
+[*.cs]
+# disable CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.ca1848.severity = none

ErsatzTV.FFmpeg/.editorconfig

@@ -0,0 +1,3 @@
+[*.cs]
+# disable CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.ca1848.severity = none

ErsatzTV.Infrastructure.MySql/Migrations/.editorconfig

@@ -1,4 +1,4 @@
-[*.{cs,vb}]
+[*.cs]
 # disable CA1707: Identifiers should not contain underscores
 dotnet_diagnostic.ca1707.severity = none
 # disable CA1711: Identifiers should not have incorrect suffix

ErsatzTV.Infrastructure.Sqlite/Migrations/.editorconfig

@@ -1,4 +1,4 @@
-[*.{cs,vb}]
+[*.cs]
 # disable CA1707: Identifiers should not contain underscores
 dotnet_diagnostic.ca1707.severity = none
 # disable CA1711: Identifiers should not have incorrect suffix

ErsatzTV.Infrastructure/.editorconfig

@@ -0,0 +1,3 @@
+[*.cs]
+# disable CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.ca1848.severity = none

ErsatzTV.Scanner/.editorconfig

@@ -0,0 +1,3 @@
+[*.cs]
+# disable CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.ca1848.severity = none

ErsatzTV.Scanner/Application/Jellyfin/Commands/SynchronizeJellyfinAdminUserIdHandler.cs

@@ -37,7 +37,7 @@ public class
 
     private async Task<Either<BaseError, Unit>> PerformSync(ConnectionParameters parameters)
     {
-        if (_memoryCache.TryGetValue($"jellyfin_admin_user_id.{parameters.JellyfinMediaSource.Id}", out string _))
+        if (_memoryCache.TryGetValue($"jellyfin_admin_user_id.{parameters.JellyfinMediaSource.Id}", out string? _))
         {
             return Unit.Default;
         }

ErsatzTV/.editorconfig

@@ -0,0 +1,3 @@
+[*.cs]
+# disable CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.ca1848.severity = none

ErsatzTV/Properties/.editorconfig

@@ -1,4 +1,4 @@
-[*.{cs,vb}]
+[*.cs]
 # disable CA1069: Enums should not have duplicate values
 dotnet_diagnostic.ca1069.severity = none
 # disable CA1707: Identifiers should not contain underscores

ErsatzTV/Shared/.editorconfig

@@ -1,3 +1,3 @@
-[*.{cs,vb}]
+[*.cs]
 # disable CA1716: Identifiers should not match keywords
 dotnet_diagnostic.ca1716.severity = none

docker/Dockerfile

@@ -1,8 +1,10 @@
 # https://hub.docker.com/_/microsoft-dotnet
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-RUN apt-get update && apt-get install -y ca-certificates
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+FROM mcr.microsoft.com/dotnet/sdk:7.0.110 AS build
+RUN apt-get update && apt-get install -y ca-certificates gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
 WORKDIR /source
 
 # copy csproj and restore as distinct layers

docker/arm32v7/Dockerfile

@@ -10,9 +10,11 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu
 
 # https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy-amd64 AS build
-RUN apt-get update && apt-get install -y ca-certificates
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get update && apt-get install -y ca-certificates gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
 WORKDIR /source
 
 # copy csproj and restore as distinct layers

docker/arm64/Dockerfile

@@ -10,9 +10,11 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu
 
 # https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy-amd64 AS build
-RUN apt-get update && apt-get install -y ca-certificates
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get update && apt-get install -y ca-certificates gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
 WORKDIR /source
 
 # copy csproj and restore as distinct layers

docker/nvidia/Dockerfile

@@ -1,8 +1,10 @@
 # https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-RUN apt-get update && apt-get install -y ca-certificates
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get update && apt-get install -y ca-certificates gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
 WORKDIR /source
 
 # copy csproj and restore as distinct layers

docker/vaapi/Dockerfile

@@ -1,8 +1,10 @@
 # https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
-RUN apt-get update && apt-get install -y ca-certificates
-RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt-get install -y nodejs
+RUN apt-get update && apt-get install -y ca-certificates gnupg
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
 WORKDIR /source
 
 # copy csproj and restore as distinct layers
@@ -30,8 +32,8 @@ COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/
 COPY ErsatzTV.Infrastructure.Sqlite/. ./ErsatzTV.Infrastructure.Sqlite/
 COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/
 COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/
-WORKDIR /source/ErsatzTV.Scanner
 ARG INFO_VERSION="unknown"
+WORKDIR /source/ErsatzTV.Scanner
 RUN dotnet publish ErsatzTV.Scanner.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
 WORKDIR /source/ErsatzTV
 RUN sed -i '/Scanner/d' ErsatzTV.csproj