Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
peters committed Oct 12, 2022
2 parents 5ea68d9 + f214263 commit 030f0fc
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
password: ${{ secrets.SNAPX_DOCKER_READ_PAT }}

- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3.0.1
with:
dotnet-version: |
${{ env.DOTNET_NET60_VERSION }}
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
submodules: true

- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3.0.1
with:
dotnet-version: |
${{ env.DOTNET_NET60_VERSION }}
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
#

# - name: Setup .NET
# uses: actions/setup-dotnet@v2
# uses: actions/setup-dotnet@v3.0.1
# with:
# dotnet-version: |
# ${{ env.DOTNET_NET60_VERSION }}
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:
path: ${{ github.workspace }}

- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3.0.1
with:
dotnet-version: |
${{ env.DOTNET_NET60_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion src/Snap.Installer.Tests/Snap.Installer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="System.CodeDom" Version="6.0.0" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Snap.Installer/Snap.Installer.Deps.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<PackageReference Include="LightInject" Version="6.5.2" />
<PackageReference Include="LightInject" Version="6.6.1" />
<PackageReference Include="NLog" Version="5.0.4" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Snap.Shared.Tests/Snap.Shared.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="Moq" Version="4.18.2" />
Expand Down
2 changes: 1 addition & 1 deletion src/Snap.Tests/Snap.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="System.CodeDom" Version="6.0.0" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions src/Snap/Snap.Deps.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<ItemGroup>
<PackageReference Include="Jetbrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
<PackageReference Include="Mono.Cecil" Version="0.11.4"/>
<PackageReference Include="YamlDotNet" Version="12.0.0"/>
<PackageReference Include="YamlDotNet" Version="12.0.2"/>
<PackageReference Include="SharpCompress" Version="0.32.2"/>
<PackageReference Include="MessagePack" Version="2.4.35" />
<PackageReference Include="NuGet.Packaging.Core" Version="6.3.0" />
<PackageReference Include="NuGet.Protocol" Version="6.3.0"/>
<PackageReference Include="NuGet.Packaging.Core" Version="6.3.1" />
<PackageReference Include="NuGet.Protocol" Version="6.3.1"/>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Snapx.Tests/Snapx.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="System.CodeDom" Version="6.0.0" />
<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Snapx/Snapx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="ServiceStack.HttpClient" Version="6.3.0" />
<PackageReference Include="ServiceStack.HttpClient" Version="6.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 030f0fc

Please sign in to comment.