Merge branch 'release/v5.4.0'

Author: pmeems

.gitignore

@@ -169,3 +169,4 @@ src/Plugins/MW5.TemplateNtk/
 src/Plugins/MW5.TopoGISPlugin/
 test/MW5.Test/packages/
 src/.nuget/
+src/.vs/

install/MapWindow5.iss

@@ -7,18 +7,18 @@
 #define ExeBinPath "..\bin\x86\Release"
 #define SamplePath "testdata"
 #define CPU "Win32"
-#define vcredist "vcredist_x86-2013.exe"
+#define vcredist "vcredist_x86-2015.exe"
 #define SystemFlag "32bit"
 #define MyAppName "MapWindow5"
 #define MyAppPublisher "MapWindow Open Source GIS Community"
 #define MyAppURL "https://www.mapwindow.org/documentation/mapwindow5/"
 #define ReleaseNotes ExeBinPath + "\..\..\..\src\SolutionItems\ReleaseNotes.rtf"
 
-;; #define x64BitVersion true
+#define x64BitVersion true
 
 #ifdef x64BitVersion
   #define CPU "x64"
-  #define vcredist "vcredist_x64_2013.exe"
+  #define vcredist "vcredist_x64_2015.exe"
   #define ExeBinPath "..\bin\x64\Release"
   #define SystemFlag "64bit"
 #endif
@@ -123,7 +123,7 @@ Source: "{#ReleaseNotes}"; DestDir: "{app}"; Flags: ignoreversion; Components: M
 BeveledLabel={#MyAppName}
 
 [Run]
-; Install VC++ 2013 if needed:
+; Install VC++ 2015 if needed:
 #ifdef x64BitVersion
 Filename: "{tmp}\{#vcredist}"; Parameters: "/quiet"; Flags: waituntilterminated; Check: VCRedistNeedsInstall_x64()
 #else
@@ -200,6 +200,8 @@ const
   VC_2013_REDIST_X86 = '{13A4EE12-23EA-3371-91EE-EFB36DDFFF3E}'; //Microsoft.VS.VC_RuntimeMinimumVSU_x86,v12
   VC_2013_REDIST_X64 = '{A749D8E6-B613-3BE3-8F5F-045C84EBA29B}'; //Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v12
 
+  VC_2015_REDIST_X86 = '{8F271F6C-6E7B-3D0A-951B-6E7B694D78BD}'; //Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14
+  VC_2015_REDIST_X64 = '{221D6DB4-46E2-333C-B09B-5F49351D0980}'; //Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14
 
 function MsiQueryProductState(szProduct: string): INSTALLSTATE; 
   external 'MsiQueryProductState{#AW}@msi.dll stdcall';
@@ -216,7 +218,7 @@ begin
   // this statement, the following won't install your VC redist only when
   // the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
   // are installed for the current user
-  Result := not (VCVersionInstalled(VC_2013_REDIST_X86));
+  Result := not (VCVersionInstalled(VC_2015_REDIST_X86));
 end;
 
 function VCRedistNeedsInstall_x64(): Boolean;
@@ -226,7 +228,7 @@ begin
   // this statement, the following won't install your VC redist only when
   // the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
   // are installed for the current user
-  Result := not (VCVersionInstalled(VC_2013_REDIST_X64));
+  Result := not (VCVersionInstalled(VC_2015_REDIST_X64));
 end;
 
 function NeedsAddPath(Param: string): boolean;