[REFACTOR] directory hierarchy now matches package structure.

Author: Gonzalo Diaz

Dockerfile

@@ -15,9 +15,9 @@ WORKDIR ${WORKDIR}
 
 COPY ./Makefile ${WORKDIR}/
 COPY ./algorithm_exercises_csharp.sln ${WORKDIR}/algorithm_exercises_csharp.sln
-COPY ./algorithm_exercises_csharp/algorithm_exercises_csharp.csproj ${WORKDIR}/algorithm_exercises_csharp/algorithm_exercises_csharp.csproj
-COPY ./algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj ${WORKDIR}/algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj
-COPY ./algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj ${WORKDIR}/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj
+COPY ./src/algorithm_exercises_csharp/algorithm_exercises_csharp.csproj ${WORKDIR}/src/algorithm_exercises_csharp/algorithm_exercises_csharp.csproj
+COPY ./src/algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj ${WORKDIR}/src/algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj
+COPY ./src/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj ${WORKDIR}/src/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj
 
 RUN make dependencies
 
@@ -46,9 +46,9 @@ COPY ./CODE_OF_CONDUCT.md ${WORKDIR}/
 
 # Code source
 COPY ./algorithm_exercises_csharp.sln ${WORKDIR}/algorithm_exercises_csharp.sln
-COPY ./algorithm_exercises_csharp ${WORKDIR}/algorithm_exercises_csharp
-COPY ./algorithm_exercises_csharp_base ${WORKDIR}/algorithm_exercises_csharp_base
-COPY ./algorithm_exercises_csharp_test ${WORKDIR}/algorithm_exercises_csharp_test
+COPY ./src/algorithm_exercises_csharp ${WORKDIR}/src/algorithm_exercises_csharp
+COPY ./src/algorithm_exercises_csharp_base ${WORKDIR}/src/algorithm_exercises_csharp_base
+COPY ./src/algorithm_exercises_csharp_test ${WORKDIR}/src/algorithm_exercises_csharp_test
 
 # code linting conf
 COPY ./.editorconfig ${WORKDIR}/
@@ -66,9 +66,9 @@ CMD ["make", "lint"]
 FROM base AS development
 
 COPY ./algorithm_exercises_csharp.sln ${WORKDIR}/algorithm_exercises_csharp.sln
-COPY ./algorithm_exercises_csharp ${WORKDIR}/algorithm_exercises_csharp
-COPY ./algorithm_exercises_csharp_base ${WORKDIR}/algorithm_exercises_csharp_base
-COPY ./algorithm_exercises_csharp_test ${WORKDIR}/algorithm_exercises_csharp_test
+COPY ./src/algorithm_exercises_csharp ${WORKDIR}/src/algorithm_exercises_csharp
+COPY ./src/algorithm_exercises_csharp_base ${WORKDIR}/src/algorithm_exercises_csharp_base
+COPY ./src/algorithm_exercises_csharp_test ${WORKDIR}/src/algorithm_exercises_csharp_test
 
 RUN  make build \
   && ls -alh
@@ -119,8 +119,8 @@ RUN  adduser -D worker \
   && chown worker:worker /app
 
 COPY ./Makefile ${WORKDIR}/
-COPY --from=builder /app/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.dll ${WORKDIR}/
-COPY --from=builder /app/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.runtimeconfig.json ${WORKDIR}/
+COPY --from=builder /app/src/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.dll ${WORKDIR}/
+COPY --from=builder /app/src/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.runtimeconfig.json ${WORKDIR}/
 
 RUN ls -alh
 

Makefile

@@ -33,10 +33,6 @@ RUNTIME_TOOL=dotnet
 PACKAGE_TOOL=dotnet
 VERBOSITY_LEVEL=normal
 
