Move files around

davidfowl · Nov 23, 2024 · bbd680d · bbd680d
1 parent 625f34f
commit bbd680d
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 9 deletions.
diff --git a/TodoApi.Tests/DbContextExtensions.cs → Todo.Api.Tests/DbContextExtensions.cs b/TodoApi.Tests/DbContextExtensions.cs → Todo.Api.Tests/DbContextExtensions.cs
diff --git a/TodoApi.Tests/GlobalUsings.cs → Todo.Api.Tests/GlobalUsings.cs b/TodoApi.Tests/GlobalUsings.cs → Todo.Api.Tests/GlobalUsings.cs
diff --git a/TodoApi.Tests/TodoApi.Tests.csproj → Todo.Api.Tests/Todo.Api.Tests.csproj b/TodoApi.Tests/TodoApi.Tests.csproj → Todo.Api.Tests/Todo.Api.Tests.csproj
@@ -6,7 +6,7 @@
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
     <PackageReference Include="coverlet.collector" PrivateAssets="all" />
-    <ProjectReference Include="..\TodoApi\TodoApi.csproj" />
+    <ProjectReference Include="..\Todo.Api\Todo.Api.csproj" />
   </ItemGroup>
 
     <ItemGroup>

diff --git a/TodoApi.Tests/TodoApiTests.cs → Todo.Api.Tests/TodoApiTests.cs b/TodoApi.Tests/TodoApiTests.cs → Todo.Api.Tests/TodoApiTests.cs
diff --git a/TodoApi.Tests/TodoApplication.cs → Todo.Api.Tests/TodoApplication.cs b/TodoApi.Tests/TodoApplication.cs → Todo.Api.Tests/TodoApplication.cs
diff --git a/TodoApi.Tests/TokenService.cs → Todo.Api.Tests/TokenService.cs b/TodoApi.Tests/TokenService.cs → Todo.Api.Tests/TokenService.cs
diff --git a/TodoApi.Tests/UserApiTests.cs → Todo.Api.Tests/UserApiTests.cs b/TodoApi.Tests/UserApiTests.cs → Todo.Api.Tests/UserApiTests.cs
diff --git a/...horization/CheckCurrentUserAuthHandler.cs → ...horization/CheckCurrentUserAuthHandler.cs b/...horization/CheckCurrentUserAuthHandler.cs → ...horization/CheckCurrentUserAuthHandler.cs
diff --git a/TodoApi/Authorization/CurrentUser.cs → Todo.Api/Authorization/CurrentUser.cs b/TodoApi/Authorization/CurrentUser.cs → Todo.Api/Authorization/CurrentUser.cs
diff --git a/...pi/Authorization/CurrentUserExtensions.cs → ...pi/Authorization/CurrentUserExtensions.cs b/...pi/Authorization/CurrentUserExtensions.cs → ...pi/Authorization/CurrentUserExtensions.cs
diff --git a/TodoApi/Extensions/RateLimitExtensions.cs → Todo.Api/Extensions/RateLimitExtensions.cs b/TodoApi/Extensions/RateLimitExtensions.cs → Todo.Api/Extensions/RateLimitExtensions.cs
diff --git a/TodoApi/Filters/ValidationFilter.cs → Todo.Api/Filters/ValidationFilter.cs b/TodoApi/Filters/ValidationFilter.cs → Todo.Api/Filters/ValidationFilter.cs
diff --git a/...ations/20221123071234_Initial.Designer.cs → ...ations/20221123071234_Initial.Designer.cs b/...ations/20221123071234_Initial.Designer.cs → ...ations/20221123071234_Initial.Designer.cs
diff --git a/TodoApi/Migrations/20221123071234_Initial.cs → ....Api/Migrations/20221123071234_Initial.cs b/TodoApi/Migrations/20221123071234_Initial.cs → ....Api/Migrations/20221123071234_Initial.cs
diff --git a/.../20221123165051_RemoveIsAdmin.Designer.cs → .../20221123165051_RemoveIsAdmin.Designer.cs b/.../20221123165051_RemoveIsAdmin.Designer.cs → .../20221123165051_RemoveIsAdmin.Designer.cs
diff --git a/...igrations/20221123165051_RemoveIsAdmin.cs → ...igrations/20221123165051_RemoveIsAdmin.cs b/...igrations/20221123165051_RemoveIsAdmin.cs → ...igrations/20221123165051_RemoveIsAdmin.cs
diff --git a/...230714032431_ForeignKeyChange.Designer.cs → ...230714032431_ForeignKeyChange.Designer.cs b/...230714032431_ForeignKeyChange.Designer.cs → ...230714032431_ForeignKeyChange.Designer.cs
diff --git a/...ations/20230714032431_ForeignKeyChange.cs → ...ations/20230714032431_ForeignKeyChange.cs b/...ations/20230714032431_ForeignKeyChange.cs → ...ations/20230714032431_ForeignKeyChange.cs
diff --git a/.../Migrations/TodoDbContextModelSnapshot.cs → .../Migrations/TodoDbContextModelSnapshot.cs b/.../Migrations/TodoDbContextModelSnapshot.cs → .../Migrations/TodoDbContextModelSnapshot.cs
diff --git a/TodoApi/Program.cs → Todo.Api/Program.cs b/TodoApi/Program.cs → Todo.Api/Program.cs
diff --git a/TodoApi/Properties/launchSettings.json → Todo.Api/Properties/launchSettings.json b/TodoApi/Properties/launchSettings.json → Todo.Api/Properties/launchSettings.json
diff --git a/TodoApi/TodoApi.csproj → Todo.Api/Todo.Api.csproj b/TodoApi/TodoApi.csproj → Todo.Api/Todo.Api.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <Using Include="TodoApi" />
-    <InternalsVisibleTo Include="TodoApi.Tests" />
+    <InternalsVisibleTo Include="Todo.Api.Tests" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TodoApi/TodoDbContext.cs → Todo.Api/TodoDbContext.cs b/TodoApi/TodoDbContext.cs → Todo.Api/TodoDbContext.cs
diff --git a/TodoApi/Todos/Todo.cs → Todo.Api/Todos/Todo.cs b/TodoApi/Todos/Todo.cs → Todo.Api/Todos/Todo.cs
diff --git a/TodoApi/Todos/TodoApi.cs → Todo.Api/Todos/TodoApi.cs b/TodoApi/Todos/TodoApi.cs → Todo.Api/Todos/TodoApi.cs
diff --git a/TodoApi/Users/TodoUser.cs → Todo.Api/Users/TodoUser.cs b/TodoApi/Users/TodoUser.cs → Todo.Api/Users/TodoUser.cs
diff --git a/TodoApi/Users/UsersApi.cs → Todo.Api/Users/UsersApi.cs b/TodoApi/Users/UsersApi.cs → Todo.Api/Users/UsersApi.cs
diff --git a/TodoApi/appsettings.Development.json → Todo.Api/appsettings.Development.json b/TodoApi/appsettings.Development.json → Todo.Api/appsettings.Development.json
diff --git a/TodoApi/appsettings.json → Todo.Api/appsettings.json b/TodoApi/appsettings.json → Todo.Api/appsettings.json
diff --git a/TodoApi.AppHost/Extensions.cs b/TodoApi.AppHost/Extensions.cs
@@ -6,14 +6,14 @@
 
         if (builder.ExecutionContext.IsRunMode)
         {
-            var projectDirectory = Path.GetDirectoryName(new Projects.TodoApi().ProjectPath)!;
+            var projectDirectory = Path.GetDirectoryName(new Projects.Todo_Api().ProjectPath)!;
             var dbDirectory = Path.Combine(projectDirectory, ".db");
 
             if (!Directory.Exists(dbDirectory))
             {
                 Directory.CreateDirectory(dbDirectory);
 
-                migrateOperation = builder.AddEfMigration<Projects.TodoApi>("todo-db-migration");
+                migrateOperation = builder.AddEfMigration<Projects.Todo_Api>("todo-db-migration");
             }
         }
 

