Skip to content

Commit 9a2388d

Browse files
milkshakeukmilkshakeuk
committed
Bump package versions to 3.2.4 and update dependencies in nuspec and project files
- remove direct dependency on nhapi.base since there is a transitive dependency from the nhapi.model.* dependencies. - fix unit test to work between linux and windows - update local build scripts default.ps1 to work on linux and windows
1 parent a3531a2 commit 9a2388d

File tree

20 files changed

+78
-58
lines changed

20 files changed

+78
-58
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ All notable changes to this project will be documented in this file.
88

99
## Previous Releases
1010

11+
## [3.2.4] - 2025-04-09
12+
13+
If you reference the single nHapi nuget metapackage then this release is purely superficial and does not add anything, if you reference individual nHapi model packages then this brings you the same fix as the previous release.
14+
15+
### Other
16+
17+
- Updates individual model nuget packages to depend on the `nhapi.base` `3.2.3` which contains the transitive dependency security vulnerability fix
18+
- Removes direct reference to `nhapi.base` form the nHapi metapackage as there is already a transitive reference from the `nhapi.model.*` dependencies.
19+
20+
By @milkshakeuk
21+
1122
## [3.2.3] - 2025-04-07
1223

1324
This release fixes a security vulnerability with a transitive dependency.

‎build/.nuget/packages.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit.Runners" version="2.6.4" />
4-
<package id="psake" version="4.4.1" />
3+
<package id="NUnit.Runners" version="3.10.0" />
4+
<package id="NUnit.ConsoleRunner" version="3.20.0" />
5+
<package id="psake" version="4.9.0" />
56
</packages>

‎build/BuildAndPackage.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Import-Module .\packages\psake.4.4.1\tools\psake.psm1
1+
Import-Module .\packages\psake.4.9.0\tools\psake\psake.psm1
22
Invoke-psake .\default.ps1 Package

