Making v5.5

Author: pmeems

install/MapWindow5.iss

@@ -7,18 +7,19 @@
 #define ExeBinPath "..\bin\x86\Release"
 #define SamplePath "testdata"
 #define CPU "Win32"
-#define vcredist "vcredist_x86-2015.exe"
+#define vcredist "vcredist_x86-2017.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 GdalLicensePath ExeBinPath + "\..\..\..\..\..\MapWinGIS\git\support\GDAL_SDK\licenses\
 
 #define x64BitVersion true
 
 #ifdef x64BitVersion
   #define CPU "x64"
-  #define vcredist "vcredist_x64-2015.exe"
+  #define vcredist "vcredist_x64-2017.exe"
   #define ExeBinPath "..\bin\x64\Release"
   #define SystemFlag "64bit"
 #endif
@@ -105,7 +106,7 @@ Source: "{#ExeBinPath}\x86\*"; DestDir: "{app}\x86"; Flags: ignoreversion {#Syst
 ;; Config files:
 Source: "{#ExeBinPath}\MapWindow.exe.config"; DestDir: "{app}"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow; Permissions: users-modify
 ;; Licenses
-Source: "{#ExeBinPath}\..\..\..\..\MapWinGIS\support\GDAL_SDK\licenses\*.rtf"; DestDir: "{app}\Licenses"; Flags: ignoreversion; Components: MapWindow
+Source: "{#GdalLicensePath}\*.rtf"; DestDir: "{app}\Licenses"; Flags: ignoreversion; Components: MapWindow
 Source: "{#ExeBinPath}\..\..\..\licenses\*"; DestDir: "{app}\Licenses"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow
 
 ;; Sample data
@@ -123,7 +124,7 @@ Source: "{#ReleaseNotes}"; DestDir: "{app}"; Flags: ignoreversion; Components: M
 BeveledLabel={#MyAppName}
 
 [Run]
-; Install VC++ 2015 if needed:
+; Install VC++ 2017 if needed:
 #ifdef x64BitVersion
 Filename: "{tmp}\{#vcredist}"; Parameters: "/quiet"; Flags: waituntilterminated; Check: VCRedistNeedsInstall_x64()
 #else
@@ -204,6 +205,12 @@ const
   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
 
+
+  // https://bell0bytes.eu/inno-setup-vc/
+  // { Visual C++ 2017 Redistributable 14.16.27024 }
+  VC_2017_REDIST_X86 = '{5EEFCEFB-E5F7-4C82-99A5-813F04AA4FBD}';
+  VC_2017_REDIST_X64 = '{F1B0FB3A-E0EA-47A6-9383-3650655403B0}';
+
 function MsiQueryProductState(szProduct: string): INSTALLSTATE; 
   external 'MsiQueryProductState{#AW}@msi.dll stdcall';
 
@@ -219,7 +226,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_2015_REDIST_X86));
+  Result := not (VCVersionInstalled(VC_2017_REDIST_X86));
 end;
 
 function VCRedistNeedsInstall_x64(): Boolean;
@@ -229,7 +236,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_2015_REDIST_X64));
+  Result := not (VCVersionInstalled(VC_2017_REDIST_X64));
 end;
 
 function NeedsAddPath(Param: string): boolean;
@@ -369,8 +376,8 @@ end;
 
 function InitializeSetup(): Boolean;
 begin
