Skip to content

Commit

Permalink
Merge branch 'master' into is-ident-package-use
Browse files Browse the repository at this point in the history
  • Loading branch information
jas88 committed Mar 30, 2022
2 parents 57be31a + bd05e5b commit b7d4737
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
echo "tessdata_version=$ver" >> $GITHUB_ENV
- name: cache tessdata
id: cache-tessdata
uses: actions/cache@v2.1.7
uses: actions/cache@v3
with:
path: ${{ env.tessdata_path }}
key: 'tessdata|${{ env.tessdata_version }}|v5'
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
run: ./bin/smi/writeDatabaseStrings.py "(localdb)\MSSQLLocalDB" "${{ env.db-password }}"
- name: cache rdmp-cli
id: cache-rdmp-cli
uses: actions/cache@v2.1.7
uses: actions/cache@v3
with:
path: ${{ env.rdmp-cli-dir }}
key: 'rdmp-cli|${{ env.rdmp_cli_ver }}|v1'
Expand Down
8 changes: 4 additions & 4 deletions src/common/Smi.Common/Smi.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
<PackageReference Include="coveralls.io" Version="1.4.2" />
<PackageReference Include="HIC.DicomTypeTranslation" Version="3.0.0" />
<PackageReference Include="HIC.FAnsiSql" Version="2.0.3" />
<PackageReference Include="IsIdentifiable" Version="0.0.3" />
<PackageReference Include="HIC.RDMP.Plugin" Version="7.0.8" />
<PackageReference Include="IsIdentifiable" Version="0.0.3" />
<PackageReference Include="HIC.RDMP.Plugin" Version="7.0.9" />
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog" Version="4.7.14" />
<PackageReference Include="NLog" Version="4.7.15" />
<PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IO.Abstractions" Version="16.1.23" />
<PackageReference Include="System.IO.Abstractions" Version="16.1.25" />
<PackageReference Include="YamlDotNet" Version="11.2.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/common/com.smi.microservices.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.2</version>
<version>2.13.2.2</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="fo-dicom.Drawing" Version="[4.0.8]" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="10.1.0" />
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="11.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
<PackageReference Include="Tesseract" Version="4.1.0-beta1" />
Expand Down
6 changes: 3 additions & 3 deletions tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.10" />
<PackageReference Include="HIC.RDMP.Plugin.Test" Version="7.0.8" />
<PackageReference Include="HIC.RDMP.Plugin.Test" Version="7.0.9" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="16.1.23" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="16.1.25" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\common\Smi.Common\Smi.Common.csproj" />
Expand Down

0 comments on commit b7d4737

Please sign in to comment.