diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..76e102a --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,46 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Elzik.Breef.sln b/Elzik.Breef.sln index bee181c..39033a8 100644 --- a/Elzik.Breef.sln +++ b/Elzik.Breef.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.11.35431.28 +# Visual Studio Version 18 +VisualStudioVersion = 18.1.11312.151 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elzik.Breef.Api", "src\Elzik.Breef.Api\Elzik.Breef.Api.csproj", "{C4C2EC01-2064-4409-A13B-BD3F391614E7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{187D512C-3DC8-4ADA-A51C-2415FE9F18C3}" ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + nuget.config = nuget.config README.md = README.md EndProjectSection EndProject @@ -44,6 +46,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleRequests", "SampleReq tests\SampleRequests\Elzik.Breef.Api.http = tests\SampleRequests\Elzik.Breef.Api.http EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{34D36A81-314B-4D09-B1C0-1D2C72653E39}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Api", "Api", "{DCAB55F3-E907-4901-A3AC-3C7A2036A034}" + ProjectSection(SolutionItems) = preProject + build\api\build-docker.ps1 = build\api\build-docker.ps1 + build\api\build.ps1 = build\api\build.ps1 + build\api\get-semver.ps1 = build\api\get-semver.ps1 + build\api\local-build.ps1 = build\api\local-build.ps1 + build\api\restore.ps1 = build\api\restore.ps1 + build\api\test.ps1 = build\api\test.ps1 + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -93,6 +107,8 @@ Global {6CACB8E5-4B4C-4C05-AD80-32561037DAF0} = {C0C3A88F-44EC-4383-96FF-3BE016F2122B} {F1FD6E10-FB87-4BBD-B853-05889A04CFA9} = {C0C3A88F-44EC-4383-96FF-3BE016F2122B} {02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {C0C3A88F-44EC-4383-96FF-3BE016F2122B} + {34D36A81-314B-4D09-B1C0-1D2C72653E39} = {187D512C-3DC8-4ADA-A51C-2415FE9F18C3} + {DCAB55F3-E907-4901-A3AC-3C7A2036A034} = {34D36A81-314B-4D09-B1C0-1D2C72653E39} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6E3F0693-A48D-48DC-935C-2D8758390BC2} diff --git a/build/api/build-docker.ps1 b/build/api/build-docker.ps1 index 90c84cd..2c8a659 100644 --- a/build/api/build-docker.ps1 +++ b/build/api/build-docker.ps1 @@ -10,7 +10,7 @@ $repoRoot = Resolve-Path "$PSScriptRoot/../.." docker build ` -t "ghcr.io/elzik/elzik-breef-api:$Version" ` -f "$repoRoot/src/Elzik.Breef.Api/Dockerfile" ` - "$repoRoot/src" + "$repoRoot" if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE diff --git a/src/Elzik.Breef.Api/Dockerfile b/src/Elzik.Breef.Api/Dockerfile index 938870f..3dcde8d 100644 --- a/src/Elzik.Breef.Api/Dockerfile +++ b/src/Elzik.Breef.Api/Dockerfile @@ -10,11 +10,13 @@ EXPOSE 8080 # This stage is used to build the service project FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build ARG BUILD_CONFIGURATION=Release -WORKDIR /src -COPY ["Elzik.Breef.Api/Elzik.Breef.Api.csproj", "Elzik.Breef.Api/"] -RUN dotnet restore "./Elzik.Breef.Api/Elzik.Breef.Api.csproj" +WORKDIR /repo +COPY ["nuget.config", "./"] +COPY ["Directory.Packages.props", "./"] +COPY ["src/Elzik.Breef.Api/Elzik.Breef.Api.csproj", "src/Elzik.Breef.Api/"] +RUN dotnet restore "./src/Elzik.Breef.Api/Elzik.Breef.Api.csproj" COPY . . -WORKDIR "/src/Elzik.Breef.Api" +WORKDIR "/repo/src/Elzik.Breef.Api" RUN dotnet build "./Elzik.Breef.Api.csproj" -c "$BUILD_CONFIGURATION" -o /app/build # This stage is used to publish the service project to be copied to the final stage diff --git a/src/Elzik.Breef.Api/Elzik.Breef.Api.csproj b/src/Elzik.Breef.Api/Elzik.Breef.Api.csproj index ee1aad6..c7585c2 100644 --- a/src/Elzik.Breef.Api/Elzik.Breef.Api.csproj +++ b/src/Elzik.Breef.Api/Elzik.Breef.Api.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -9,18 +9,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Elzik.Breef.Application/Elzik.Breef.Application.csproj b/src/Elzik.Breef.Application/Elzik.Breef.Application.csproj index e4fc653..781cceb 100644 --- a/src/Elzik.Breef.Application/Elzik.Breef.Application.csproj +++ b/src/Elzik.Breef.Application/Elzik.Breef.Application.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Elzik.Breef.Domain/Elzik.Breef.Domain.csproj b/src/Elzik.Breef.Domain/Elzik.Breef.Domain.csproj index 72c6e3b..06ba033 100644 --- a/src/Elzik.Breef.Domain/Elzik.Breef.Domain.csproj +++ b/src/Elzik.Breef.Domain/Elzik.Breef.Domain.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Elzik.Breef.Infrastructure/Elzik.Breef.Infrastructure.csproj b/src/Elzik.Breef.Infrastructure/Elzik.Breef.Infrastructure.csproj index 4a11210..489de1e 100644 --- a/src/Elzik.Breef.Infrastructure/Elzik.Breef.Infrastructure.csproj +++ b/src/Elzik.Breef.Infrastructure/Elzik.Breef.Infrastructure.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -7,23 +7,23 @@ - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/Elzik.Breef.Api.Tests.Functional/Elzik.Breef.Api.Tests.Functional.csproj b/tests/Elzik.Breef.Api.Tests.Functional/Elzik.Breef.Api.Tests.Functional.csproj index 38a5ee0..d973d96 100644 --- a/tests/Elzik.Breef.Api.Tests.Functional/Elzik.Breef.Api.Tests.Functional.csproj +++ b/tests/Elzik.Breef.Api.Tests.Functional/Elzik.Breef.Api.Tests.Functional.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -9,31 +9,31 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/Elzik.Breef.Api.Tests.Integration/Elzik.Breef.Api.Tests.Integration.csproj b/tests/Elzik.Breef.Api.Tests.Integration/Elzik.Breef.Api.Tests.Integration.csproj index f367059..c3b4677 100644 --- a/tests/Elzik.Breef.Api.Tests.Integration/Elzik.Breef.Api.Tests.Integration.csproj +++ b/tests/Elzik.Breef.Api.Tests.Integration/Elzik.Breef.Api.Tests.Integration.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -10,26 +10,26 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Elzik.Breef.Infrastructure.Tests.Integration/Elzik.Breef.Infrastructure.Tests.Integration.csproj b/tests/Elzik.Breef.Infrastructure.Tests.Integration/Elzik.Breef.Infrastructure.Tests.Integration.csproj index 671cd27..a09705d 100644 --- a/tests/Elzik.Breef.Infrastructure.Tests.Integration/Elzik.Breef.Infrastructure.Tests.Integration.csproj +++ b/tests/Elzik.Breef.Infrastructure.Tests.Integration/Elzik.Breef.Infrastructure.Tests.Integration.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -10,40 +10,40 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Elzik.Breef.Infrastructure.Tests.Unit/Elzik.Breef.Infrastructure.Tests.Unit.csproj b/tests/Elzik.Breef.Infrastructure.Tests.Unit/Elzik.Breef.Infrastructure.Tests.Unit.csproj index 6a3c487..0d54dbc 100644 --- a/tests/Elzik.Breef.Infrastructure.Tests.Unit/Elzik.Breef.Infrastructure.Tests.Unit.csproj +++ b/tests/Elzik.Breef.Infrastructure.Tests.Unit/Elzik.Breef.Infrastructure.Tests.Unit.csproj @@ -10,30 +10,30 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive