Skip to content

Commit becde1d

Browse files
author
Gonzalo Diaz
committed
[REFACTOR] directory hierarchy now matches package structure.
1 parent efb74f3 commit becde1d

File tree

65 files changed

+15
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+15
-15
lines changed

Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ WORKDIR ${WORKDIR}
1515

1616
COPY ./Makefile ${WORKDIR}/
1717
COPY ./algorithm_exercises_csharp.sln ${WORKDIR}/algorithm_exercises_csharp.sln
18-
COPY ./algorithm_exercises_csharp/algorithm_exercises_csharp.csproj ${WORKDIR}/algorithm_exercises_csharp/algorithm_exercises_csharp.csproj
19-
COPY ./algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj ${WORKDIR}/algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj
20-
COPY ./algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj ${WORKDIR}/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj
18+
COPY ./src/algorithm_exercises_csharp/algorithm_exercises_csharp.csproj ${WORKDIR}/src/algorithm_exercises_csharp/algorithm_exercises_csharp.csproj
19+
COPY ./src/algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj ${WORKDIR}/src/algorithm_exercises_csharp_base/algorithm_exercises_csharp_base.csproj
20+
COPY ./src/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj ${WORKDIR}/src/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj
2121

2222
RUN make dependencies
2323

@@ -46,9 +46,9 @@ COPY ./CODE_OF_CONDUCT.md ${WORKDIR}/
4646

4747
# Code source
4848
COPY ./algorithm_exercises_csharp.sln ${WORKDIR}/algorithm_exercises_csharp.sln
49-
COPY ./algorithm_exercises_csharp ${WORKDIR}/algorithm_exercises_csharp
50-
COPY ./algorithm_exercises_csharp_base ${WORKDIR}/algorithm_exercises_csharp_base
51-
COPY ./algorithm_exercises_csharp_test ${WORKDIR}/algorithm_exercises_csharp_test
49+
COPY ./src/algorithm_exercises_csharp ${WORKDIR}/src/algorithm_exercises_csharp
50+
COPY ./src/algorithm_exercises_csharp_base ${WORKDIR}/src/algorithm_exercises_csharp_base
51+
COPY ./src/algorithm_exercises_csharp_test ${WORKDIR}/src/algorithm_exercises_csharp_test
5252

5353
# code linting conf
5454
COPY ./.editorconfig ${WORKDIR}/
@@ -66,9 +66,9 @@ CMD ["make", "lint"]
6666
FROM base AS development
6767

6868
COPY ./algorithm_exercises_csharp.sln ${WORKDIR}/algorithm_exercises_csharp.sln
69-
COPY ./algorithm_exercises_csharp ${WORKDIR}/algorithm_exercises_csharp
70-
COPY ./algorithm_exercises_csharp_base ${WORKDIR}/algorithm_exercises_csharp_base
71-
COPY ./algorithm_exercises_csharp_test ${WORKDIR}/algorithm_exercises_csharp_test
69+
COPY ./src/algorithm_exercises_csharp ${WORKDIR}/src/algorithm_exercises_csharp
70+
COPY ./src/algorithm_exercises_csharp_base ${WORKDIR}/src/algorithm_exercises_csharp_base
71+
COPY ./src/algorithm_exercises_csharp_test ${WORKDIR}/src/algorithm_exercises_csharp_test
7272

7373
RUN make build \
7474
&& ls -alh
@@ -119,8 +119,8 @@ RUN adduser -D worker \
119119
&& chown worker:worker /app
120120

121121
COPY ./Makefile ${WORKDIR}/
122-
COPY --from=builder /app/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.dll ${WORKDIR}/
123-
COPY --from=builder /app/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.runtimeconfig.json ${WORKDIR}/
122+
COPY --from=builder /app/src/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.dll ${WORKDIR}/
123+
COPY --from=builder /app/src/algorithm_exercises_csharp/bin/Release/net8.0/algorithm_exercises_csharp.runtimeconfig.json ${WORKDIR}/
124124

125125
RUN ls -alh
126126

algorithm_exercises_csharp.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp_test", "algorithm_exercises_csharp_test\algorithm_exercises_csharp_test.csproj", "{817BA968-9A1F-4DDB-8A96-657DCA862227}"
6+
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}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp", "algorithm_exercises_csharp\algorithm_exercises_csharp.csproj", "{B162EE62-90C6-4871-B278-390804615987}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp", "src\algorithm_exercises_csharp\algorithm_exercises_csharp.csproj", "{B162EE62-90C6-4871-B278-390804615987}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "algorithm_exercises_csharp_base", "algorithm_exercises_csharp_base\algorithm_exercises_csharp_base.csproj", "{1BC65C42-83A6-486D-84DB-0DC63002FA24}"
10+
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}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj renamed to src/algorithm_exercises_csharp_test/algorithm_exercises_csharp_test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</ItemGroup>
5656

5757
<Target Name="GenerateHtmlCoverageReport" AfterTargets="GenerateCoverageResultAfterTest">
58-
<ReportGenerator ReportFiles="@(CoverletReport)" TargetDirectory="../coverage-report" ReportTypes="TextSummary;Html" />
58+
<ReportGenerator ReportFiles="@(CoverletReport)" TargetDirectory="../../coverage-report" ReportTypes="TextSummary;Html" />
5959
</Target>
6060

6161
<ItemGroup>

0 commit comments

Comments
 (0)