Skip to content

Commit

Permalink
Merge pull request #179 from HicServices/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jas88 authored Dec 19, 2022
2 parents 53a2da5 + ad64a59 commit 50b609b
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 49 deletions.
5 changes: 0 additions & 5 deletions .lgtm.yml

This file was deleted.

21 changes: 17 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

## [4.0.2] - 2022-12-19

### Changed

- Add information on problematic tag to exception in `GetValueFromDatasetWithMultiplicity`
- Now targets .Net Standard 2.1 and 6.0 instead of Standard 2.0
- Add information on problematic tag to exception in `GetValueFromDatasetWithMultiplicity`

### Dependencies

- Bump HIC.FansiSql from 2.0.4 to 3.0.1
- Bump MongoDB.Driver from 2.15.1 to 2.18.0
- Bump Newtonsoft.Json from 13.0.1 to 13.0.2
- Bump NLog from 5.0.5 to 5.1.0
- Bump YamlDotNet from 12.0.2 to 12.3.1


### [4.0.1] - 2022-06-06
## [4.0.1] - 2022-06-06

### Changed

Expand All @@ -28,7 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0


### [4.0.0] - 2022-03-21
## [4.0.0] - 2022-03-21

- Now using fo-dicom 5, some API changes

Expand Down Expand Up @@ -228,7 +240,8 @@ Initial commit of code from old SMIPlugin repo
- Rake build scripts for CI


[Unreleased]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.1...develop
[Unreleased]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.2...develop
[4.0.2]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.1..4.0.2
[4.0.1]: https://github.com/HicServices/DicomTypeTranslation/compare/4.0.0..4.0.1
[4.0.0]: https://github.com/HicServices/DicomTypeTranslation/compare/3.0.0..4.0.0
[3.0.0]: https://github.com/HicServices/DicomTypeTranslation/compare/2.3.2..3.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions DicomTypeTranslation/DicomTypeTranslation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PackageReference Include="HIC.FAnsiSql" Version="3.0.1" />
<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.0.5" />
<PackageReference Include="YamlDotNet" Version="12.0.2" />
<PackageReference Include="NLog" Version="5.1.0" />
<PackageReference Include="YamlDotNet" Version="12.3.1" />
</ItemGroup>
</Project>
29 changes: 0 additions & 29 deletions DicomTypeTranslation/HIC.DicomTypeTranslation.nuspec

This file was deleted.

6 changes: 3 additions & 3 deletions SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
[assembly: AssemblyCulture("")]

// These should be overwritten by release builds
[assembly: AssemblyVersion("4.0.1")]
[assembly: AssemblyFileVersion("4.0.1")]
[assembly: AssemblyInformationalVersion("4.0.1")]
[assembly: AssemblyVersion("4.0.2")]
[assembly: AssemblyFileVersion("4.0.2")]
[assembly: AssemblyInformationalVersion("4.0.2")]
5 changes: 0 additions & 5 deletions lgtm.yml

This file was deleted.

0 comments on commit 50b609b

Please sign in to comment.