-MAIN_PROJECT_DIRECTORY=algorithm_exercises_csharp
-BASE_PROJECT_DIRECTORY=algorithm_exercises_csharp_base
-TEST_PROJECT_DIRECTORY=algorithm_exercises_csharp_test
-
 help: list
 	@echo ""
 	@echo "Note: create and activate the environment in your local shell type (example):"
@@ -114,18 +110,11 @@ clean:
 
 	rm -vfr .mono/ || true
 	rm -vfr coverage-report/ || true
-	find ${MAIN_PROJECT_DIRECTORY} -path "*/TestResults/*" -type d -print -exec rm -vfr {} ';' || true
-	find ${MAIN_PROJECT_DIRECTORY} -path "*/bin/*" -print -exec rm -vfr {} ';' || true
-	find ${MAIN_PROJECT_DIRECTORY} -path "*/obj/*" -print -exec rm -vfr {} ';' || true
-
-	find ${BASE_PROJECT_DIRECTORY} -path "*/TestResults/*" -type d -print -exec rm -vfr {} ';' || true
-	find ${BASE_PROJECT_DIRECTORY} -path "*/bin/*" -print -exec rm -vfr {} ';' || true
-	find ${BASE_PROJECT_DIRECTORY} -path "*/obj/*" -print -exec rm -vfr {} ';' || true
-
-	find ${TEST_PROJECT_DIRECTORY} -path "*/coverage*" -print -exec rm -vfr {} ';' || true
-	find ${TEST_PROJECT_DIRECTORY} -path "*/TestResults/*" -type d -print -exec rm -vfr {} ';' || true
-	find ${TEST_PROJECT_DIRECTORY} -path "*/bin/*" -print -exec rm -vfr {} ';' || true
-	find ${TEST_PROJECT_DIRECTORY} -path "*/obj/*" -print -exec rm -vfr {} ';' || true
+	find ./src/ -path "*/TestResults/*" -type d -print -exec rm -vfr {} ';' || true
+	find ./src/ -path "*/bin/*" -print -exec rm -vfr {} ';' || true
+	find ./src/ -path "*/obj/*" -print -exec rm -vfr {} ';' || true
+	find ./src/ -path "*/coverage*" -print -exec rm -vfr {} ';' || true
+	find . -type d -print -empty -delete || true
 
 compose/build: env
 	${DOCKER_COMPOSE} --profile lint build

algorithm_exercises_csharp.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp_test", "algorithm_exercises_csharp_test\algorithm_exercises_csharp_test.csproj", "{817BA968-9A1F-4DDB-8A96-657DCA862227}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp_test", "src\algorithm_exercises_csharp_test\algorithm_exercises_csharp_test.csproj", "{817BA968-9A1F-4DDB-8A96-657DCA862227}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp", "algorithm_exercises_csharp\algorithm_exercises_csharp.csproj", "{B162EE62-90C6-4871-B278-390804615987}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp", "src\algorithm_exercises_csharp\algorithm_exercises_csharp.csproj", "{B162EE62-90C6-4871-B278-390804615987}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp_base", "algorithm_exercises_csharp_base\algorithm_exercises_csharp_base.csproj", "{1BC65C42-83A6-486D-84DB-0DC63002FA24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp_base", "src\algorithm_exercises_csharp_base\algorithm_exercises_csharp_base.csproj", "{1BC65C42-83A6-486D-84DB-0DC63002FA24}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

algorithm_exercises_csharp/src/Hello.cs renamed to src/algorithm_exercises_csharp/Hello.cs

@@ -55,7 +55,7 @@
   </ItemGroup>
 
   <Target Name="GenerateHtmlCoverageReport" AfterTargets="GenerateCoverageResultAfterTest">
-    <ReportGenerator ReportFiles="@(CoverletReport)" TargetDirectory="../coverage-report" ReportTypes="TextSummary;Html" />
+    <ReportGenerator ReportFiles="@(CoverletReport)" TargetDirectory="../../coverage-report" ReportTypes="TextSummary;Html" />
   </Target>
 
   <ItemGroup>