From 25f80e22f3a3655801e814b8d4a7e7023e6d2a4b Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Thu, 23 Apr 2026 14:39:49 -0700
Subject: [PATCH 1/2] RE1-T115 Build fixes

---
 Web/Resgrid.Web.Tts/Dockerfile             | 17 ++++++++++++-----
 Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Web/Resgrid.Web.Tts/Dockerfile b/Web/Resgrid.Web.Tts/Dockerfile
index a89f6fbc..292ba9ca 100644
--- a/Web/Resgrid.Web.Tts/Dockerfile
+++ b/Web/Resgrid.Web.Tts/Dockerfile
@@ -1,14 +1,23 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_VERSION=3.5.0
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0.3-noble-amd64 AS base
+ARG BUILD_VERSION
+WORKDIR /app
+EXPOSE 8080
+
+FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
+ARG BUILD_VERSION
 WORKDIR /src
 
 COPY ["Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj", "Web/Resgrid.Web.Tts/"]
+COPY ["Core/Resgrid.Config/Resgrid.Config.csproj", "Core/Resgrid.Config/"]
 RUN dotnet restore "Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj"
 
 COPY . .
 WORKDIR /src/Web/Resgrid.Web.Tts
-RUN dotnet publish "Resgrid.Web.Tts.csproj" -c Release -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "Resgrid.Web.Tts.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final
+FROM base AS final
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends espeak-ng ffmpeg ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -19,7 +28,5 @@ WORKDIR /app
 COPY --from=build /app/publish .
 
 ENV ASPNETCORE_URLS=http://+:8080
-EXPOSE 8080
-
 USER appuser
 ENTRYPOINT ["dotnet", "Resgrid.Web.Tts.dll"]
diff --git a/Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj b/Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj
index 4d2441b0..f12bf054 100644
--- a/Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj
+++ b/Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Description>Linux-ready TTS microservice backed by eSpeak NG, ffmpeg, and S3-compatible storage.</Description>
@@ -11,8 +11,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="AWSSDK.S3" Version="3.7.414.5" />
-		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+		<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.2" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

From d68ba7f74d67d09fdcd1c4b114a0d727c44d005d Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Thu, 23 Apr 2026 14:45:37 -0700
Subject: [PATCH 2/2] RE1-T115 PR#340 fix

---
 Web/Resgrid.Web.Tts/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/Resgrid.Web.Tts/Dockerfile b/Web/Resgrid.Web.Tts/Dockerfile
index 292ba9ca..bcd41b3b 100644
--- a/Web/Resgrid.Web.Tts/Dockerfile
+++ b/Web/Resgrid.Web.Tts/Dockerfile
@@ -15,7 +15,7 @@ RUN dotnet restore "Web/Resgrid.Web.Tts/Resgrid.Web.Tts.csproj"
 
 COPY . .
 WORKDIR /src/Web/Resgrid.Web.Tts
-RUN dotnet publish "Resgrid.Web.Tts.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore
+RUN dotnet publish "Resgrid.Web.Tts.csproj" -c Release -o /app/publish /p:UseAppHost=false --no-restore -p:Version=${BUILD_VERSION}
 
 FROM base AS final
 RUN apt-get update \