Merge remote-tracking branch 'origin/master'

HealthIntersections · Sep 24, 2024 · 25c68bc · 25c68bc
2 parents 1504551 + 0f7e06a
commit 25c68bc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 18 deletions.
diff --git a/install/install-tk.iss b/install/install-tk.iss
@@ -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.14
+AppVerName=FHIRToolkit v3.4.15
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.4.14
+OutputBaseFilename=fhirtoolkit-win64-3.4.15
 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.14
+AppVersion=3.4.15
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.4.14.0
+VersionInfoVersion=3.4.15.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/install/install.iss b/install/install.iss
@@ -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.14
+AppVerName=FHIRServer v3.4.15
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.4.14
+OutputBaseFilename=fhirserver-win64-3.4.15
 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.14
+AppVersion=3.4.15
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.4.14.0
+VersionInfoVersion=3.4.15.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/library/version.inc b/library/version.inc
@@ -1,3 +1,3 @@
- FHIR_CODE_FULL_VERSION = '3.4.14';
- FHIR_CODE_RELEASE_DATE = '2024-09-23';
- FHIR_CODE_RELEASE_DATETIME = '20240923230832.600Z';
+ FHIR_CODE_FULL_VERSION = '3.4.15';
+ FHIR_CODE_RELEASE_DATE = '2024-09-24';
+ FHIR_CODE_RELEASE_DATETIME = '20240924122536.288Z';
diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi
@@ -18,7 +18,7 @@
     <VersionInfo>
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="4"/>
-      <RevisionNr Value="14"/>
+      <RevisionNr Value="15"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes Count="8">

diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj
@@ -92,7 +92,7 @@
     <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
     <VerInfo_MinorVer>4</VerInfo_MinorVer>
-    <VerInfo_Release>14</VerInfo_Release>
+    <VerInfo_Release>15</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>14</VerInfo_Release>
+    <VerInfo_Release>15</VerInfo_Release>
     <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
     <VerInfo_MinorVer>4</VerInfo_MinorVer>
     <VerInfo_Debug>false</VerInfo_Debug>

diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
@@ -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="14"/>
+      <RevisionNr Value="15"/>
       <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"/>

diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi
@@ -17,7 +17,7 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="4"/>
-      <RevisionNr Value="14"/>
+      <RevisionNr Value="15"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes>