From 03b4088e19b861ea396723c7c11fb46d67fa30ea Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Sat, 5 Jul 2025 19:57:43 +0100 Subject: [PATCH] Update everything and add Forgejo workflow --- .forgejo/workflows/build.yml | 23 ++++ .gitignore | 1 + .nuke/build.schema.json | 127 ++++++++++-------- .nuke/temp/build-attempt.log | 5 - .nuke/temp/build.2023-02-18_13-31-58.log | 79 ----------- .nuke/temp/build.log | 79 ----------- Dockerfile | 4 +- build/Build.cs | 8 +- build/_build.csproj | 4 +- .../Robware.Api.Auth.Tests.csproj | 20 ++- src/Robware.Api.Auth/Robware.Api.Auth.csproj | 4 +- .../Robware.Auth.Tests.csproj | 22 +-- src/Robware.Auth/Robware.Auth.csproj | 2 +- src/Robware.Data/Robware.Data.csproj | 4 +- 14 files changed, 132 insertions(+), 250 deletions(-) create mode 100644 .forgejo/workflows/build.yml delete mode 100644 .nuke/temp/build-attempt.log delete mode 100644 .nuke/temp/build.2023-02-18_13-31-58.log delete mode 100644 .nuke/temp/build.log diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml new file mode 100644 index 0000000..73dc90d --- /dev/null +++ b/.forgejo/workflows/build.yml @@ -0,0 +1,23 @@ +name: Build and Push Docker Image + +on: [push] +jobs: + build-and-push: + runs-on: ubuntu-24.04 + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: . + push: true + tags: | + docker.robware.uk/api.projects:latest + docker.robware.uk/api.projects:${{env.GITHUB_SHA}} + diff --git a/.gitignore b/.gitignore index 3e8285e..92a567f 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ output /_NCrunch_Website *.DotSettings *.cache +.nuke/temp diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 878f137..906972f 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -1,19 +1,48 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "title": "Build Schema", - "$ref": "#/definitions/build", "definitions": { - "build": { - "type": "object", + "Host": { + "type": "string", + "enum": [ + "AppVeyor", + "AzurePipelines", + "Bamboo", + "Bitbucket", + "Bitrise", + "GitHubActions", + "GitLab", + "Jenkins", + "Rider", + "SpaceAutomation", + "TeamCity", + "Terminal", + "TravisCI", + "VisualStudio", + "VSCode" + ] + }, + "ExecutableTarget": { + "type": "string", + "enum": [ + "Clean", + "Compile", + "Publish", + "Restore", + "Test" + ] + }, + "Verbosity": { + "type": "string", + "description": "", + "enum": [ + "Verbose", + "Normal", + "Minimal", + "Quiet" + ] + }, + "NukeBuild": { "properties": { - "Configuration": { - "type": "string", - "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)", - "enum": [ - "Debug", - "Release" - ] - }, "Continue": { "type": "boolean", "description": "Indicates to continue a previously failed build attempt" @@ -23,25 +52,8 @@ "description": "Shows the help text for this build assembly" }, "Host": { - "type": "string", "description": "Host for execution. Default is 'automatic'", - "enum": [ - "AppVeyor", - "AzurePipelines", - "Bamboo", - "Bitbucket", - "Bitrise", - "GitHubActions", - "GitLab", - "Jenkins", - "Rider", - "SpaceAutomation", - "TeamCity", - "Terminal", - "TravisCI", - "VisualStudio", - "VSCode" - ] + "$ref": "#/definitions/Host" }, "NoLogo": { "type": "boolean", @@ -70,45 +82,42 @@ "type": "array", "description": "List of targets to be skipped. Empty list skips all dependencies", "items": { - "type": "string", - "enum": [ - "Clean", - "Compile", - "Publish", - "Restore", - "Test" - ] + "$ref": "#/definitions/ExecutableTarget" } }, - "Solution": { - "type": "string", - "description": "Path to a solution file that is automatically loaded" - }, "Target": { "type": "array", "description": "List of targets to be invoked. Default is '{default_target}'", "items": { - "type": "string", - "enum": [ - "Clean", - "Compile", - "Publish", - "Restore", - "Test" - ] + "$ref": "#/definitions/ExecutableTarget" } }, "Verbosity": { - "type": "string", "description": "Logging verbosity during build execution. Default is 'Normal'", - "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" - ] + "$ref": "#/definitions/Verbosity" } } } - } -} \ No newline at end of file + }, + "allOf": [ + { + "properties": { + "Configuration": { + "type": "string", + "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)", + "enum": [ + "Debug", + "Release" + ] + }, + "Solution": { + "type": "string", + "description": "Path to a solution file that is automatically loaded" + } + } + }, + { + "$ref": "#/definitions/NukeBuild" + } + ] +} diff --git a/.nuke/temp/build-attempt.log b/.nuke/temp/build-attempt.log deleted file mode 100644 index 2c52d3f..0000000 --- a/.nuke/temp/build-attempt.log +++ /dev/null @@ -1,5 +0,0 @@ -5955c86dedd1297c5beb35cdbb991e55 -Restore -Compile -Test -Publish diff --git a/.nuke/temp/build.2023-02-18_13-31-58.log b/.nuke/temp/build.2023-02-18_13-31-58.log deleted file mode 100644 index be4cd57..0000000 --- a/.nuke/temp/build.2023-02-18_13-31-58.log +++ /dev/null @@ -1,79 +0,0 @@ -V | | ArgumentsFromParametersFile.OnBuildCreated (150) -V | | Passing value for Build.Solution (src/Robware.Api.Auth.sln) -V | | InjectParameterValues.OnBuildCreated (100) -V | | HandleShellCompletion.OnBuildCreated (75) -V | | GenerateBuildServerConfigurations.OnBuildCreated (50) -V | | InvokeBuildServerConfigurationGeneration.OnBuildCreated (45) -V | | UpdateNotification.OnBuildCreated (10) -V | | UnsetVisualStudioEnvironmentVariables.OnBuildCreated (0) -V | | HandleVisualStudioDebugging.OnBuildCreated (0) -V | | HandleSingleFileExecution.OnBuildCreated (-50) -V | | EventInvoker.OnBuildCreated (-3.4028235E+38) -V | | HandleHelpRequests.OnBuildInitialized (5) -V | | CheckBuildProjectConfigurations.OnBuildInitialized (0) -V | | Telemetry.OnBuildInitialized (0) -V | | InjectNonParameterValues.OnBuildInitialized (-100) -V | | EventInvoker.OnBuildInitialized (-3.4028235E+38) -V | Restore | EventInvoker.OnTargetRunning (-3.4028235E+38) -I | Restore | > /usr/bin/dotnet restore /home/rob/Code/Api.Auth/src/Robware.Api.Auth.sln -D | Restore | Determining projects to restore... -D | Restore | All projects are up-to-date for restore. -V | Restore | Telemetry.OnTargetSucceeded (0) -V | Restore | EventInvoker.OnTargetSucceeded (-3.4028235E+38) -V | Compile | EventInvoker.OnTargetRunning (-3.4028235E+38) -I | Compile | > /usr/bin/dotnet build /home/rob/Code/Api.Auth/src/Robware.Api.Auth.sln --configuration Debug --no-restore -D | Compile | MSBuild version 17.5.0-preview-23061-01+040e2a90e for .NET -D | Compile | Robware.Auth -> /home/rob/Code/Api.Auth/src/Robware.Auth/bin/Debug/net7.0/Robware.Auth.dll -D | Compile | Robware.Data -> /home/rob/Code/Api.Auth/src/Robware.Data/bin/Debug/net7.0/Robware.Data.dll -D | Compile | Robware.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Auth.Tests/bin/Debug/net7.0/Robware.Auth.Tests.dll -W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(56,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(60,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -D | Compile | Robware.Api.Auth -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth/bin/Debug/net7.0/Robware.Api.Auth.dll -D | Compile | Robware.Api.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth.Tests/bin/Debug/net7.0/Robware.Api.Auth.Tests.dll -D | Compile | -D | Compile | Build succeeded. -D | Compile | -W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(56,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(60,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -D | Compile | 2 Warning(s) -D | Compile | 0 Error(s) -D | Compile | -D | Compile | Time Elapsed 00:00:03.90 -V | Compile | Telemetry.OnTargetSucceeded (0) -V | Compile | EventInvoker.OnTargetSucceeded (-3.4028235E+38) -V | Test | EventInvoker.OnTargetRunning (-3.4028235E+38) -I | Test | > /usr/bin/dotnet test /home/rob/Code/Api.Auth/src/Robware.Api.Auth.sln --no-restore -D | Test | Robware.Auth -> /home/rob/Code/Api.Auth/src/Robware.Auth/bin/Debug/net7.0/Robware.Auth.dll -D | Test | Robware.Data -> /home/rob/Code/Api.Auth/src/Robware.Data/bin/Debug/net7.0/Robware.Data.dll -D | Test | Robware.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Auth.Tests/bin/Debug/net7.0/Robware.Auth.Tests.dll -D | Test | Test run for /home/rob/Code/Api.Auth/src/Robware.Auth.Tests/bin/Debug/net7.0/Robware.Auth.Tests.dll (.NETCoreApp,Version=v7.0) -D | Test | Microsoft (R) Test Execution Command Line Tool Version 17.5.0 (x64) -D | Test | Copyright (c) Microsoft Corporation. All rights reserved. -D | Test | -D | Test | Starting test execution, please wait... -D | Test | Robware.Api.Auth -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth/bin/Debug/net7.0/Robware.Api.Auth.dll -D | Test | A total of 1 test files matched the specified pattern. -D | Test | Robware.Api.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth.Tests/bin/Debug/net7.0/Robware.Api.Auth.Tests.dll -D | Test | Test run for /home/rob/Code/Api.Auth/src/Robware.Api.Auth.Tests/bin/Debug/net7.0/Robware.Api.Auth.Tests.dll (.NETCoreApp,Version=v7.0) -D | Test | Microsoft (R) Test Execution Command Line Tool Version 17.5.0 (x64) -D | Test | Copyright (c) Microsoft Corporation. All rights reserved. -D | Test | -D | Test | Starting test execution, please wait... -D | Test | A total of 1 test files matched the specified pattern. -D | Test | -D | Test | Passed! - Failed: 0, Passed: 10, Skipped: 0, Total: 10, Duration: 207 ms - Robware.Auth.Tests.dll (net7.0) -D | Test | -D | Test | Passed! - Failed: 0, Passed: 16, Skipped: 0, Total: 16, Duration: 52 ms - Robware.Api.Auth.Tests.dll (net7.0) -V | Test | Telemetry.OnTargetSucceeded (0) -V | Test | EventInvoker.OnTargetSucceeded (-3.4028235E+38) -V | Publish | EventInvoker.OnTargetRunning (-3.4028235E+38) -I | Publish | > /usr/bin/dotnet publish /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj --configuration Debug --output /home/rob/Code/Api.Auth/output -D | Publish | MSBuild version 17.5.0-preview-23061-01+040e2a90e for .NET -D | Publish | Determining projects to restore... -D | Publish | All projects are up-to-date for restore. -D | Publish | Robware.Auth -> /home/rob/Code/Api.Auth/src/Robware.Auth/bin/Debug/net7.0/Robware.Auth.dll -D | Publish | Robware.Data -> /home/rob/Code/Api.Auth/src/Robware.Data/bin/Debug/net7.0/Robware.Data.dll -D | Publish | Robware.Api.Auth -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth/bin/Debug/net7.0/Robware.Api.Auth.dll -D | Publish | Robware.Api.Auth -> /home/rob/Code/Api.Auth/output/ -V | Publish | Telemetry.OnTargetSucceeded (0) -V | Publish | EventInvoker.OnTargetSucceeded (-3.4028235E+38) diff --git a/.nuke/temp/build.log b/.nuke/temp/build.log deleted file mode 100644 index f141ec5..0000000 --- a/.nuke/temp/build.log +++ /dev/null @@ -1,79 +0,0 @@ -13:31:58.453 | V | | ArgumentsFromParametersFile.OnBuildCreated (150) -13:31:58.496 | V | | Passing value for Build.Solution (src/Robware.Api.Auth.sln) -13:31:58.506 | V | | InjectParameterValues.OnBuildCreated (100) -13:31:58.550 | V | | HandleShellCompletion.OnBuildCreated (75) -13:31:58.655 | V | | GenerateBuildServerConfigurations.OnBuildCreated (50) -13:31:58.655 | V | | InvokeBuildServerConfigurationGeneration.OnBuildCreated (45) -13:31:58.667 | V | | UpdateNotification.OnBuildCreated (10) -13:31:58.667 | V | | UnsetVisualStudioEnvironmentVariables.OnBuildCreated (0) -13:31:58.667 | V | | HandleVisualStudioDebugging.OnBuildCreated (0) -13:31:58.668 | V | | HandleSingleFileExecution.OnBuildCreated (-50) -13:31:58.668 | V | | EventInvoker.OnBuildCreated (-3.4028235E+38) -13:31:58.685 | V | | HandleHelpRequests.OnBuildInitialized (5) -13:31:58.685 | V | | CheckBuildProjectConfigurations.OnBuildInitialized (0) -13:31:58.895 | V | | Telemetry.OnBuildInitialized (0) -13:32:25.683 | V | | InjectNonParameterValues.OnBuildInitialized (-100) -13:32:25.684 | V | | EventInvoker.OnBuildInitialized (-3.4028235E+38) -13:32:25.696 | V | Restore | EventInvoker.OnTargetRunning (-3.4028235E+38) -13:32:25.716 | I | Restore | > /usr/bin/dotnet restore /home/rob/Code/Api.Auth/src/Robware.Api.Auth.sln -13:32:26.594 | D | Restore | Determining projects to restore... -13:32:26.964 | D | Restore | All projects are up-to-date for restore. -13:32:27.006 | V | Restore | Telemetry.OnTargetSucceeded (0) -13:32:27.007 | V | Restore | EventInvoker.OnTargetSucceeded (-3.4028235E+38) -13:32:27.008 | V | Compile | EventInvoker.OnTargetRunning (-3.4028235E+38) -13:32:27.016 | I | Compile | > /usr/bin/dotnet build /home/rob/Code/Api.Auth/src/Robware.Api.Auth.sln --configuration Debug --no-restore -13:32:27.180 | D | Compile | MSBuild version 17.5.0-preview-23061-01+040e2a90e for .NET -13:32:29.220 | D | Compile | Robware.Auth -> /home/rob/Code/Api.Auth/src/Robware.Auth/bin/Debug/net7.0/Robware.Auth.dll -13:32:29.869 | D | Compile | Robware.Data -> /home/rob/Code/Api.Auth/src/Robware.Data/bin/Debug/net7.0/Robware.Data.dll -13:32:29.945 | D | Compile | Robware.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Auth.Tests/bin/Debug/net7.0/Robware.Auth.Tests.dll -13:32:30.421 | W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(56,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -13:32:30.422 | W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(60,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -13:32:30.655 | D | Compile | Robware.Api.Auth -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth/bin/Debug/net7.0/Robware.Api.Auth.dll -13:32:31.102 | D | Compile | Robware.Api.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth.Tests/bin/Debug/net7.0/Robware.Api.Auth.Tests.dll -13:32:31.132 | D | Compile | -13:32:31.132 | D | Compile | Build succeeded. -13:32:31.132 | D | Compile | -13:32:31.132 | W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(56,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -13:32:31.132 | W | Compile | /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Authentication/ApiKeyAuthenticationHandler.cs(60,33): warning CS1998: This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread. [/home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj] -13:32:31.132 | D | Compile | 2 Warning(s) -13:32:31.132 | D | Compile | 0 Error(s) -13:32:31.132 | D | Compile | -13:32:31.133 | D | Compile | Time Elapsed 00:00:03.90 -13:32:31.156 | V | Compile | Telemetry.OnTargetSucceeded (0) -13:32:31.156 | V | Compile | EventInvoker.OnTargetSucceeded (-3.4028235E+38) -13:32:31.157 | V | Test | EventInvoker.OnTargetRunning (-3.4028235E+38) -13:32:31.162 | I | Test | > /usr/bin/dotnet test /home/rob/Code/Api.Auth/src/Robware.Api.Auth.sln --no-restore -13:32:32.638 | D | Test | Robware.Auth -> /home/rob/Code/Api.Auth/src/Robware.Auth/bin/Debug/net7.0/Robware.Auth.dll -13:32:32.790 | D | Test | Robware.Data -> /home/rob/Code/Api.Auth/src/Robware.Data/bin/Debug/net7.0/Robware.Data.dll -13:32:32.831 | D | Test | Robware.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Auth.Tests/bin/Debug/net7.0/Robware.Auth.Tests.dll -13:32:32.853 | D | Test | Test run for /home/rob/Code/Api.Auth/src/Robware.Auth.Tests/bin/Debug/net7.0/Robware.Auth.Tests.dll (.NETCoreApp,Version=v7.0) -13:32:32.955 | D | Test | Microsoft (R) Test Execution Command Line Tool Version 17.5.0 (x64) -13:32:32.955 | D | Test | Copyright (c) Microsoft Corporation. All rights reserved. -13:32:32.961 | D | Test | -13:32:33.059 | D | Test | Starting test execution, please wait... -13:32:33.089 | D | Test | Robware.Api.Auth -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth/bin/Debug/net7.0/Robware.Api.Auth.dll -13:32:33.099 | D | Test | A total of 1 test files matched the specified pattern. -13:32:33.405 | D | Test | Robware.Api.Auth.Tests -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth.Tests/bin/Debug/net7.0/Robware.Api.Auth.Tests.dll -13:32:33.440 | D | Test | Test run for /home/rob/Code/Api.Auth/src/Robware.Api.Auth.Tests/bin/Debug/net7.0/Robware.Api.Auth.Tests.dll (.NETCoreApp,Version=v7.0) -13:32:33.547 | D | Test | Microsoft (R) Test Execution Command Line Tool Version 17.5.0 (x64) -13:32:33.547 | D | Test | Copyright (c) Microsoft Corporation. All rights reserved. -13:32:33.557 | D | Test | -13:32:33.707 | D | Test | Starting test execution, please wait... -13:32:33.775 | D | Test | A total of 1 test files matched the specified pattern. -13:32:34.800 | D | Test | -13:32:34.806 | D | Test | Passed! - Failed: 0, Passed: 10, Skipped: 0, Total: 10, Duration: 207 ms - Robware.Auth.Tests.dll (net7.0) -13:32:35.522 | D | Test | -13:32:35.529 | D | Test | Passed! - Failed: 0, Passed: 16, Skipped: 0, Total: 16, Duration: 52 ms - Robware.Api.Auth.Tests.dll (net7.0) -13:32:35.636 | V | Test | Telemetry.OnTargetSucceeded (0) -13:32:35.636 | V | Test | EventInvoker.OnTargetSucceeded (-3.4028235E+38) -13:32:35.637 | V | Publish | EventInvoker.OnTargetRunning (-3.4028235E+38) -13:32:35.640 | I | Publish | > /usr/bin/dotnet publish /home/rob/Code/Api.Auth/src/Robware.Api.Auth/Robware.Api.Auth.csproj --configuration Debug --output /home/rob/Code/Api.Auth/output -13:32:35.784 | D | Publish | MSBuild version 17.5.0-preview-23061-01+040e2a90e for .NET -13:32:36.162 | D | Publish | Determining projects to restore... -13:32:36.495 | D | Publish | All projects are up-to-date for restore. -13:32:36.679 | D | Publish | Robware.Auth -> /home/rob/Code/Api.Auth/src/Robware.Auth/bin/Debug/net7.0/Robware.Auth.dll -13:32:36.807 | D | Publish | Robware.Data -> /home/rob/Code/Api.Auth/src/Robware.Data/bin/Debug/net7.0/Robware.Data.dll -13:32:36.931 | D | Publish | Robware.Api.Auth -> /home/rob/Code/Api.Auth/src/Robware.Api.Auth/bin/Debug/net7.0/Robware.Api.Auth.dll -13:32:36.975 | D | Publish | Robware.Api.Auth -> /home/rob/Code/Api.Auth/output/ -13:32:36.996 | V | Publish | Telemetry.OnTargetSucceeded (0) -13:32:36.996 | V | Publish | EventInvoker.OnTargetSucceeded (-3.4028235E+38) diff --git a/Dockerfile b/Dockerfile index a5d8b60..ac6cff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env WORKDIR /app COPY . ./ RUN ./build.sh -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:9.0 WORKDIR /app COPY --from=build-env /app/output . ENTRYPOINT ["dotnet", "Robware.Api.Auth.dll"] diff --git a/build/Build.cs b/build/Build.cs index 08be55f..7634073 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -4,7 +4,7 @@ using Nuke.Common.IO; using Nuke.Common.ProjectModel; using Nuke.Common.Tools.DotNet; using Nuke.Common.Utilities.Collections; -using static Nuke.Common.IO.FileSystemTasks; +// using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; [UnsetVisualStudioEnvironmentVariables] @@ -23,8 +23,8 @@ class Build : NukeBuild { Target Clean => _ => _ .Before(Restore) .Executes(() => { - SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory); - EnsureCleanDirectory(OutputDirectory); + // SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory); + // EnsureCleanDirectory(OutputDirectory); }); Target Restore => _ => _ @@ -58,4 +58,4 @@ class Build : NukeBuild { .SetConfiguration(Configuration) .SetOutput(OutputDirectory)); }); -} +} \ No newline at end of file diff --git a/build/_build.csproj b/build/_build.csproj index b801670..f28764a 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net9.0 false False @@ -11,7 +11,7 @@ - + diff --git a/src/Robware.Api.Auth.Tests/Robware.Api.Auth.Tests.csproj b/src/Robware.Api.Auth.Tests/Robware.Api.Auth.Tests.csproj index 3ce1b6b..09a05ea 100644 --- a/src/Robware.Api.Auth.Tests/Robware.Api.Auth.Tests.csproj +++ b/src/Robware.Api.Auth.Tests/Robware.Api.Auth.Tests.csproj @@ -1,18 +1,24 @@ - net7.0 + net9.0 false - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Robware.Api.Auth/Robware.Api.Auth.csproj b/src/Robware.Api.Auth/Robware.Api.Auth.csproj index 59b709e..1b00e8d 100644 --- a/src/Robware.Api.Auth/Robware.Api.Auth.csproj +++ b/src/Robware.Api.Auth/Robware.Api.Auth.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 @@ -10,7 +10,7 @@ - + diff --git a/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj b/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj index a4274fb..c516a59 100644 --- a/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj +++ b/src/Robware.Auth.Tests/Robware.Auth.Tests.csproj @@ -1,22 +1,28 @@ - net7.0 + net9.0 false - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - \ No newline at end of file + diff --git a/src/Robware.Auth/Robware.Auth.csproj b/src/Robware.Auth/Robware.Auth.csproj index 8268829..1f059d7 100644 --- a/src/Robware.Auth/Robware.Auth.csproj +++ b/src/Robware.Auth/Robware.Auth.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 diff --git a/src/Robware.Data/Robware.Data.csproj b/src/Robware.Data/Robware.Data.csproj index 8995485..bbb3e4b 100644 --- a/src/Robware.Data/Robware.Data.csproj +++ b/src/Robware.Data/Robware.Data.csproj @@ -1,11 +1,11 @@ - net7.0 + net9.0 - +