Merge branch 'master' of https://github.com/HealthIntersections/fhirs…

…erver
HealthIntersections · Jan 28, 2024 · c1d42dd · c1d42dd
2 parents 32180bf + 2a2e6be
commit c1d42dd
Show file tree

Hide file tree

Showing 8 changed files with 213 additions and 213 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.0.5
+AppVerName=FHIRToolkit v3.1.0
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.0.5
+OutputBaseFilename=fhirtoolkit-win64-3.1.0
 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.0.5
+AppVersion=3.1.0
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.0.5.0
+VersionInfoVersion=3.1.0.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.0.5
+AppVerName=FHIRServer v3.1.0
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.0.5
+OutputBaseFilename=fhirserver-win64-3.1.0
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -22,7 +22,7 @@ ChangesAssociations=yes
 DirExistsWarning=auto
 DisableStartUpPrompt=yes
 MinVersion=0,6.1
-UninstallDisplayIcon=..\Server\fhir.ico
+UninstallDisplayIcon=..\Server\fhirserver.ico
 WizardStyle=modern
 DisableDirPage=false
 
@@ -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.0.5
+AppVersion=3.1.0
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.0.5.0
+VersionInfoVersion=3.1.0.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/library/version.inc b/library/version.inc
@@ -1,3 +1,3 @@
- FHIR_CODE_FULL_VERSION = '3.1.0';
- FHIR_CODE_RELEASE_DATE = '2024-01-18';
- FHIR_CODE_RELEASE_DATETIME = '20240118202004.197Z';
+ FHIR_CODE_FULL_VERSION = '3.1.1';
+ FHIR_CODE_RELEASE_DATE = '2024-01-28';
+ FHIR_CODE_RELEASE_DATETIME = '20240128100455.561Z';
diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi
@@ -17,8 +17,8 @@
     </General>
     <VersionInfo>
       <MajorVersionNr Value="3"/>
-      <RevisionNr Value="3"/>
-      <MinorVersionNr Value="0"/>
+      <RevisionNr Value="0"/>
+      <MinorVersionNr Value="1"/>
       <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes Count="8">

diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj
@@ -91,8 +91,8 @@
     <VerInfo_Keys>CompanyName=;FileVersion=2.1.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
     <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
-    <VerInfo_MinorVer>0</VerInfo_MinorVer>
-    <VerInfo_Release>3</VerInfo_Release>
+    <VerInfo_MinorVer>1</VerInfo_MinorVer>
+    <VerInfo_Release>0</VerInfo_Release>
     <VerInfo_Debug>false</VerInfo_Debug>
   </PropertyGroup>
   <PropertyGroup Condition="&apos;$(Base_Win32)&apos;!=&apos;&apos;">
@@ -167,9 +167,9 @@
     <DCC_RangeChecking>true</DCC_RangeChecking>
     <DCC_DebugDCUs>false</DCC_DebugDCUs>
     <VerInfo_MajorVer>3</VerInfo_MajorVer>
-    <VerInfo_Release>3</VerInfo_Release>
+    <VerInfo_Release>0</VerInfo_Release>
     <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
-    <VerInfo_MinorVer>0</VerInfo_MinorVer>
+    <VerInfo_MinorVer>1</VerInfo_MinorVer>
     <VerInfo_Debug>false</VerInfo_Debug>
   </PropertyGroup>
   <PropertyGroup Condition="&apos;$(Cfg_2)&apos;!=&apos;&apos;">

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"/>
@@ -19,6 +18,9 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
+      <MinorVersionNr Value="1"/>
+      <RevisionNr Value="0"/>
+      <Attributes pvaDebug="False"/>
     </VersionInfo>
     <BuildModes Count="7">
       <Item1 Name="default" Default="True"/>
@@ -988,7 +990,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class>"/>
+        <Name Value="&lt;Unknown Class&gt;"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>