-    if not IsDotNetDetected('v4.5', 0) then begin
-        MsgBox('MapWindow5 requires Microsoft .NET Framework 4.5.'#13#13
+    if not IsDotNetDetected('v4.6', 0) then begin
+        MsgBox('MapWindow5 requires Microsoft .NET Framework 4.6.'#13#13
             'Please use Windows Update to install this version,'#13
             'and then re-run this setup program.', mbInformation, MB_OK);
         result := false;
@@ -380,51 +387,50 @@ end;
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
-;Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"
-;Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
-;Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
-;Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
-;Name: "belarusian"; MessagesFile: "compiler:Languages\Belarusian.isl"
-;Name: "bosnian"; MessagesFile: "compiler:Languages\Bosnian.isl"
+;;Name: "afrikaans"; MessagesFile: "compiler:Languages\Afrikaans.isl"
+;;Name: "albanian"; MessagesFile: "compiler:Languages\Albanian.isl"
+;;Name: "arabic"; MessagesFile: "compiler:Languages\Arabic.isl"
+;;Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"
+;;Name: "belarusian"; MessagesFile: "compiler:Languages\Belarusian.isl"
+;;Name: "bosnian"; MessagesFile: "compiler:Languages\Bosnian.isl"
 Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-;Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
+;;Name: "bulgarian"; MessagesFile: "compiler:Languages\Bulgarian.isl"
 Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"
-;Name: "chinesesimp"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
-;Name: "chinesetrad"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
+;;Name: "chinesesimp"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
+;;Name: "chinesetrad"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
 Name: "corsican"; MessagesFile: "compiler:Languages\Corsican.isl"
 Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"
 Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"
 Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"
-;Name: "estonian"; MessagesFile: "compiler:Languages\Estonian.isl"
+;;Name: "estonian"; MessagesFile: "compiler:Languages\Estonian.isl"
 Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"
 Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-;Name: "galician"; MessagesFile: "compiler:Languages\Galician.isl"
+;;Name: "galician"; MessagesFile: "compiler:Languages\Galician.isl"
 Name: "german"; MessagesFile: "compiler:Languages\German.isl"
-Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
+;;Name: "greek"; MessagesFile: "compiler:Languages\Greek.isl"
 Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
-;Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
-;Name: "indonesian"; MessagesFile: "compiler:Languages\Indonesian.isl"
+;;Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
+Name: "icelandic"; MessagesFile: "compiler:Languages\Icelandic.isl"
+;;Name: "indonesian"; MessagesFile: "compiler:Languages\Indonesian.isl"
 Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-;Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
-;Name: "lithuanian"; MessagesFile: "compiler:Languages\Lithuanian.isl"
-;Name: "luxemburgish"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
-;Name: "macedonian"; MessagesFile: "compiler:Languages\Macedonian.isl"
-;Name: "malaysian"; MessagesFile: "compiler:Languages\Malaysian.isl"
-;Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
+;;Name: "korean"; MessagesFile: "compiler:Languages\Korean.isl"
+;;Name: "lithuanian"; MessagesFile: "compiler:Languages\Lithuanian.isl"
+;;Name: "luxemburgish"; MessagesFile: "compiler:Languages\Luxemburgish.isl"
+;;Name: "macedonian"; MessagesFile: "compiler:Languages\Macedonian.isl"
+;;Name: "malaysian"; MessagesFile: "compiler:Languages\Malaysian.isl"
+;;Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
 Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
 Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
 Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"
-;Name: "romanian"; MessagesFile: "compiler:Languages\Romanian.isl"
+;;Name: "romanian"; MessagesFile: "compiler:Languages\Romanian.isl"
 Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"
-Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
-Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
-;Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
+;;Name: "serbiancyrillic"; MessagesFile: "compiler:Languages\SerbianCyrillic.isl"
+;;Name: "serbianlatin"; MessagesFile: "compiler:Languages\SerbianLatin.isl"
+;;Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"
 Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
-;Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
-;Name: "tatarish"; MessagesFile: "compiler:Languages\Tatar.isl"
+;;Name: "swedish"; MessagesFile: "compiler:Languages\Swedish.isl"
+;;Name: "tatarish"; MessagesFile: "compiler:Languages\Tatar.isl"
 Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
 Name: "ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
-

src/MW5.Api/MW5.Api.csproj

@@ -57,13 +57,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AxInterop.MapWinGIS">
-      <HintPath>..\..\..\..\MapWinGIS\git\src\bin\Win32\16.0\AxInterop.MapWinGIS.dll</HintPath>
+      <HintPath>..\..\..\..\MapWinGIS\git\src\bin\Win32\15.0\AxInterop.MapWinGIS.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Interop.MapWinGIS">
-      <HintPath>..\..\..\..\MapWinGIS\git\src\bin\Win32\16.0\Interop.MapWinGIS.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -316,6 +312,15 @@
     <Compile Include="Static\GdalUtils.cs" />
   </ItemGroup>
   <ItemGroup>
+    <COMReference Include="MapWinGIS">
+      <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>1</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>True</Isolated>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>