diff --git a/TodoApi.AppHost/Program.cs b/TodoApi.AppHost/Program.cs
@@ -2,7 +2,7 @@
 
 var migrateOperation = builder.AddTodoDbMigration();
 
-var todoapi = builder.AddProject<Projects.TodoApi>("todoapi");
+var todoapi = builder.AddProject<Projects.Todo_Api>("todoapi");
 
 builder.AddProject<Projects.Todo_Web_Server>("todo-web-server")
        .WithReference(todoapi);

diff --git a/TodoApi.AppHost/TodoApi.AppHost.csproj b/TodoApi.AppHost/TodoApi.AppHost.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
 
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Todo.Web\Server\Todo.Web.Server.csproj" />
-    <ProjectReference Include="..\TodoApi\TodoApi.csproj" />
+    <ProjectReference Include="..\Todo.Api\Todo.Api.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/TodoApi.sln b/TodoApi.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31717.71
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApi", "TodoApi\TodoApi.csproj", "{8B1F6F88-C84A-4D2F-A648-EDDCA6BD7943}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Todo.Api", "Todo.Api\Todo.Api.csproj", "{8B1F6F88-C84A-4D2F-A648-EDDCA6BD7943}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TodoApi.Tests", "TodoApi.Tests\TodoApi.Tests.csproj", "{0A9F94AE-38A9-426D-A643-1F5582544318}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Todo.Api.Tests", "Todo.Api.Tests\Todo.Api.Tests.csproj", "{0A9F94AE-38A9-426D-A643-1F5582544318}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7FAB2FEF-77C3-4519-AA2E-0CCCDFE1FC13}"
 	ProjectSection(SolutionItems) = preProject
@@ -26,6 +26,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApi.AppHost", "TodoApi.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoApi.ServiceDefaults", "TodoApi.ServiceDefaults\TodoApi.ServiceDefaults.csproj", "{67B571B3-F4FB-46AA-888E-17A5A773610C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C99C740-7E6A-4FFD-B21F-E807C980C205}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -64,6 +68,15 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{8B1F6F88-C84A-4D2F-A648-EDDCA6BD7943} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{0A9F94AE-38A9-426D-A643-1F5582544318} = {5C99C740-7E6A-4FFD-B21F-E807C980C205}
+		{9459B25A-3A37-43C4-A7DE-6113C1E2CDD7} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{699CCBA9-9DE8-48C3-9D2F-226E349C9253} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{272942F6-94E8-4D6B-8AD8-C4CCA305836D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{4ECB456A-BC4A-4F99-A1D5-FE2DF1C4EA1D} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{67B571B3-F4FB-46AA-888E-17A5A773610C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28EAB679-0C71-494A-A1EC-D29DEDDD402E}
 	EndGlobalSection