diff --git a/.github/dependabot.yml b/.github/dependabot.yml index afb7378..33dc20f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,9 @@ updates: target-branch: "dev" schedule: interval: "weekly" + ignore: + - dependency-name: "System.ServiceModel.*" + update-types: [ "version-update:semver-major" ] - package-ecosystem: "docker" directory: "/" target-branch: "dev" @@ -14,4 +17,4 @@ updates: directory: "/" target-branch: "dev" schedule: - interval: "weekly" \ No newline at end of file + interval: "weekly" diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b416404..48a3e70 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Login to Docker Hub uses: docker/login-action@v3 diff --git a/WsdScanService.Common/WsdScanService.Common.csproj b/WsdScanService.Common/WsdScanService.Common.csproj index 62a4c83..158a90c 100644 --- a/WsdScanService.Common/WsdScanService.Common.csproj +++ b/WsdScanService.Common/WsdScanService.Common.csproj @@ -1,13 +1,13 @@  - net9.0 WsdScanService.Common enable enable + net10.0 - + diff --git a/WsdScanService.Contracts/WsdScanService.Contracts.csproj b/WsdScanService.Contracts/WsdScanService.Contracts.csproj index 80f02b1..228c51b 100644 --- a/WsdScanService.Contracts/WsdScanService.Contracts.csproj +++ b/WsdScanService.Contracts/WsdScanService.Contracts.csproj @@ -1,24 +1,25 @@ - - net9.0 - enable - enable - - - - - - - - - - - - - - - - - + + net10.0 + enable + enable + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WsdScanService.Discovery/WsdScanService.Discovery.csproj b/WsdScanService.Discovery/WsdScanService.Discovery.csproj index 3b64131..4eee6fe 100644 --- a/WsdScanService.Discovery/WsdScanService.Discovery.csproj +++ b/WsdScanService.Discovery/WsdScanService.Discovery.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable @@ -10,6 +10,7 @@ + diff --git a/WsdScanService.Host/WsdScanService.Host.csproj b/WsdScanService.Host/WsdScanService.Host.csproj index 8bf65a2..c1a05a7 100644 --- a/WsdScanService.Host/WsdScanService.Host.csproj +++ b/WsdScanService.Host/WsdScanService.Host.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 enable enable Linux @@ -20,9 +20,6 @@ - - - diff --git a/WsdScanService.Scanner/WsdScanService.Scanner.csproj b/WsdScanService.Scanner/WsdScanService.Scanner.csproj index 8381ef6..05a4c1c 100644 --- a/WsdScanService.Scanner/WsdScanService.Scanner.csproj +++ b/WsdScanService.Scanner/WsdScanService.Scanner.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable @@ -15,6 +15,7 @@ + diff --git a/docker/Dockerfile b/docker/Dockerfile index 9833347..f58ed35 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,11 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY . . RUN dotnet restore RUN dotnet publish -c $BUILD_CONFIGURATION -o /app/out /p:UseAppHost=false -FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine +FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine ARG USER_ID=1000 ARG GROUP_ID=1000 ARG USER_NAME=wsdscan