diff --git a/src/Aspire.Cli/Aspire.Cli.csproj b/src/Aspire.Cli/Aspire.Cli.csproj
index b29804475cb..af8505c9909 100644
--- a/src/Aspire.Cli/Aspire.Cli.csproj
+++ b/src/Aspire.Cli/Aspire.Cli.csproj
@@ -129,6 +129,7 @@
     <Compile Include="$(SharedDir)UserSecrets\UserSecretsPathHelper.cs" Link="Utils\UserSecretsPathHelper.cs" />
     <Compile Include="$(SharedDir)UserSecrets\IsolatedUserSecretsHelper.cs" Link="Utils\IsolatedUserSecretsHelper.cs" />
     <Compile Include="$(SharedDir)UserSecrets\SecretsStore.cs" Link="Secrets\SecretsStore.cs" />
+    <Compile Include="$(SharedDir)Json\AtsJsonCodeWriter.cs" Link="Utils\AtsJsonCodeWriter.cs" />
     <Compile Include="$(SharedDir)Json\JsonFlattener.cs" Link="Utils\JsonFlattener.cs" />
     <Compile Include="$(SharedDir)Otlp\OtlpHelpers.cs" Link="Otlp\OtlpHelpers.cs" />
     <Compile Include="$(SharedDir)Otlp\IOtlpResource.cs" Link="Otlp\IOtlpResource.cs" />
diff --git a/src/Aspire.Cli/Commands/Sdk/SdkDumpCommand.cs b/src/Aspire.Cli/Commands/Sdk/SdkDumpCommand.cs
index 046b9ac7826..fa2a03a1d95 100644
--- a/src/Aspire.Cli/Commands/Sdk/SdkDumpCommand.cs
+++ b/src/Aspire.Cli/Commands/Sdk/SdkDumpCommand.cs
@@ -12,7 +12,7 @@
 using Aspire.Cli.Projects;
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
-using Aspire.TypeSystem;
+using Aspire.Shared.Json;
 using Microsoft.Extensions.Logging;
 using Semver;
 using Spectre.Console;
diff --git a/src/Aspire.Hosting.CodeGeneration.Go/Aspire.Hosting.CodeGeneration.Go.csproj b/src/Aspire.Hosting.CodeGeneration.Go/Aspire.Hosting.CodeGeneration.Go.csproj
index 60de1b90c30..e1da58f4f92 100644
--- a/src/Aspire.Hosting.CodeGeneration.Go/Aspire.Hosting.CodeGeneration.Go.csproj
+++ b/src/Aspire.Hosting.CodeGeneration.Go/Aspire.Hosting.CodeGeneration.Go.csproj
@@ -22,6 +22,10 @@
     <EmbeddedResource Include="Resources\base.go" LogicalName="Aspire.Hosting.CodeGeneration.Go.Resources.base.go" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedDir)Json\AtsJsonCodeWriter.cs" Link="AtsJsonCodeWriter.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Aspire.TypeSystem\Aspire.TypeSystem.csproj" />
   </ItemGroup>
diff --git a/src/Aspire.Hosting.CodeGeneration.Go/AtsGoCodeGenerator.cs b/src/Aspire.Hosting.CodeGeneration.Go/AtsGoCodeGenerator.cs
index ad87f3e9bfd..87fcf22c11b 100644
--- a/src/Aspire.Hosting.CodeGeneration.Go/AtsGoCodeGenerator.cs
+++ b/src/Aspire.Hosting.CodeGeneration.Go/AtsGoCodeGenerator.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json.Nodes;
+using Aspire.Shared.Json;
 using Aspire.TypeSystem;
 
 namespace Aspire.Hosting.CodeGeneration.Go;
