diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 51dad167..cf61cb8a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,16 @@ updates: schedule: interval: daily time: "04:00" - open-pull-requests-limit: 10 + groups: + xunit: + patterns: + - "xunit" + - "xunit.runner.visualstudio" + nuget: + patterns: + - "NuGet.Packaging.Core" + - "NuGet.Protocol" + open-pull-requests-limit: 25 - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 9b2be940..25b45aed 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -66,10 +66,10 @@ jobs: lfs: true submodules: true - - uses: azure/docker-login@v1 + - uses: docker/login-action@v3.2.0 name: Docker login github packages with: - login-server: ghcr.io + registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.SNAPX_DOCKER_READ_PAT }} diff --git a/build.ps1 b/build.ps1 index ec74176c..b34299ed 100644 --- a/build.ps1 +++ b/build.ps1 @@ -8,7 +8,7 @@ param( [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)] [string] $DockerImageName = "snapx", [Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)] - [string] $DockerVersion = "32.0", + [string] $DockerVersion = "33.0", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] diff --git a/docker/Dockerfile b/docker/Dockerfile index f4a0f899..8c00fc34 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,9 +3,9 @@ FROM ubuntu:20.04 as env-build ENV DEBIAN_FRONTEND=noninteractive ENV SNAPX_DOCKER_WORKING_DIR /build/snapx -ARG DOTNET_60_SDK_VERSION=6.0.421 -ARG DOTNET_70_SDK_VERSION=7.0.408 -ARG DOTNET_80_SDK_VERSION=8.0.204 +ARG DOTNET_60_SDK_VERSION=6.0.422 +ARG DOTNET_70_SDK_VERSION=7.0.409 +ARG DOTNET_80_SDK_VERSION=8.0.300 ARG DOTNET_RID=linux-x64 diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 387d4250..f5cc34ac 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,7 +1,7 @@ true - 11.0.5 + 11.0.10 @@ -14,19 +14,19 @@ - - + + - - - - - + + + + + - - - - + + + +