Skip to content

Commit

Permalink
Merge pull request #4 from shahzaib-m/move-core-and-webapi-projects
Browse files Browse the repository at this point in the history
Move core and webapi projects
  • Loading branch information
shahzaib-m authored Jul 12, 2024
2 parents a5c0890 + 3e0b098 commit b091624
Show file tree
Hide file tree
Showing 95 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Extract version
id: get_version
run: |
VERSION=$(xmlstarlet sel -t -v "//Project/PropertyGroup/Version" src/Sylvre.WebAPI/Sylvre.WebAPI.csproj)
VERSION=$(xmlstarlet sel -t -v "//Project/PropertyGroup/Version" core-and-webapi/Sylvre.WebAPI/Sylvre.WebAPI.csproj)
echo "VERSION=$VERSION" >> $GITHUB_ENV
- name: Set up Docker Buildx
Expand All @@ -32,6 +32,6 @@ jobs:
run: |
IMAGE_NAME=ghcr.io/shahzaib-m/sylvre
VERSION=${{ env.VERSION }}
docker build -f src/Sylvre.WebAPI/Dockerfile -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest src/
docker build -f core-and-webapi/Sylvre.WebAPI/Dockerfile -t $IMAGE_NAME:$VERSION -t $IMAGE_NAME:latest core-and-webapi/
docker push $IMAGE_NAME:$VERSION
docker push $IMAGE_NAME:latest
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Restore dependencies
working-directory: src/Sylvre.Tests
working-directory: core-and-webapi/Sylvre.Tests
run: dotnet restore
- name: Build
working-directory: src/Sylvre.Tests
working-directory: core-and-webapi/Sylvre.Tests
run: dotnet build --no-restore
- name: Test
working-directory: src/Sylvre.Tests
working-directory: core-and-webapi/Sylvre.Tests
run: dotnet test --no-build --verbosity normal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ EXPOSE 8080

FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
WORKDIR /core-and-webapi
COPY ["Sylvre.WebAPI/Sylvre.WebAPI.csproj", "Sylvre.WebAPI/"]
COPY ["Sylvre.Core/Sylvre.Core.csproj", "Sylvre.Core/"]
RUN dotnet restore "./Sylvre.WebAPI/Sylvre.WebAPI.csproj"
COPY . .
WORKDIR "/src/Sylvre.WebAPI"
WORKDIR "/core-and-webapi/Sylvre.WebAPI"
RUN dotnet build "./Sylvre.WebAPI.csproj" -c $BUILD_CONFIGURATION -o /app/build

FROM build AS publish
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Sylvre.sln → core-and-webapi/Sylvre.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.421
# Visual Studio Version 17
VisualStudioVersion = 17.10.34916.146
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sylvre.Core", "Sylvre.Core\Sylvre.Core.csproj", "{E2A613BE-1665-40F2-8D0A-F7268DEFE854}"
EndProject
Expand Down

0 comments on commit b091624

Please sign in to comment.