Skip to content

Commit

Permalink
Merge branch 'HealthIntersections:master' into master
Browse files Browse the repository at this point in the history
costateixeira authored Oct 27, 2024

Verified

This commit was signed with the committer’s verified signature.
brotskydotcom Daniel Brotsky
2 parents e0c6ad1 + ee2abf6 commit c9e8791
Showing 7 changed files with 17 additions and 18 deletions.
8 changes: 4 additions & 4 deletions install/install-tk.iss
Original file line number Diff line number Diff line change
@@ -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.20
AppVerName=FHIRToolkit v3.4.26

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

; 64 bit
@@ -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.20
AppVersion=3.4.26
AppSupportURL=https://github.com/grahamegrieve/fhirserver
AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
VersionInfoVersion=3.4.20.0
VersionInfoVersion=3.4.26.0

; dialog support
LicenseFile=..\license
8 changes: 4 additions & 4 deletions install/install.iss
Original file line number Diff line number Diff line change
@@ -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.20
AppVerName=FHIRServer v3.4.26

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

; 64 bit
@@ -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.20
AppVersion=3.4.26
AppSupportURL=https://github.com/grahamegrieve/fhirserver
AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
VersionInfoVersion=3.4.20.0
VersionInfoVersion=3.4.26.0

; dialog support
LicenseFile=..\license
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.20';
FHIR_CODE_RELEASE_DATE = '2024-10-09';
FHIR_CODE_RELEASE_DATETIME = '20241009094205.550Z';
FHIR_CODE_FULL_VERSION = '3.4.27-SNAPSHOT';
FHIR_CODE_RELEASE_DATE = '2024-10-22';
FHIR_CODE_RELEASE_DATETIME = '20241022132740.966Z';
2 changes: 1 addition & 1 deletion server/fhirconsole.lpi
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<VersionInfo>
<MajorVersionNr Value="3"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="20"/>
<RevisionNr Value="26"/>
<Attributes pvaDebug="False"/>
</VersionInfo>
<BuildModes Count="8">
4 changes: 2 additions & 2 deletions server/fhirserver.dproj
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_MajorVer>3</VerInfo_MajorVer>
<VerInfo_MinorVer>4</VerInfo_MinorVer>
<VerInfo_Release>20</VerInfo_Release>
<VerInfo_Release>26</VerInfo_Release>
<VerInfo_Debug>false</VerInfo_Debug>
</PropertyGroup>
<PropertyGroup Condition="&apos;$(Base_Win32)&apos;!=&apos;&apos;">
@@ -167,7 +167,7 @@
<DCC_RangeChecking>true</DCC_RangeChecking>
<DCC_DebugDCUs>false</DCC_DebugDCUs>
<VerInfo_MajorVer>3</VerInfo_MajorVer>
<VerInfo_Release>20</VerInfo_Release>
<VerInfo_Release>26</VerInfo_Release>
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
<VerInfo_MinorVer>4</VerInfo_MinorVer>
<VerInfo_Debug>false</VerInfo_Debug>
5 changes: 2 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"/>
@@ -20,7 +19,7 @@
<UseVersionInfo Value="True"/>
<MajorVersionNr Value="3"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="20"/>
<RevisionNr Value="26"/>
<Attributes pvaDebug="False"/>
</VersionInfo>
<BuildModes Count="8">
@@ -1037,7 +1036,7 @@
<Name Value="EPackageCrawlerException"/>
</Item50>
<Item51>
<Name Value="&lt;Unknown Class>"/>
<Name Value="&lt;Unknown Class&gt;"/>
</Item51>
<Item52>
<Name Value="EDateFormatError"/>
2 changes: 1 addition & 1 deletion toolkit2/fhirtoolkit.lpi
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<UseVersionInfo Value="True"/>
<MajorVersionNr Value="3"/>
<MinorVersionNr Value="4"/>
<RevisionNr Value="20"/>
<RevisionNr Value="26"/>
<Attributes pvaDebug="False"/>
</VersionInfo>
<BuildModes>

0 comments on commit c9e8791

Please sign in to comment.