‎build/default.ps1‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
properties {
2-
$projectName = "NHapi20"
32
$unitTestAssembly = "NHapi.NUnit.dll"
43
$projectConfig = "Release"
5-
$base_dir = resolve-path .\
4+
$base_dir = ".\"
65
$test_dir = "$base_dir\..\tests\NHapi.NUnit\bin\$projectConfig"
7-
$nunitPath = "$base_dir\packages\NUnit.ConsoleRunner.3.10.0\tools"
8-
$projects = (
6+
$nunitPath = "$base_dir\packages\NUnit.ConsoleRunner.3.20.0\tools"
7+
$projects = @(
98
"NHapi.Base",
109
"NHapi.Model.V21",
1110
"NHapi.Model.V22",
@@ -36,7 +35,7 @@ Task Clean {
3635
}
3736

3837
Task Build -depends Clean {
39-
Write-Output "Building nHapi.sln" -ForegroundColor Green
38+
Write-Output "Building nHapi.sln" -ForegroundColor Green
4039
Exec { dotnet build "..\nHapi.sln" -c $projectConfig -v q }
4140
}
4241

@@ -58,14 +57,16 @@ Task BuildModels {
5857

5958
task Test {
6059
# the below nunit runner runs against dotnet framework 461
61-
exec {
62-
& $nunitPath\nunit3-console.exe $test_dir\net462\$unitTestAssembly --result="$base_dir\TestResult.xml;format=nunit2"
63-
}
60+
if ($IsWindows -eq $null -Or $IsWindows){
61+
exec {
62+
& $nunitPath\nunit3-console.exe $test_dir\net462\$unitTestAssembly --result="$base_dir\TestResult.xml;format=nunit3"
63+
}
64+
}
6465

6566
# TODO: Move to using dotnet test to execute the unit tests
6667
# the below works however the output format needs to be tweeked.
67-
exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
6868
exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
69+
exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net462 --no-restore --no-build }
6970
exec { dotnet test ..\tests\NHapi.NUnit.SourceGeneration\NHapi.NUnit.SourceGeneration.csproj --results-directory TestResults -c Release -f net8.0 --no-restore --no-build }
7071
exec { dotnet test ..\tests\NHapi.NUnit\NHapi.NUnit.csproj --results-directory TestResults -c Release -f net8.0 --no-restore --no-build }
7172
exec { dotnet test ..\tests\NHapi.Base.NUnit\NHapi.Base.NUnit.csproj --results-directory TestResults -c Release -f net8.0 --no-restore --no-build }
@@ -83,7 +84,7 @@ Task Package -depends Build {
8384
}
8485

8586
$commit = (git rev-parse --verify HEAD)
86-
$nuspec = ".\nHapi.v3.nuspec"
87+
$nuspec = "nHapi.v3.nuspec"
8788

8889
(Get-Content $nuspec).Replace('commit=""', 'commit="' + $commit + '"') | Set-Content $nuspec
8990

@@ -92,7 +93,13 @@ Task Package -depends Build {
9293
New-Item -ItemType file -Path ..\dist\net35 -Name _._
9394
New-Item -ItemType file -Path ..\dist\netstandard2.0 -Name _._
9495

95-
Exec { .nuget\nuget pack $nuspec -OutputDirectory ..\dist }
96+
if ($IsWindows -eq $null -Or $IsWindows){
97+
Exec { .nuget\NuGet.exe pack $nuspec -OutputDirectory ..\dist }
98+
}
99+
else
100+
{
101+
Exec { mono .nuget/NuGet.exe pack $nuspec -OutputDirectory "../dist" }
102+
}
96103

97104
(Get-Content $nuspec).Replace('commit="' + $commit + '"', 'commit=""') | Set-Content $nuspec
98105
}

‎build/nHapi.v3.nuspec‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
<id>nhapi</id>
5-
<version>3.2.3</version>
5+
<version>3.2.4</version>
66
<authors>Chad Chenoweth,Duane Edwards,Jake Aitchison</authors>
77
<license type="expression">MPL-2.0</license>
88
<projectUrl>https://github.com/nHapiNET/nHapi</projectUrl>
@@ -14,40 +14,38 @@ NHapi allows Microsoft .NET developers to easily use an HL7 2.x object model. Th
1414
This project is NOT affiliated with the HL7 organization. This software just conforms to the HL7 2.x specifications.
1515

1616
This nuget package is just a metapackage for conveniance.</description>
17-
<releaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.2.3</releaseNotes>
17+
<releaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v3.2.4</releaseNotes>
1818
<tags>HL7 ER7 XML parsing healthcare HAPI</tags>
1919
<repository type="git" url="https://github.com/nHapiNET/nHapi.git" commit=""/>
2020
<readme>docs\README.md</readme>
2121
<dependencies>
2222
<group targetFramework=".NETFramework3.5">
23-
<dependency id="nhapi.base" version="3.2.3" exclude="Build,Analyzers" />
24-
<dependency id="nhapi.model.v21" version="3.2.0" exclude="Build,Analyzers" />
25-
<dependency id="nhapi.model.v22" version="3.2.0" exclude="Build,Analyzers" />
26-
<dependency id="nhapi.model.v23" version="3.2.0" exclude="Build,Analyzers" />
27-
<dependency id="nhapi.model.v24" version="3.2.0" exclude="Build,Analyzers" />
28-
<dependency id="nhapi.model.v25" version="3.2.0" exclude="Build,Analyzers" />
29-
<dependency id="nhapi.model.v26" version="3.2.0" exclude="Build,Analyzers" />
30-
<dependency id="nhapi.model.v27" version="3.2.0" exclude="Build,Analyzers" />
31-
<dependency id="nhapi.model.v28" version="3.2.0" exclude="Build,Analyzers" />
32-
<dependency id="nhapi.model.v231" version="3.2.0" exclude="Build,Analyzers" />
33-
<dependency id="nhapi.model.v251" version="3.2.0" exclude="Build,Analyzers" />
34-
<dependency id="nhapi.model.v271" version="3.2.0" exclude="Build,Analyzers" />
35-
<dependency id="nhapi.model.v281" version="3.2.0" exclude="Build,Analyzers" />
23+
<dependency id="nhapi.model.v21" version="3.2.3" exclude="Build,Analyzers" />
24+
<dependency id="nhapi.model.v22" version="3.2.3" exclude="Build,Analyzers" />
25+
<dependency id="nhapi.model.v23" version="3.2.3" exclude="Build,Analyzers" />
26+
<dependency id="nhapi.model.v24" version="3.2.3" exclude="Build,Analyzers" />
27+
<dependency id="nhapi.model.v25" version="3.2.3" exclude="Build,Analyzers" />
28+
<dependency id="nhapi.model.v26" version="3.2.3" exclude="Build,Analyzers" />
29+
<dependency id="nhapi.model.v27" version="3.2.3" exclude="Build,Analyzers" />
30+
<dependency id="nhapi.model.v28" version="3.2.3" exclude="Build,Analyzers" />
31+
<dependency id="nhapi.model.v231" version="3.2.3" exclude="Build,Analyzers" />
32+
<dependency id="nhapi.model.v251" version="3.2.3" exclude="Build,Analyzers" />
33+
<dependency id="nhapi.model.v271" version="3.2.3" exclude="Build,Analyzers" />
34+
<dependency id="nhapi.model.v281" version="3.2.3" exclude="Build,Analyzers" />
3635
</group>
3736
<group targetFramework=".NETStandard2.0">
38-
<dependency id="nhapi.base" version="3.2.3" exclude="Build,Analyzers" />
39-
<dependency id="nhapi.model.v21" version="3.2.0" exclude="Build,Analyzers" />
40-
<dependency id="nhapi.model.v22" version="3.2.0" exclude="Build,Analyzers" />
41-
<dependency id="nhapi.model.v23" version="3.2.0" exclude="Build,Analyzers" />
42-
<dependency id="nhapi.model.v24" version="3.2.0" exclude="Build,Analyzers" />
43-
<dependency id="nhapi.model.v25" version="3.2.0" exclude="Build,Analyzers" />
44-
<dependency id="nhapi.model.v26" version="3.2.0" exclude="Build,Analyzers" />
45-
<dependency id="nhapi.model.v27" version="3.2.0" exclude="Build,Analyzers" />
46-
<dependency id="nhapi.model.v28" version="3.2.0" exclude="Build,Analyzers" />
47-
<dependency id="nhapi.model.v231" version="3.2.0" exclude="Build,Analyzers" />
48-
<dependency id="nhapi.model.v251" version="3.2.0" exclude="Build,Analyzers" />
49-
<dependency id="nhapi.model.v271" version="3.2.0" exclude="Build,Analyzers" />
50-
<dependency id="nhapi.model.v281" version="3.2.0" exclude="Build,Analyzers" />
37+
<dependency id="nhapi.model.v21" version="3.2.3" exclude="Build,Analyzers" />
38+
<dependency id="nhapi.model.v22" version="3.2.3" exclude="Build,Analyzers" />
39+
<dependency id="nhapi.model.v23" version="3.2.3" exclude="Build,Analyzers" />
40+
<dependency id="nhapi.model.v24" version="3.2.3" exclude="Build,Analyzers" />
41+
<dependency id="nhapi.model.v25" version="3.2.3" exclude="Build,Analyzers" />
42+
<dependency id="nhapi.model.v26" version="3.2.3" exclude="Build,Analyzers" />
43+
<dependency id="nhapi.model.v27" version="3.2.3" exclude="Build,Analyzers" />
44+
<dependency id="nhapi.model.v28" version="3.2.3" exclude="Build,Analyzers" />
45+
<dependency id="nhapi.model.v231" version="3.2.3" exclude="Build,Analyzers" />
46+
<dependency id="nhapi.model.v251" version="3.2.3" exclude="Build,Analyzers" />
47+
<dependency id="nhapi.model.v271" version="3.2.3" exclude="Build,Analyzers" />
48+
<dependency id="nhapi.model.v281" version="3.2.3" exclude="Build,Analyzers" />
5149
</group>
5250
</dependencies>
5351
</metadata>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.204",
3+
"version": "8.0.408",
44
"rollForward": "latestFeature"
55
},
66
"projects": []

‎src/Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<RepositoryType>git</RepositoryType>
99
<PackageTags>HL7;ER7;XML;parsing;healthcare;HAPI</PackageTags>
1010
<PackageReleaseNotes>https://github.com/nHapiNET/nHapi/releases/tag/v$(Version)</PackageReleaseNotes>
11-
<PackageReadmeFile>docs\README.md</PackageReadmeFile>
11+
<PackageReadmeFile>docs/README.md</PackageReadmeFile>
1212
</PropertyGroup>
1313

1414
<!-- Common Packed Files -->
1515
<ItemGroup Condition=" '$(IsPackable)' == 'true' And '$(IncludeCommonPackageInfo)' == 'true' ">
16-
<None Include="..\..\README.md" Pack="true" PackagePath="\docs\" />
16+
<None Include="../../README.md" Pack="true" PackagePath="/docs/" />
1717
</ItemGroup>
1818

1919
<!-- Common Assembly Attributes -->

‎src/NHapi.Model.V21/NHapi.Model.V21.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<PackageId>nhapi.model.v21</PackageId>
7-
<Version>3.2.0</Version>
7+
<Version>3.2.4</Version>
88
<PackageDescription>Contains the data types, segments, and messages that follow the HL7 2.1 schema.</PackageDescription>
99
<Description>NHapi Model V.2.1</Description>
1010
<IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>

‎src/NHapi.Model.V22/NHapi.Model.V22.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<PackageId>nhapi.model.v22</PackageId>
7-
<Version>3.2.0</Version>
7+
<Version>3.2.4</Version>
88
<PackageDescription>Contains the data types, segments, and messages that follow the HL7 2.2 schema.</PackageDescription>
99
<Description>NHapi Model V.2.2</Description>
1010
<IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>

‎src/NHapi.Model.V23/NHapi.Model.V23.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
55
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
<PackageId>nhapi.model.v23</PackageId>
7-
<Version>3.2.0</Version>
7+
<Version>3.2.4</Version>
88
<PackageDescription>Contains the data types, segments, and messages that follow the HL7 2.3 schema.</PackageDescription>
99
<Description>NHapi Model V.2.3</Description>
1010
<IncludeCommonPackageInfo>true</IncludeCommonPackageInfo>

0 commit comments

Comments
 (0)