diff --git a/src/Aspire.Hosting.CodeGeneration.Java/Aspire.Hosting.CodeGeneration.Java.csproj b/src/Aspire.Hosting.CodeGeneration.Java/Aspire.Hosting.CodeGeneration.Java.csproj
index 5cd68fb2d2d..e9a23debab4 100644
--- a/src/Aspire.Hosting.CodeGeneration.Java/Aspire.Hosting.CodeGeneration.Java.csproj
+++ b/src/Aspire.Hosting.CodeGeneration.Java/Aspire.Hosting.CodeGeneration.Java.csproj
@@ -22,6 +22,10 @@
     <EmbeddedResource Include="Resources\Base.java" LogicalName="Aspire.Hosting.CodeGeneration.Java.Resources.Base.java" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedDir)Json\AtsJsonCodeWriter.cs" Link="AtsJsonCodeWriter.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Aspire.TypeSystem\Aspire.TypeSystem.csproj" />
   </ItemGroup>
diff --git a/src/Aspire.Hosting.CodeGeneration.Java/AtsJavaCodeGenerator.cs b/src/Aspire.Hosting.CodeGeneration.Java/AtsJavaCodeGenerator.cs
index 16def94d8d4..bd43de930b5 100644
--- a/src/Aspire.Hosting.CodeGeneration.Java/AtsJavaCodeGenerator.cs
+++ b/src/Aspire.Hosting.CodeGeneration.Java/AtsJavaCodeGenerator.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json.Nodes;
+using Aspire.Shared.Json;
 using Aspire.TypeSystem;
 
 namespace Aspire.Hosting.CodeGeneration.Java;
diff --git a/src/Aspire.Hosting.CodeGeneration.Python/Aspire.Hosting.CodeGeneration.Python.csproj b/src/Aspire.Hosting.CodeGeneration.Python/Aspire.Hosting.CodeGeneration.Python.csproj
index 07e73e4ce32..39630610d20 100644
--- a/src/Aspire.Hosting.CodeGeneration.Python/Aspire.Hosting.CodeGeneration.Python.csproj
+++ b/src/Aspire.Hosting.CodeGeneration.Python/Aspire.Hosting.CodeGeneration.Python.csproj
@@ -22,6 +22,10 @@
     <EmbeddedResource Include="Resources\microvenv.py" LogicalName="Aspire.Hosting.CodeGeneration.Python.Resources.microvenv.py" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedDir)Json\AtsJsonCodeWriter.cs" Link="AtsJsonCodeWriter.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Aspire.TypeSystem\Aspire.TypeSystem.csproj" />
   </ItemGroup>
diff --git a/src/Aspire.Hosting.CodeGeneration.Python/AtsPythonCodeGenerator.cs b/src/Aspire.Hosting.CodeGeneration.Python/AtsPythonCodeGenerator.cs
index a1c8041ed5a..21d42a2b60b 100644
--- a/src/Aspire.Hosting.CodeGeneration.Python/AtsPythonCodeGenerator.cs
+++ b/src/Aspire.Hosting.CodeGeneration.Python/AtsPythonCodeGenerator.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json.Nodes;
+using Aspire.Shared.Json;
 using Aspire.TypeSystem;
 
 namespace Aspire.Hosting.CodeGeneration.Python;
diff --git a/src/Aspire.Hosting.CodeGeneration.Rust/Aspire.Hosting.CodeGeneration.Rust.csproj b/src/Aspire.Hosting.CodeGeneration.Rust/Aspire.Hosting.CodeGeneration.Rust.csproj
index facfe2087d8..57f8a2930a4 100644
--- a/src/Aspire.Hosting.CodeGeneration.Rust/Aspire.Hosting.CodeGeneration.Rust.csproj
+++ b/src/Aspire.Hosting.CodeGeneration.Rust/Aspire.Hosting.CodeGeneration.Rust.csproj
@@ -22,6 +22,10 @@
     <EmbeddedResource Include="Resources\base.rs" LogicalName="Aspire.Hosting.CodeGeneration.Rust.Resources.base.rs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(SharedDir)Json\AtsJsonCodeWriter.cs" Link="AtsJsonCodeWriter.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Aspire.TypeSystem\Aspire.TypeSystem.csproj" />
   </ItemGroup>
