diff --git a/TodoApi.Tests/DbContextExtensions.cs b/Todo.Api.Tests/DbContextExtensions.cs similarity index 100% rename from TodoApi.Tests/DbContextExtensions.cs rename to Todo.Api.Tests/DbContextExtensions.cs diff --git a/TodoApi.Tests/GlobalUsings.cs b/Todo.Api.Tests/GlobalUsings.cs similarity index 100% rename from TodoApi.Tests/GlobalUsings.cs rename to Todo.Api.Tests/GlobalUsings.cs diff --git a/TodoApi.Tests/TodoApi.Tests.csproj b/Todo.Api.Tests/Todo.Api.Tests.csproj similarity index 91% rename from TodoApi.Tests/TodoApi.Tests.csproj rename to Todo.Api.Tests/Todo.Api.Tests.csproj index 1b726484..73836699 100644 --- a/TodoApi.Tests/TodoApi.Tests.csproj +++ b/Todo.Api.Tests/Todo.Api.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/TodoApi.Tests/TodoApiTests.cs b/Todo.Api.Tests/TodoApiTests.cs similarity index 100% rename from TodoApi.Tests/TodoApiTests.cs rename to Todo.Api.Tests/TodoApiTests.cs diff --git a/TodoApi.Tests/TodoApplication.cs b/Todo.Api.Tests/TodoApplication.cs similarity index 100% rename from TodoApi.Tests/TodoApplication.cs rename to Todo.Api.Tests/TodoApplication.cs diff --git a/TodoApi.Tests/TokenService.cs b/Todo.Api.Tests/TokenService.cs similarity index 100% rename from TodoApi.Tests/TokenService.cs rename to Todo.Api.Tests/TokenService.cs diff --git a/TodoApi.Tests/UserApiTests.cs b/Todo.Api.Tests/UserApiTests.cs similarity index 100% rename from TodoApi.Tests/UserApiTests.cs rename to Todo.Api.Tests/UserApiTests.cs diff --git a/TodoApi/Authorization/CheckCurrentUserAuthHandler.cs b/Todo.Api/Authorization/CheckCurrentUserAuthHandler.cs similarity index 100% rename from TodoApi/Authorization/CheckCurrentUserAuthHandler.cs rename to Todo.Api/Authorization/CheckCurrentUserAuthHandler.cs diff --git a/TodoApi/Authorization/CurrentUser.cs b/Todo.Api/Authorization/CurrentUser.cs similarity index 100% rename from TodoApi/Authorization/CurrentUser.cs rename to Todo.Api/Authorization/CurrentUser.cs diff --git a/TodoApi/Authorization/CurrentUserExtensions.cs b/Todo.Api/Authorization/CurrentUserExtensions.cs similarity index 100% rename from TodoApi/Authorization/CurrentUserExtensions.cs rename to Todo.Api/Authorization/CurrentUserExtensions.cs diff --git a/TodoApi/Extensions/RateLimitExtensions.cs b/Todo.Api/Extensions/RateLimitExtensions.cs similarity index 100% rename from TodoApi/Extensions/RateLimitExtensions.cs rename to Todo.Api/Extensions/RateLimitExtensions.cs diff --git a/TodoApi/Filters/ValidationFilter.cs b/Todo.Api/Filters/ValidationFilter.cs similarity index 100% rename from TodoApi/Filters/ValidationFilter.cs rename to Todo.Api/Filters/ValidationFilter.cs diff --git a/TodoApi/Migrations/20221123071234_Initial.Designer.cs b/Todo.Api/Migrations/20221123071234_Initial.Designer.cs similarity index 100% rename from TodoApi/Migrations/20221123071234_Initial.Designer.cs rename to Todo.Api/Migrations/20221123071234_Initial.Designer.cs diff --git a/TodoApi/Migrations/20221123071234_Initial.cs b/Todo.Api/Migrations/20221123071234_Initial.cs similarity index 100% rename from TodoApi/Migrations/20221123071234_Initial.cs rename to Todo.Api/Migrations/20221123071234_Initial.cs diff --git a/TodoApi/Migrations/20221123165051_RemoveIsAdmin.Designer.cs b/Todo.Api/Migrations/20221123165051_RemoveIsAdmin.Designer.cs similarity index 100% rename from TodoApi/Migrations/20221123165051_RemoveIsAdmin.Designer.cs rename to Todo.Api/Migrations/20221123165051_RemoveIsAdmin.Designer.cs diff --git a/TodoApi/Migrations/20221123165051_RemoveIsAdmin.cs b/Todo.Api/Migrations/20221123165051_RemoveIsAdmin.cs similarity index 100% rename from TodoApi/Migrations/20221123165051_RemoveIsAdmin.cs rename to Todo.Api/Migrations/20221123165051_RemoveIsAdmin.cs diff --git a/TodoApi/Migrations/20230714032431_ForeignKeyChange.Designer.cs b/Todo.Api/Migrations/20230714032431_ForeignKeyChange.Designer.cs similarity index 100% rename from TodoApi/Migrations/20230714032431_ForeignKeyChange.Designer.cs rename to Todo.Api/Migrations/20230714032431_ForeignKeyChange.Designer.cs diff --git a/TodoApi/Migrations/20230714032431_ForeignKeyChange.cs b/Todo.Api/Migrations/20230714032431_ForeignKeyChange.cs similarity index 100% rename from TodoApi/Migrations/20230714032431_ForeignKeyChange.cs rename to Todo.Api/Migrations/20230714032431_ForeignKeyChange.cs diff --git a/TodoApi/Migrations/TodoDbContextModelSnapshot.cs b/Todo.Api/Migrations/TodoDbContextModelSnapshot.cs similarity index 100% rename from TodoApi/Migrations/TodoDbContextModelSnapshot.cs rename to Todo.Api/Migrations/TodoDbContextModelSnapshot.cs diff --git a/TodoApi/Program.cs b/Todo.Api/Program.cs similarity index 100% rename from TodoApi/Program.cs rename to Todo.Api/Program.cs diff --git a/TodoApi/Properties/launchSettings.json b/Todo.Api/Properties/launchSettings.json similarity index 100% rename from TodoApi/Properties/launchSettings.json rename to Todo.Api/Properties/launchSettings.json diff --git a/TodoApi/TodoApi.csproj b/Todo.Api/Todo.Api.csproj similarity index 94% rename from TodoApi/TodoApi.csproj rename to Todo.Api/Todo.Api.csproj index 1fe21510..9e77805c 100644 --- a/TodoApi/TodoApi.csproj +++ b/Todo.Api/Todo.Api.csproj @@ -18,7 +18,7 @@ - + diff --git a/TodoApi/TodoDbContext.cs b/Todo.Api/TodoDbContext.cs similarity index 100% rename from TodoApi/TodoDbContext.cs rename to Todo.Api/TodoDbContext.cs diff --git a/TodoApi/Todos/Todo.cs b/Todo.Api/Todos/Todo.cs similarity index 100% rename from TodoApi/Todos/Todo.cs rename to Todo.Api/Todos/Todo.cs diff --git a/TodoApi/Todos/TodoApi.cs b/Todo.Api/Todos/TodoApi.cs similarity index 100% rename from TodoApi/Todos/TodoApi.cs rename to Todo.Api/Todos/TodoApi.cs diff --git a/TodoApi/Users/TodoUser.cs b/Todo.Api/Users/TodoUser.cs similarity index 100% rename from TodoApi/Users/TodoUser.cs rename to Todo.Api/Users/TodoUser.cs diff --git a/TodoApi/Users/UsersApi.cs b/Todo.Api/Users/UsersApi.cs similarity index 100% rename from TodoApi/Users/UsersApi.cs rename to Todo.Api/Users/UsersApi.cs diff --git a/TodoApi/appsettings.Development.json b/Todo.Api/appsettings.Development.json similarity index 100% rename from TodoApi/appsettings.Development.json rename to Todo.Api/appsettings.Development.json diff --git a/TodoApi/appsettings.json b/Todo.Api/appsettings.json similarity index 100% rename from TodoApi/appsettings.json rename to Todo.Api/appsettings.json diff --git a/TodoApi.AppHost/Extensions.cs b/TodoApi.AppHost/Extensions.cs index bb8b0225..7c2d3151 100644 --- 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("todo-db-migration"); + migrateOperation = builder.AddEfMigration("todo-db-migration"); } } diff --git a/TodoApi.AppHost/Program.cs b/TodoApi.AppHost/Program.cs index 105e97fe..1a6f9798 100644 --- a/TodoApi.AppHost/Program.cs +++ b/TodoApi.AppHost/Program.cs @@ -2,7 +2,7 @@ var migrateOperation = builder.AddTodoDbMigration(); -var todoapi = builder.AddProject("todoapi"); +var todoapi = builder.AddProject("todoapi"); builder.AddProject("todo-web-server") .WithReference(todoapi); diff --git a/TodoApi.AppHost/TodoApi.AppHost.csproj b/TodoApi.AppHost/TodoApi.AppHost.csproj index f8715d5f..40d7980a 100644 --- a/TodoApi.AppHost/TodoApi.AppHost.csproj +++ b/TodoApi.AppHost/TodoApi.AppHost.csproj @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/TodoApi.sln b/TodoApi.sln index ac1a978b..c7c19c91 100644 --- 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