Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/nuget/develop/NunitXml.TestLog…
Browse files Browse the repository at this point in the history
…ger-5.0.0
  • Loading branch information
JFriel authored Jan 6, 2025
2 parents a8b7070 + 188afdb commit 29b8a03
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0
- name: Populate Databases.yaml
shell: bash
run: |
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0
- name: Populate Databases.yaml
shell: bash
run: |
Expand Down Expand Up @@ -154,13 +154,13 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0
- name: Determine RDMP build version
id: version
shell: bash
run: perl -ne "print \"rdmpversion=\$1\n\" if /AssemblyInformationalVersion\(\"([0-9a-z.-]+)\"\)/;" SharedAssemblyInfo.cs >> $GITHUB_OUTPUT
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0
with:
dotnet-version: 7.0.x
- name: BundleSource
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
path: ${{ github.workspace }}/
key: ${{ github.sha }}-your-cache-key-bundled
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0
- name: Determine RDMP build version
id: version
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
submodules: true
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.2.0
with:
dotnet-version: 6.0.x
- name: Cache Nuget
Expand Down
18 changes: 9 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageVersion Include="AWSSDK.S3" Version="3.7.410.6" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.13" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.64" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.64" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.411" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.21" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.72" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.72" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Equ" Version="2.3.0" />
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
Expand All @@ -16,7 +16,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Minio" Version="6.0.3" />
<PackageVersion Include="Minio" Version="6.0.4" />
<PackageVersion Include="MongoDB.Driver" Version="3.1.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NPOI" Version="2.7.2" />
Expand All @@ -27,22 +27,22 @@
<PackageVersion Include="SSH.NET" Version="2024.2.0" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="Terminal.Gui" Version="1.17.1" />
<PackageVersion Include="YamlDotNet" Version="16.2.1" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
<PackageVersion Include="ConsoleControl" Version="1.3.0" />
<PackageVersion Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
<PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" />
<PackageVersion Include="WeCantSpell.Hunspell" Version="5.2.1" />
<PackageVersion Include="NUnit" Version="4.3.0" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="ObjectListView.Repack.NET6Plus" Version="2.9.5" />
<PackageVersion Include="Scintilla.NET" Version="5.3.2.9" />
<PackageVersion Include="System.Resources.Extensions" Version="9.0.0" />
<PackageVersion Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16" />
<PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.4.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.5.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
</ItemGroup>
</Project>

0 comments on commit 29b8a03

Please sign in to comment.