From 5438a652f9058b8de5891ecbe80d492798293f62 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 12 Jun 2025 11:26:01 +0800
Subject: [PATCH 1/2] Move gRPC projects into folders

---
 AspNetCore.slnx | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/AspNetCore.slnx b/AspNetCore.slnx
index 63083e4fceb9..bebb248385aa 100644
--- a/AspNetCore.slnx
+++ b/AspNetCore.slnx
@@ -10,14 +10,6 @@
     <Project Path="eng/tools/BaselineGenerator/BaselineGenerator.csproj" />
     <Project Path="eng/tools/RepoTasks/RepoTasks.csproj" />
   </Folder>
-  <Folder Name="/Interop/" />
-  <Folder Name="/Interop/test/">
-    <Project Path="src/Grpc/Interop/test/InteropTests/InteropTests.csproj" />
-  </Folder>
-  <Folder Name="/Interop/test/testassets/">
-    <Project Path="src/Grpc/Interop/test/testassets/InteropClient/InteropClient.csproj" />
-    <Project Path="src/Grpc/Interop/test/testassets/InteropWebsite/InteropWebsite.csproj" />
-  </Folder>
   <Folder Name="/src/" />
   <Folder Name="/src/Analyzers/" />
   <Folder Name="/src/Analyzers/Analyzers/">
@@ -244,6 +236,23 @@
       <Build Solution="*|arm64" Project="false" />
     </Project>
   </Folder>
+  <Folder Name="/src/Grpc/">
+    <Project Path="src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/Interop/" />
+  <Folder Name="/src/Grpc/Interop/test/">
+    <Project Path="src/Grpc/Interop/test/InteropTests/InteropTests.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/Interop/test/testassets/">
+    <Project Path="src/Grpc/Interop/test/testassets/InteropClient/InteropClient.csproj" />
+    <Project Path="src/Grpc/Interop/test/testassets/InteropWebsite/InteropWebsite.csproj" />
+  </Folder>
   <Folder Name="/src/HealthChecks/" />
   <Folder Name="/src/HealthChecks/src/">
     <Project Path="src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
@@ -1211,13 +1220,6 @@
   <Project Path="src/DataProtection/samples/KeyManagementSimulator/KeyManagementSimulator.csproj" />
   <Project Path="src/Framework/AspNetCoreAnalyzers/samples/WebAppSample/WebAppSample.csproj" />
   <Project Path="src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj" />
   <Project Path="src/Grpc/JsonTranscoding/test/testassets/Sandbox/Sandbox.csproj" />
   <Project Path="src/Html.Abstractions/test/Microsoft.AspNetCore.Html.Abstractions.Tests.csproj" />
   <Project Path="src/Http/Http.Results/tools/ResultsOfTGenerator/ResultsOfTGenerator.csproj" />

From 73e3d1289f9d397c599f324735a3651cd53b321a Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Thu, 12 Jun 2025 11:36:52 +0800
Subject: [PATCH 2/2] More

---
 AspNetCore.slnx | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/AspNetCore.slnx b/AspNetCore.slnx
index bebb248385aa..b73adbbb4b85 100644
--- a/AspNetCore.slnx
+++ b/AspNetCore.slnx
@@ -236,15 +236,7 @@
       <Build Solution="*|arm64" Project="false" />
     </Project>
   </Folder>
-  <Folder Name="/src/Grpc/">
-    <Project Path="src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj" />
-    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
-    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj" />
-    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.csproj" />
-    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.csproj" />
-    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj" />
-    <Project Path="src/Grpc/JsonTranscoding/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj" />
-  </Folder>
+  <Folder Name="/src/Grpc/" />
   <Folder Name="/src/Grpc/Interop/" />
   <Folder Name="/src/Grpc/Interop/test/">
     <Project Path="src/Grpc/Interop/test/InteropTests/InteropTests.csproj" />
@@ -253,6 +245,23 @@
     <Project Path="src/Grpc/Interop/test/testassets/InteropClient/InteropClient.csproj" />
     <Project Path="src/Grpc/Interop/test/testassets/InteropWebsite/InteropWebsite.csproj" />
   </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/" />
+  <Folder Name="/src/Grpc/JsonTranscoding/perf/">
+    <Project Path="src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/src/">
+    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/test/">
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/Microsoft.AspNetCore.Grpc.Swagger.Tests.csproj" />
+  </Folder>
+  <Folder Name="/src/Grpc/JsonTranscoding/test/testassets/">
+    <Project Path="src/Grpc/JsonTranscoding/test/testassets/IntegrationTestsWebsite/IntegrationTestsWebsite.csproj" />
+    <Project Path="src/Grpc/JsonTranscoding/test/testassets/Sandbox/Sandbox.csproj" />
+  </Folder>
   <Folder Name="/src/HealthChecks/" />
   <Folder Name="/src/HealthChecks/src/">
     <Project Path="src/HealthChecks/HealthChecks/src/Microsoft.Extensions.Diagnostics.HealthChecks.csproj" />
@@ -1220,7 +1229,6 @@
   <Project Path="src/DataProtection/samples/KeyManagementSimulator/KeyManagementSimulator.csproj" />
   <Project Path="src/Framework/AspNetCoreAnalyzers/samples/WebAppSample/WebAppSample.csproj" />
   <Project Path="src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/Microsoft.AspNetCore.App.SourceGenerators.csproj" />
-  <Project Path="src/Grpc/JsonTranscoding/test/testassets/Sandbox/Sandbox.csproj" />
   <Project Path="src/Html.Abstractions/test/Microsoft.AspNetCore.Html.Abstractions.Tests.csproj" />
   <Project Path="src/Http/Http.Results/tools/ResultsOfTGenerator/ResultsOfTGenerator.csproj" />
   <Project Path="src/Identity/samples/IdentitySample.ApiEndpoints/IdentitySample.ApiEndpoints.csproj" />