Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/fintermobilityas/snapx i…
Browse files Browse the repository at this point in the history
…nto develop
  • Loading branch information
peters committed May 29, 2024
2 parents daaae92 + 8b126ba commit 8442a4c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 19 deletions.
11 changes: 10 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ jobs:
lfs: true
submodules: true

- uses: azure/docker-login@v1
- uses: docker/login[email protected]
name: Docker login github packages
with:
login-server: ghcr.io
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.SNAPX_DOCKER_READ_PAT }}

Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
24 changes: 12 additions & 12 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<AvaloniaVersion>11.0.5</AvaloniaVersion>
<AvaloniaVersion>11.0.10</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
Expand All @@ -14,19 +14,19 @@
<PackageVersion Include="Jetbrains.Annotations" Version="2023.3.0" />
<PackageVersion Include="LibLog" Version="5.0.8" />
<PackageVersion Include="LightInject" Version="6.6.4" />
<PackageVersion Include="MessagePack" Version="2.5.129" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="MessagePack" Version="2.5.140" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
<PackageVersion Include="Moq" Version="4.20.69" />
<PackageVersion Include="NLog" Version="5.2.6" />
<PackageVersion Include="NuGet.Packaging.Core" Version="6.8.0" />
<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
<PackageVersion Include="SharpCompress" Version="0.34.2" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="NLog" Version="5.3.2" />
<PackageVersion Include="NuGet.Packaging.Core" Version="6.9.1" />
<PackageVersion Include="NuGet.Protocol" Version="6.10.0" />
<PackageVersion Include="SharpCompress" Version="0.37.2" />
<PackageVersion Include="System.CodeDom" Version="8.0.0" />
<PackageVersion Include="System.Security.Permissions" Version="8.0.0" />
<PackageVersion Include="xunit" Version="2.6.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.17" />
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
<PackageVersion Include="xunit" Version="2.8.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.20" />
<PackageVersion Include="YamlDotNet" Version="15.1.4" />
</ItemGroup>
</Project>

0 comments on commit 8442a4c

Please sign in to comment.