From b4abbfa2c64d6176b7d97c55ae8aa2a04b1a925c Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Mon, 9 Dec 2024 14:02:19 -0800 Subject: [PATCH 1/2] Upgrade to .net 9.x - Include .net dependency upgrades recommended by dependabot. Signed-off-by: Wade Barnes --- api/api.csproj | 18 +++++++++--------- db/db.csproj | 8 ++++---- docker/api/Dockerfile.dev | 2 +- docker/api/Dockerfile.release | 4 ++-- docker/docker-compose.yaml | 14 +++++++------- docker/manage | 2 +- jc-interface-client/jc-interface-client.csproj | 4 ++-- pcss-client/pcss-client.csproj | 2 +- tests/tests.csproj | 6 +++--- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/api/api.csproj b/api/api.csproj index 5505cd4b..d01594d3 100644 --- a/api/api.csproj +++ b/api/api.csproj @@ -1,34 +1,34 @@  - net8.0 + net9.0 Scv.Api de959767-ede6-4f8a-b6b9-d36aed703396 - bin\$(Configuration)\net8.0\api.xml + bin\$(Configuration)\net9.0\api.xml 1701;1702;1591 1701;1702;1591 - bin\$(Configuration)\net8.0\api.xml + bin\$(Configuration)\net9.0\api.xml - - - + + + - + - + @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/db/db.csproj b/db/db.csproj index 3653e81f..020b245a 100644 --- a/db/db.csproj +++ b/db/db.csproj @@ -1,18 +1,18 @@ - net8.0 + net9.0 Scv.Db - + - + - \ No newline at end of file + diff --git a/docker/api/Dockerfile.dev b/docker/api/Dockerfile.dev index 0d4f88c3..5a76caf2 100644 --- a/docker/api/Dockerfile.dev +++ b/docker/api/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 +FROM mcr.microsoft.com/dotnet/sdk:9.0 ENV ASPNETCORE_ENVIRONMENT='Production' ENV ASPNETCORE_URLS='http://+:5000' diff --git a/docker/api/Dockerfile.release b/docker/api/Dockerfile.release index 0089b4f8..becb051b 100644 --- a/docker/api/Dockerfile.release +++ b/docker/api/Dockerfile.release @@ -1,5 +1,5 @@ # Dockerfile used by Github Action -ARG dotnet_version=8.0 +ARG dotnet_version=9.0 FROM mcr.microsoft.com/dotnet/aspnet:${dotnet_version} AS base WORKDIR /app EXPOSE 8080 @@ -32,4 +32,4 @@ FROM base AS final # copy app WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "api.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "api.dll"] diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 353c0a3f..0703d42d 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -1,7 +1,7 @@ -version: "3.4" +version: '3.4' services: web: - image: "${COMPOSE_PROJECT_NAME}-web" + image: '${COMPOSE_PROJECT_NAME}-web' environment: - API_URL=${API_URL} - USE_SELF_SIGNED_SSL=${USE_SELF_SIGNED_SSL} @@ -15,7 +15,7 @@ services: - api web-dev: - image: "${COMPOSE_PROJECT_NAME}-web-dev" + image: '${COMPOSE_PROJECT_NAME}-web-dev' environment: - API_URL=${API_URL} - WEB_BASE_HREF=${WEB_BASE_HREF} @@ -25,15 +25,15 @@ services: - VITE_PORT=1339 - CHOKIDAR_USEPOLLING=true ports: - - "8080:1339" + - '8080:1339' volumes: - - "${LOCAL_WORKSPACE_FOLDER-..}/web/src:/opt/app-root/src/src" - - "${LOCAL_WORKSPACE_FOLDER-..}/web/package.json:/opt/app-root/src/package.json" + - '${LOCAL_WORKSPACE_FOLDER-..}/web/src:/opt/app-root/src/src' + - '${LOCAL_WORKSPACE_FOLDER-..}/web/package.json:/opt/app-root/src/package.json' depends_on: - api api: - image: "${COMPOSE_PROJECT_NAME}-api" + image: '${COMPOSE_PROJECT_NAME}-api' environment: - ASPNETCORE_URLS=${ASPNETCORE_URLS} - FileServicesClient__Username=${FileServicesClientUsername} diff --git a/docker/manage b/docker/manage index 94818965..e96f3c3b 100755 --- a/docker/manage +++ b/docker/manage @@ -80,7 +80,7 @@ build-api() { echo -e "----------------------------------------------------------------------------------------------------" docker build \ -t "${COMPOSE_PROJECT_NAME}-api" \ - -f './api//Dockerfile.dev' '..' + -f './api/Dockerfile.dev' '..' echo -e "====================================================================================================" } diff --git a/jc-interface-client/jc-interface-client.csproj b/jc-interface-client/jc-interface-client.csproj index 0c6cacb8..6535dd39 100644 --- a/jc-interface-client/jc-interface-client.csproj +++ b/jc-interface-client/jc-interface-client.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net9.0 JCCommon @@ -17,7 +17,7 @@ - + diff --git a/pcss-client/pcss-client.csproj b/pcss-client/pcss-client.csproj index fee4f5ff..322acfcc 100644 --- a/pcss-client/pcss-client.csproj +++ b/pcss-client/pcss-client.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 pcss_client enable enable diff --git a/tests/tests.csproj b/tests/tests.csproj index d69adb9d..e19ffa07 100644 --- a/tests/tests.csproj +++ b/tests/tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 de959767-ede6-4f8a-b6b9-d36aed703396 @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -25,4 +25,4 @@ - \ No newline at end of file + From 35fd9d3327e909f6232091cd6602fa75d3cfd372 Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Mon, 9 Dec 2024 14:09:26 -0800 Subject: [PATCH 2/2] Update build/test workflows to .net 9 Signed-off-by: Wade Barnes --- .github/workflows/build-and-test-api.yml | 2 +- .github/workflows/publish-api.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test-api.yml b/.github/workflows/build-and-test-api.yml index e5a76c5e..81821df5 100644 --- a/.github/workflows/build-and-test-api.yml +++ b/.github/workflows/build-and-test-api.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - dotnet-major-version: [8] + dotnet-major-version: [9] dotnet-minor-version: [0] steps: diff --git a/.github/workflows/publish-api.yml b/.github/workflows/publish-api.yml index 07b3ab14..4358c940 100644 --- a/.github/workflows/publish-api.yml +++ b/.github/workflows/publish-api.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - dotnet-major-version: [8] + dotnet-major-version: [9] dotnet-minor-version: [0] steps: