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

…erver
HealthIntersections · Jan 30, 2024 · 16a5a30 · 16a5a30
2 parents e3a30c1 + bd1fcf6
commit 16a5a30
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 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.1.5
+AppVerName=FHIRToolkit v3.1.6
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.1.5
+OutputBaseFilename=fhirtoolkit-win64-3.1.6
 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.1.5
+AppVersion=3.1.6
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.1.5.0
+VersionInfoVersion=3.1.6.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.1.5
+AppVerName=FHIRServer v3.1.6
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.1.5
+OutputBaseFilename=fhirserver-win64-3.1.6
 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.1.5
+AppVersion=3.1.6
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.1.5.0
+VersionInfoVersion=3.1.6.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.6';
+ FHIR_CODE_FULL_VERSION = '3.1.7';
  FHIR_CODE_RELEASE_DATE = '2024-01-30';
- FHIR_CODE_RELEASE_DATETIME = '20240130012338.794Z';
+ FHIR_CODE_RELEASE_DATETIME = '20240130041513.996Z';
diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi
@@ -19,6 +19,7 @@
  <MajorVersionNr Value="3"/>
  <RevisionNr Value="6"/>
  <Attributes pvaDebug="False"/>
+ <MinorVersionNr Value="1"/>
  </VersionInfo>
  <BuildModes Count="8">
  <Item1 Name="default" Default="True"/>

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"/>
@@ -989,7 +988,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
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
  <ProjectOptions>
  <Version Value="12"/>
@@ -19,6 +18,7 @@
  <MajorVersionNr Value="3"/>
  <RevisionNr Value="6"/>
  <MinorVersionNr Value="1"/>
+ <Attributes pvaDebug="False"/>
  </VersionInfo>
  <BuildModes>
  <Item Name="default" Default="True"/>
@@ -232,10 +232,7 @@
  <CompilerMessages>
  <IgnoredMessages idx6058="True" idx5024="True"/>
  </CompilerMessages>
- <CustomOptions Value="-WM11.0
--XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
--gw2
--gw3"/>
+ <CustomOptions Value="-WM11.0&#10;-XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk&#10;-gw2&#10;-gw3"/>
  </Other>
  </CompilerOptions>
  </Item>