Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Grahame Grieve committed Jan 29, 2025
2 parents bd60b01 + 4bfb433 commit d2ab5ba
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 21 deletions.
8 changes: 4 additions & 4 deletions install/install-tk.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
; AppID can never be changed as subsequent installations require the same installation ID each time
AppID=FHIRToolkit
AppName=Health Intersections FHIR Toolkit
AppVerName=FHIRToolkit v3.4.38
AppVerName=FHIRToolkit v3.4.39

; compilation control
OutputDir=..\install\build
OutputBaseFilename=fhirtoolkit-win64-3.4.38
OutputBaseFilename=fhirtoolkit-win64-3.4.39
Compression=lzma2/ultra64

; 64 bit
Expand All @@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall
; win2000+ add/remove programs support
AppPublisher=Health Intersections P/L
AppPublisherURL=http://www.healthintersections.com.au
AppVersion=3.4.38
AppVersion=3.4.39
AppSupportURL=https://github.com/grahamegrieve/fhirserver
AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
VersionInfoVersion=3.4.38.0
VersionInfoVersion=3.4.39.0

; dialog support
LicenseFile=..\license
Expand Down
8 changes: 4 additions & 4 deletions install/install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
; AppID can never be changed as subsequent installations require the same installation ID each time
AppID=FHIRServer
AppName=Health Intersections FHIR Server
AppVerName=FHIRServer v3.4.38
AppVerName=FHIRServer v3.4.39

; compilation control
OutputDir=..\install\build
OutputBaseFilename=fhirserver-win64-3.4.38
OutputBaseFilename=fhirserver-win64-3.4.39
Compression=lzma2/ultra64

; 64 bit
Expand All @@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall
; win2000+ add/remove programs support
AppPublisher=Health Intersections P/L
AppPublisherURL=http://www.healthintersections.com.au
AppVersion=3.4.38
AppVersion=3.4.39
AppSupportURL=https://github.com/grahamegrieve/fhirserver
AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
VersionInfoVersion=3.4.38.0
VersionInfoVersion=3.4.39.0

; dialog support
LicenseFile=..\license
Expand Down
6 changes: 3 additions & 3 deletions library/version.inc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FHIR_CODE_FULL_VERSION = '3.4.39-SNAPSHOT';
FHIR_CODE_RELEASE_DATE = '2025-01-12';
FHIR_CODE_RELEASE_DATETIME = '20250112192355.498Z';
FHIR_CODE_FULL_VERSION = '3.4.40-SNAPSHOT';
FHIR_CODE_RELEASE_DATE = '2025-01-27';
FHIR_CODE_RELEASE_DATETIME = '20250127064928.849Z';
5 changes: 2 additions & 3 deletions release-notes.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
## Change Notes:

* Fix language specific display validation to consider lenient-display-mode
* Return message id in issue where possible
*

## Conformance Notes:

* tx.fhir.org passed 297 HL7 terminology service tests (mode 'tx.fhir.org', tests v1.7.2, runner v6.5.5)
*
2 changes: 1 addition & 1 deletion server/fhirconsole.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<VersionInfo>
<MajorVersionNr Value="3"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="38"/>
<RevisionNr Value="39"/>
<Attributes pvaDebug="False"/>
</VersionInfo>
<BuildModes Count="8">
Expand Down
4 changes: 2 additions & 2 deletions server/fhirserver.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_MajorVer>3</VerInfo_MajorVer>
<VerInfo_MinorVer>4</VerInfo_MinorVer>
<VerInfo_Release>38</VerInfo_Release>
<VerInfo_Release>39</VerInfo_Release>
<VerInfo_Debug>false</VerInfo_Debug>
</PropertyGroup>
<PropertyGroup Condition="&apos;$(Base_Win32)&apos;!=&apos;&apos;">
Expand Down Expand Up @@ -167,7 +167,7 @@
<DCC_RangeChecking>true</DCC_RangeChecking>
<DCC_DebugDCUs>false</DCC_DebugDCUs>
<VerInfo_MajorVer>3</VerInfo_MajorVer>
<VerInfo_Release>38</VerInfo_Release>
<VerInfo_Release>39</VerInfo_Release>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
<VerInfo_MinorVer>4</VerInfo_MinorVer>
<VerInfo_Debug>false</VerInfo_Debug>
Expand Down
6 changes: 3 additions & 3 deletions server/fhirserver.lpi
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="12"/>
Expand All @@ -20,7 +19,8 @@
<UseVersionInfo Value="True"/>
<MajorVersionNr Value="3"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="37"/>
<RevisionNr Value="39"/>
<Attributes pvaDebug="False"/>
</VersionInfo>
<BuildModes Count="8">
<Item1 Name="default" Default="True"/>
Expand Down Expand Up @@ -1017,7 +1017,7 @@
<Name Value="EPackageCrawlerException"/>
</Item50>
<Item51>
<Name Value="&lt;Unknown Class>"/>
<Name Value="&lt;Unknown Class&gt;"/>
</Item51>
<Item52>
<Name Value="EDateFormatError"/>
Expand Down
2 changes: 1 addition & 1 deletion toolkit2/fhirtoolkit.lpi
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<UseVersionInfo Value="True"/>
<MajorVersionNr Value="3"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="38"/>
<RevisionNr Value="39"/>
<Attributes pvaDebug="False"/>
</VersionInfo>
<BuildModes>
Expand Down

0 comments on commit d2ab5ba

Please sign in to comment.