diff --git a/src/Aspire.Hosting.CodeGeneration.Rust/AtsRustCodeGenerator.cs b/src/Aspire.Hosting.CodeGeneration.Rust/AtsRustCodeGenerator.cs
index fc772585a7e..6697adc16f4 100644
--- a/src/Aspire.Hosting.CodeGeneration.Rust/AtsRustCodeGenerator.cs
+++ b/src/Aspire.Hosting.CodeGeneration.Rust/AtsRustCodeGenerator.cs
@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text;
 using System.Text.Json;
+using Aspire.Shared.Json;
 using Aspire.TypeSystem;
 
 namespace Aspire.Hosting.CodeGeneration.Rust;
diff --git a/src/Aspire.Hosting.CodeGeneration.TypeScript/Aspire.Hosting.CodeGeneration.TypeScript.csproj b/src/Aspire.Hosting.CodeGeneration.TypeScript/Aspire.Hosting.CodeGeneration.TypeScript.csproj
index 68bd97d52c9..1fe9c780c18 100644
--- a/src/Aspire.Hosting.CodeGeneration.TypeScript/Aspire.Hosting.CodeGeneration.TypeScript.csproj
+++ b/src/Aspire.Hosting.CodeGeneration.TypeScript/Aspire.Hosting.CodeGeneration.TypeScript.csproj
@@ -25,6 +25,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)AppHostProfilePortGenerator.cs" Link="AppHostProfilePortGenerator.cs" />
+    <Compile Include="$(SharedDir)Json\AtsJsonCodeWriter.cs" Link="AtsJsonCodeWriter.cs" />
     <Compile Include="$(SharedDir)NpmVersionHelper.cs" Link="NpmVersionHelper.cs" />
   </ItemGroup>
 
diff --git a/src/Aspire.Hosting.CodeGeneration.TypeScript/AtsTypeScriptCodeGenerator.cs b/src/Aspire.Hosting.CodeGeneration.TypeScript/AtsTypeScriptCodeGenerator.cs
index d8f4f666a68..1de3845530e 100644
--- a/src/Aspire.Hosting.CodeGeneration.TypeScript/AtsTypeScriptCodeGenerator.cs
+++ b/src/Aspire.Hosting.CodeGeneration.TypeScript/AtsTypeScriptCodeGenerator.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.Reflection;
 using System.Text.Json.Nodes;
+using Aspire.Shared.Json;
 using Aspire.TypeSystem;
 
 namespace Aspire.Hosting.CodeGeneration.TypeScript;
diff --git a/src/Aspire.TypeSystem/AtsJsonCodeWriter.cs b/src/Shared/Json/AtsJsonCodeWriter.cs
similarity index 81%
rename from src/Aspire.TypeSystem/AtsJsonCodeWriter.cs
rename to src/Shared/Json/AtsJsonCodeWriter.cs
index beddb0fd135..b88708fe780 100644
--- a/src/Aspire.TypeSystem/AtsJsonCodeWriter.cs
+++ b/src/Shared/Json/AtsJsonCodeWriter.cs
@@ -5,12 +5,12 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 
-namespace Aspire.TypeSystem;
+namespace Aspire.Shared.Json;
 
 /// <summary>
 /// Provides JSON literal formatting helpers for generated ATS source code.
 /// </summary>
-public static class AtsJsonCodeWriter
+internal static class AtsJsonCodeWriter
 {
     private static readonly JsonSerializerOptions s_relaxedJsonOptions = new()
     {
@@ -20,7 +20,7 @@ public static class AtsJsonCodeWriter
     /// <summary>
     /// Formats a JSON node using relaxed escaping so non-ASCII content remains readable in generated source.
     /// </summary>
-    public static string ToRelaxedJsonString(this JsonNode value)
+    internal static string ToRelaxedJsonString(this JsonNode value)
     {
         return value.ToJsonString(s_relaxedJsonOptions);
     }
@@ -28,7 +28,7 @@ public static string ToRelaxedJsonString(this JsonNode value)
     /// <summary>
     /// Formats a string literal as JSON using relaxed escaping.
     /// </summary>
-    public static string ToRelaxedJsonString(string value)
+    internal static string ToRelaxedJsonString(string value)
     {
         return JsonValue.Create(value)!.ToJsonString(s_relaxedJsonOptions);
     }