Skip to content

Commit

Permalink
Merge branch 'develop' into task/RDMP-276-catalogue-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
JFriel authored Jan 24, 2025
2 parents caffc91 + 276d613 commit 4930b18
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ jobs:
- name: Install Perl dependencies
uses: shogo82148/actions-setup-perl@v1.31.4
uses: shogo82148/actions-setup-perl@v1.32.0
with:
install-modules-with: cpanm
install-modules: Archive::Zip Archive::Tar
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
uses: actions/checkout@v4
- name: setup .NET
uses: actions/[email protected]
with:
global-json-file: global.json
dotnet-version: '6.0.x'

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project>
<ItemGroup>
<PackageVersion Include="AWSSDK.S3" Version="3.7.411.5" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.26" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.77" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.77" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.412.2" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.31" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.82" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.82" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Equ" Version="2.3.0" />
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
<PackageVersion Include="FluentFTP" Version="52.0.0" />
<PackageVersion Include="HIC.SynthEHR" Version="2.0.1" />
<PackageVersion Include="HIC.FAnsiSql" Version="3.2.7" />
<PackageVersion Include="LibArchive.Net" Version="0.1.5" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -36,13 +36,13 @@
<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="System.Resources.Extensions" Version="9.0.1" />
<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.6.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.3" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.101",
"version": "9.0.102",
"rollForward": "minor"
}
}

0 comments on commit 4930b18

Please sign in to comment.