diff --git a/.gitignore b/.gitignore index 36acabf..031be54 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,19 @@ src/Modules/Identity/obj/ src/Modules/Order/obj/ src/Modules/Reputation/obj/ + +src/Host/bin/ + +src/BuildingBlocks/bin/ + +src/Modules/Catalog/bin/ + +src/Modules/Collaboration/bin/ + +src/Modules/Geo/bin/ + +src/Modules/Identity/bin/ + +src/Modules/Order/bin/ + +src/Modules/Reputation/bin/ diff --git a/Dockerfile b/Dockerfile index e3a0e9f..f9e7142 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Build stage +# Build stage FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src @@ -9,27 +9,27 @@ RUN apt-get update \ zlib1g-dev # Copy solution file -COPY ["Nashel.RF.sln", "./"] +COPY ["Nashel.sln", "./"] # Copy project files -COPY ["src/Host/Nashel.RF.Host.csproj", "src/Host/"] -COPY ["src/BuildingBlocks/Nashel.RF.BuildingBlocks.csproj", "src/BuildingBlocks/"] -COPY ["src/Modules/Catalog/Nashel.RF.Modules.Catalog.csproj", "src/Modules/Catalog/"] -COPY ["src/Modules/Collaboration/Nashel.RF.Modules.Collaboration.csproj", "src/Modules/Collaboration/"] -COPY ["src/Modules/Geo/Nashel.RF.Modules.Geo.csproj", "src/Modules/Geo/"] -COPY ["src/Modules/Identity/Nashel.RF.Modules.Identity.csproj", "src/Modules/Identity/"] -COPY ["src/Modules/Order/Nashel.RF.Modules.Order.csproj", "src/Modules/Order/"] -COPY ["src/Modules/Reputation/Nashel.RF.Modules.Reputation.csproj", "src/Modules/Reputation/"] +COPY ["src/Host/Nashel.Host.csproj", "src/Host/"] +COPY ["src/BuildingBlocks/Nashel.BuildingBlocks.csproj", "src/BuildingBlocks/"] +COPY ["src/Modules/Catalog/Nashel.Modules.Catalog.csproj", "src/Modules/Catalog/"] +COPY ["src/Modules/Collaboration/Nashel.Modules.Collaboration.csproj", "src/Modules/Collaboration/"] +COPY ["src/Modules/Geo/Nashel.Modules.Geo.csproj", "src/Modules/Geo/"] +COPY ["src/Modules/Identity/Nashel.Modules.Identity.csproj", "src/Modules/Identity/"] +COPY ["src/Modules/Order/Nashel.Modules.Order.csproj", "src/Modules/Order/"] +COPY ["src/Modules/Reputation/Nashel.Modules.Reputation.csproj", "src/Modules/Reputation/"] # Restore dependencies -RUN dotnet restore "Nashel.RF.sln" +RUN dotnet restore "Nashel.sln" # Copy the rest of the source code COPY . . # Publish the application (AOT) WORKDIR "/src/src/Host" -RUN dotnet publish "Nashel.RF.Host.csproj" -c Release -r linux-x64 --self-contained true -o /app/publish +RUN dotnet publish "Nashel.Host.csproj" -c Release -r linux-x64 --self-contained true -o /app/publish # Final stage FROM mcr.microsoft.com/dotnet/runtime-deps:10.0 AS final @@ -37,4 +37,4 @@ WORKDIR /app COPY --from=build /app/publish . ENV ASPNETCORE_URLS=http://+:8080 EXPOSE 8080 -ENTRYPOINT ["./Nashel.RF.Host"] +ENTRYPOINT ["./Nashel.Host"] diff --git a/Nashel.RF.sln b/Nashel.sln similarity index 88% rename from Nashel.RF.sln rename to Nashel.sln index ff5e617..a8d3853 100644 --- a/Nashel.RF.sln +++ b/Nashel.sln @@ -7,37 +7,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildingBlocks", "BuildingBlocks", "{90298CBA-BD6F-3A0A-69D5-97CAD7B05E7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.BuildingBlocks", "src\BuildingBlocks\Nashel.RF.BuildingBlocks.csproj", "{CC3A5E56-8FC3-4C75-932A-ADE592F65515}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.BuildingBlocks", "src\BuildingBlocks\Nashel.BuildingBlocks.csproj", "{CC3A5E56-8FC3-4C75-932A-ADE592F65515}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Host", "Host", "{981C2CF6-E5BB-602A-511C-234B538302B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Host", "src\Host\Nashel.RF.Host.csproj", "{1F5F02BF-AD09-41E9-8130-1A939AE5012D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Host", "src\Host\Nashel.Host.csproj", "{1F5F02BF-AD09-41E9-8130-1A939AE5012D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{EC447DCF-ABFA-6E24-52A5-D7FD48A5C558}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{0EC62A1A-9858-3A60-8A0C-FC9AACFA2EC7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Modules.Identity", "src\Modules\Identity\Nashel.RF.Modules.Identity.csproj", "{A53458FA-F0D6-4666-9D3E-3740665D2BC3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Modules.Identity", "src\Modules\Identity\Nashel.Modules.Identity.csproj", "{A53458FA-F0D6-4666-9D3E-3740665D2BC3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Geo", "Geo", "{1F785BA6-BCCC-EB5A-C0AC-017D258EF3FD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Modules.Geo", "src\Modules\Geo\Nashel.RF.Modules.Geo.csproj", "{946AE1A0-0055-4AEC-A4AC-CB8F9F871079}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Modules.Geo", "src\Modules\Geo\Nashel.Modules.Geo.csproj", "{946AE1A0-0055-4AEC-A4AC-CB8F9F871079}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalog", "Catalog", "{1E1EF545-4C18-AEE2-B997-7EF431518D3F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Modules.Catalog", "src\Modules\Catalog\Nashel.RF.Modules.Catalog.csproj", "{B209DA77-ABD4-49BE-9FE5-769BE44D8391}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Modules.Catalog", "src\Modules\Catalog\Nashel.Modules.Catalog.csproj", "{B209DA77-ABD4-49BE-9FE5-769BE44D8391}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Order", "Order", "{2C821288-5B9D-778E-74EE-053FE87F223E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Modules.Order", "src\Modules\Order\Nashel.RF.Modules.Order.csproj", "{27619C7F-D02E-4E15-ABFA-8FD59ED23D82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Modules.Order", "src\Modules\Order\Nashel.Modules.Order.csproj", "{27619C7F-D02E-4E15-ABFA-8FD59ED23D82}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Collaboration", "Collaboration", "{0D6C7A58-55D3-AEBB-0CCB-984ED0F92F71}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Modules.Collaboration", "src\Modules\Collaboration\Nashel.RF.Modules.Collaboration.csproj", "{D59D021C-A351-4E12-85A7-D7B4D31ED695}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Modules.Collaboration", "src\Modules\Collaboration\Nashel.Modules.Collaboration.csproj", "{D59D021C-A351-4E12-85A7-D7B4D31ED695}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reputation", "Reputation", "{305CF822-D9CA-C4BE-7183-DD5447E36C7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.RF.Modules.Reputation", "src\Modules\Reputation\Nashel.RF.Modules.Reputation.csproj", "{75715051-86CB-472A-BEFA-0E9AAA5EB24F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nashel.Modules.Reputation", "src\Modules\Reputation\Nashel.Modules.Reputation.csproj", "{75715051-86CB-472A-BEFA-0E9AAA5EB24F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/BuildingBlocks/Nashel.RF.BuildingBlocks.csproj b/src/BuildingBlocks/Nashel.BuildingBlocks.csproj similarity index 100% rename from src/BuildingBlocks/Nashel.RF.BuildingBlocks.csproj rename to src/BuildingBlocks/Nashel.BuildingBlocks.csproj diff --git a/src/Host/Nashel.RF.Host.csproj b/src/Host/Nashel.Host.csproj similarity index 100% rename from src/Host/Nashel.RF.Host.csproj rename to src/Host/Nashel.Host.csproj diff --git a/src/Host/Nashel.Host.http b/src/Host/Nashel.Host.http new file mode 100644 index 0000000..df5d03a --- /dev/null +++ b/src/Host/Nashel.Host.http @@ -0,0 +1,6 @@ +@Nashel.Host_HostAddress = http://localhost:5232 + +GET {{Nashel.Host_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/src/Host/Nashel.RF.Host.http b/src/Host/Nashel.RF.Host.http deleted file mode 100644 index 6fd55dd..0000000 --- a/src/Host/Nashel.RF.Host.http +++ /dev/null @@ -1,6 +0,0 @@ -@Nashel.RF.Host_HostAddress = http://localhost:5232 - -GET {{Nashel.RF.Host_HostAddress}}/weatherforecast/ -Accept: application/json - -### diff --git a/src/Modules/Order/Nashel.RF.Modules.Order.csproj b/src/Modules/Catalog/Nashel.Modules.Catalog.csproj similarity index 82% rename from src/Modules/Order/Nashel.RF.Modules.Order.csproj rename to src/Modules/Catalog/Nashel.Modules.Catalog.csproj index ad6e3c1..06da003 100644 --- a/src/Modules/Order/Nashel.RF.Modules.Order.csproj +++ b/src/Modules/Catalog/Nashel.Modules.Catalog.csproj @@ -1,7 +1,7 @@  - + diff --git a/src/Modules/Identity/Nashel.RF.Modules.Identity.csproj b/src/Modules/Collaboration/Nashel.Modules.Collaboration.csproj similarity index 82% rename from src/Modules/Identity/Nashel.RF.Modules.Identity.csproj rename to src/Modules/Collaboration/Nashel.Modules.Collaboration.csproj index ad6e3c1..06da003 100644 --- a/src/Modules/Identity/Nashel.RF.Modules.Identity.csproj +++ b/src/Modules/Collaboration/Nashel.Modules.Collaboration.csproj @@ -1,7 +1,7 @@  - + diff --git a/src/Modules/Geo/Nashel.RF.Modules.Geo.csproj b/src/Modules/Geo/Nashel.Modules.Geo.csproj similarity index 86% rename from src/Modules/Geo/Nashel.RF.Modules.Geo.csproj rename to src/Modules/Geo/Nashel.Modules.Geo.csproj index 4c4002e..c40c6f9 100644 --- a/src/Modules/Geo/Nashel.RF.Modules.Geo.csproj +++ b/src/Modules/Geo/Nashel.Modules.Geo.csproj @@ -1,7 +1,7 @@  - + diff --git a/src/Modules/Catalog/Nashel.RF.Modules.Catalog.csproj b/src/Modules/Identity/Nashel.Modules.Identity.csproj similarity index 82% rename from src/Modules/Catalog/Nashel.RF.Modules.Catalog.csproj rename to src/Modules/Identity/Nashel.Modules.Identity.csproj index ad6e3c1..06da003 100644 --- a/src/Modules/Catalog/Nashel.RF.Modules.Catalog.csproj +++ b/src/Modules/Identity/Nashel.Modules.Identity.csproj @@ -1,7 +1,7 @@  - + diff --git a/src/Modules/Collaboration/Nashel.RF.Modules.Collaboration.csproj b/src/Modules/Order/Nashel.Modules.Order.csproj similarity index 82% rename from src/Modules/Collaboration/Nashel.RF.Modules.Collaboration.csproj rename to src/Modules/Order/Nashel.Modules.Order.csproj index ad6e3c1..06da003 100644 --- a/src/Modules/Collaboration/Nashel.RF.Modules.Collaboration.csproj +++ b/src/Modules/Order/Nashel.Modules.Order.csproj @@ -1,7 +1,7 @@  - + diff --git a/src/Modules/Reputation/Nashel.Modules.Reputation.csproj b/src/Modules/Reputation/Nashel.Modules.Reputation.csproj new file mode 100644 index 0000000..06da003 --- /dev/null +++ b/src/Modules/Reputation/Nashel.Modules.Reputation.csproj @@ -0,0 +1,18 @@ + + + + + + + + + + + + + net10.0 + enable + enable + + + diff --git a/src/Modules/Reputation/Nashel.RF.Modules.Reputation.csproj b/src/Modules/Reputation/Nashel.RF.Modules.Reputation.csproj deleted file mode 100644 index ad6e3c1..0000000 --- a/src/Modules/Reputation/Nashel.RF.Modules.Reputation.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - net10.0 - enable - enable - - -