Merge pull request #1014 from discord-csharp/repo-structure

Experimental new repository structure

Author: patrickklaeren

.gitignore

@@ -24,9 +24,6 @@ bld/
 
 # Visual Studio 2015 cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-wwwroot/
-!Modix.Web/wwwroot/
 dataprotection/
 
 # VS Code
@@ -255,11 +252,11 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
-Modix/file.txt
-Modix/log.txt
-Modix/logs
-Modix/config
-/Modix/Properties/launchSettings.json
+src/Modix/file.txt
+src/Modix/log.txt
+src/Modix/logs
+src/Modix/config
+src//Modix/Properties/launchSettings.json
 
 *.DotSettings
 **/developmentSettings\.json

Dockerfile

@@ -5,8 +5,8 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS dotnet-build-base
 WORKDIR /src
 COPY Modix.sln .
 COPY Directory.* .
-COPY **/*.csproj ./
-RUN for file in $(ls *.csproj); do mkdir -p ${file%.*}/ && mv $file ${file%.*}/; done
+COPY src/ ./src/
+COPY test/ ./test/
 RUN dotnet restore Modix.sln
 COPY . . 
 
@@ -17,7 +17,7 @@ FROM dotnet-build as dotnet-test
 RUN dotnet test -c Release --no-build --no-restore Modix.sln
 
 FROM dotnet-build AS publish
-RUN dotnet publish -maxcpucount:1 -c Release --no-build --no-restore -o /app  Modix/Modix.csproj
+RUN dotnet publish -maxcpucount:1 -c Release --no-build --no-restore -o /app  src/Modix/Modix.csproj
 
 FROM base AS final
 COPY --from=publish /app .

Modix.sln

@@ -2,13 +2,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31521.260
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Bot", "Modix.Bot\Modix.Bot.csproj", "{9BBC702D-F919-4482-BF6C-0FC8EA2740C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Bot", "src\Modix.Bot\Modix.Bot.csproj", "{9BBC702D-F919-4482-BF6C-0FC8EA2740C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Data", "Modix.Data\Modix.Data.csproj", "{7DE6DD27-4450-4FA5-8C93-40709FBD8870}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Data", "src\Modix.Data\Modix.Data.csproj", "{7DE6DD27-4450-4FA5-8C93-40709FBD8870}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Services", "Modix.Services\Modix.Services.csproj", "{2FC1AE5D-D71E-4DBF-839C-0A7761032064}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Services", "src\Modix.Services\Modix.Services.csproj", "{2FC1AE5D-D71E-4DBF-839C-0A7761032064}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Data.Test", "Modix.Data.Test\Modix.Data.Test.csproj", "{E8C7267F-5BC3-4A13-B5EF-60DC1B0E919F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Data.Test", "test\Modix.Data.Test\Modix.Data.Test.csproj", "{E8C7267F-5BC3-4A13-B5EF-60DC1B0E919F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7DE6DD27-4450-4FA5-8C93-40709FBD8870} = {7DE6DD27-4450-4FA5-8C93-40709FBD8870}
 	EndProjectSection
@@ -23,15 +23,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		readme.md = readme.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix", "Modix\Modix.csproj", "{C4BE4089-0983-464F-9D76-EE9BD2B708DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix", "src\Modix\Modix.csproj", "{C4BE4089-0983-464F-9D76-EE9BD2B708DD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Services.Test", "Modix.Services.Test\Modix.Services.Test.csproj", "{D9BFC7C7-10B2-4D61-99EA-79805074CCD7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Services.Test", "test\Modix.Services.Test\Modix.Services.Test.csproj", "{D9BFC7C7-10B2-4D61-99EA-79805074CCD7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Common", "Modix.Common\Modix.Common.csproj", "{575B80E6-56E5-4E9A-94EE-ADEB3A1A9FC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Common", "src\Modix.Common\Modix.Common.csproj", "{575B80E6-56E5-4E9A-94EE-ADEB3A1A9FC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Common.Test", "Modix.Common.Test\Modix.Common.Test.csproj", "{4F9BDC85-B8B2-4AC5-99BC-1F2F0CF80016}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Common.Test", "test\Modix.Common.Test\Modix.Common.Test.csproj", "{4F9BDC85-B8B2-4AC5-99BC-1F2F0CF80016}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Bot.Test", "Modix.Bot.Test\Modix.Bot.Test.csproj", "{E9D29AA9-1B7D-4A90-839A-2E8665A8714F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Bot.Test", "test\Modix.Bot.Test\Modix.Bot.Test.csproj", "{E9D29AA9-1B7D-4A90-839A-2E8665A8714F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wiki", "wiki", "{092916B2-32C6-4ED9-A4EA-DF31D2F91A8F}"
 	ProjectSection(SolutionItems) = preProject
@@ -56,11 +56,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wiki", "wiki", "{092916B2-3
 		wiki\_Sidebar.md = wiki\_Sidebar.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Analyzers", "Modix.Analyzers\Modix.Analyzers.csproj", "{6009AEDD-BE3B-40BF-B9C4-4C3796F58609}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Analyzers", "src\Modix.Analyzers\Modix.Analyzers.csproj", "{6009AEDD-BE3B-40BF-B9C4-4C3796F58609}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Analyzers.Test", "Modix.Analyzers.Test\Modix.Analyzers.Test.csproj", "{9A28A475-067B-4CBD-94BC-CA31C0D1555A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Analyzers.Test", "test\Modix.Analyzers.Test\Modix.Analyzers.Test.csproj", "{9A28A475-067B-4CBD-94BC-CA31C0D1555A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Web", "Modix.Web\Modix.Web.csproj", "{2280A9D0-358E-4668-8855-6832725C740A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modix.Web", "src\Modix.Web\Modix.Web.csproj", "{2280A9D0-358E-4668-8855-6832725C740A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E74ADFBD-55F3-4E28-885B-2270670294EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -222,6 +224,11 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{092916B2-32C6-4ED9-A4EA-DF31D2F91A8F} = {23DA774D-7AE9-48C1-A261-F27D15A07858}
+		{9A28A475-067B-4CBD-94BC-CA31C0D1555A} = {E74ADFBD-55F3-4E28-885B-2270670294EF}
+		{4F9BDC85-B8B2-4AC5-99BC-1F2F0CF80016} = {E74ADFBD-55F3-4E28-885B-2270670294EF}
+		{D9BFC7C7-10B2-4D61-99EA-79805074CCD7} = {E74ADFBD-55F3-4E28-885B-2270670294EF}
+		{E9D29AA9-1B7D-4A90-839A-2E8665A8714F} = {E74ADFBD-55F3-4E28-885B-2270670294EF}
+		{E8C7267F-5BC3-4A13-B5EF-60DC1B0E919F} = {E74ADFBD-55F3-4E28-885B-2270670294EF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {36BDDB86-FBAB-45BF-AA22-DD4509504772}