Making v5.4.0

MapWindow · Jan 19, 2019 · d6e1912 · d6e1912
1 parent 4a2b6e9
commit d6e1912
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -169,3 +169,4 @@ src/Plugins/MW5.TemplateNtk/
 src/Plugins/MW5.TopoGISPlugin/
 test/MW5.Test/packages/
 src/.nuget/
+src/.vs/
diff --git a/install/MapWindow5.iss b/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;

diff --git a/install/vcredist_x64_2013.exe b/install/vcredist_x64_2013.exe
diff --git a/install/vcredist_x86-2013.exe b/install/vcredist_x86-2013.exe
diff --git a/src/Plugins/MW5.TemplatePlugin/CompositionRoot.cs b/src/Plugins/MW5.TemplatePlugin/CompositionRoot.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="CompositionRoot.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The composition root.

diff --git a/src/Plugins/MW5.TemplatePlugin/InitPlugin.cs b/src/Plugins/MW5.TemplatePlugin/InitPlugin.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="InitPlugin.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The initialization of the plugin.

diff --git a/src/Plugins/MW5.TemplatePlugin/MapListener.cs b/src/Plugins/MW5.TemplatePlugin/MapListener.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MapListener.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The map listener.

diff --git a/src/Plugins/MW5.TemplatePlugin/Menu/MenuCommands.cs b/src/Plugins/MW5.TemplatePlugin/Menu/MenuCommands.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MenuCommands.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The menu commands.

diff --git a/src/Plugins/MW5.TemplatePlugin/Menu/MenuGenerator.cs b/src/Plugins/MW5.TemplatePlugin/Menu/MenuGenerator.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MenuGenerator.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The menu generator.

diff --git a/src/Plugins/MW5.TemplatePlugin/Menu/MenuKeys.cs b/src/Plugins/MW5.TemplatePlugin/Menu/MenuKeys.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MenuKeys.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The menu keys.

diff --git a/src/Plugins/MW5.TemplatePlugin/Menu/MenuListener.cs b/src/Plugins/MW5.TemplatePlugin/Menu/MenuListener.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="MenuListener.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015-2017
+//   MapWindow OSS Team - 2015-2019
 // </copyright>
 // <summary>
 //   The menu listener.

diff --git a/src/Plugins/MW5.TemplatePlugin/Properties/AssemblyInfo.cs b/src/Plugins/MW5.TemplatePlugin/Properties/AssemblyInfo.cs
@@ -25,5 +25,7 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("6B16DD0D-D739-4A15-B247-CF30EBCE2875")]
 
-[assembly: AssemblyVersion("0.0.1.*")]
-[assembly: AssemblyFileVersion("0.0.1.0")]
+[assembly: AssemblyVersion("0.0.2.*")]
+[assembly: AssemblyFileVersion("0.0.2.0")]
+[assembly: ComVisible(false)]
+
diff --git a/src/Plugins/MW5.TemplatePlugin/SampleDockWindow.cs b/src/Plugins/MW5.TemplatePlugin/SampleDockWindow.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="SampleDockWindow.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015 - 2017
+//   MapWindow OSS Team - 2015 - 2019
 // </copyright>
 // <summary>
 //   The sample dock window.

diff --git a/src/SolutionItems/ReleaseNotes.rtf b/src/SolutionItems/ReleaseNotes.rtf
@@ -1,7 +1,12 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1043{\fonttbl{\f0\fnil\fcharset0 Calibri;}{\f1\fnil\fcharset0 Cambria;}{\f2\fnil\fcharset2 Symbol;}}
 {\colortbl ;\red0\green0\blue255;}
 {\*\generator Riched20 10.0.17134}\viewkind4\uc1 
-\pard\sa200\sl276\slmult1\b\f0\fs44\lang19 Release notes for MapWindow 5\line\b0\fs20 Download at {{\field{\*\fldinst{HYPERLINK https://github.com/MapWindow/MapWindow5/releases }}{\fldrslt{https://github.com/MapWindow/MapWindow5/releases\ul0\cf0}}}}\f0\fs20  (since v5.1.1)\fs44\par
+\pard\sa200\sl276\slmult1\b\f0\fs44\lang19 Release notes for MapWindow 5\line\b0\fs20 Download at {{\field{\*\fldinst{HYPERLINK https://github.com/MapWindow/MapWindow5/releases }}{\fldrslt{https://github.com/MapWindow/MapWindow5/releases\ul0\cf0}}}}\f0\fs20  (since v5.1.1)\par
+\ul\fs44 MW5 v5.4.0\ulnone\line\f1\fs20 Released Jan. 19, 2019\par
+\b News\b0 :\line This is a maintenance release. Only a few issues have been resolved.\line The main reason for this release is the new version of MapWinGIS, which has some improvements. v5.0.0 of MapWinGIS is no using the VC++2015 dependencies.\line The release notes for MapWinGIS v5.0.0 can be found at {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10400 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10400\ul0\cf0}}}}\f1\fs20\par
+\b\f0\fs28 MW5 Core\line\b0\fs20 URL: {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10002&version=10500 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10002&version=10500\ul0\cf0}}}}\f0\fs20\par
+\b\f1 Bug fixes\b0\par
+[MW5CORE-211] - WMS url cannot be secure (https)\f0\fs44\par
 \ul MW5 v5.3.0\ulnone\line\f1\fs20 Released Jul. 20, 2018\par
 \b News\b0 :\line This is a maintenance release. Only a few issues have been resolved.\line The main reason for this release is the new version of MapWinGIS, which has some improvements. v4.9.6 of MapWinGIS will also be the last version using the VC++2013 dependencies.\line The release notes for MapWinGIS v4.9.6 can be found at {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10600 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10600\ul0\cf0}}}}\f1\fs20\par
 \b\f0\fs28 MW5 Core\line\b0\fs20 URL: {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10002&version=10301 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10002&version=10301\ul0\cf0}}}}\f1\fs20\par

diff --git a/src/SolutionItems/SolutionInfoCore.cs b/src/SolutionItems/SolutionInfoCore.cs
@@ -1,6 +1,6 @@
 // --------------------------------------------------------------------------------------------------------------------
 // <copyright file="SolutionInfo.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//   MapWindow OSS Team - 2015-2018
+//   MapWindow OSS Team - 2015-2019
 // </copyright>
 // <summary>
 //   SolutionInfo.cs
@@ -15,8 +15,8 @@
 #endregion
 
 [assembly: AssemblyCompany("MapWindow OSS Team - www.mapwindow.org")]
-[assembly: AssemblyCopyright("Copyright (C) 1998-2018 MapWindow OSS Team")]
-[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2018")]
+[assembly: AssemblyCopyright("Copyright (C) 1998-2019 MapWindow OSS Team")]
+[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyTitle("MapWindow5 GIS")]
 [assembly: AssemblyDescription("MapWindow5 Open Source GIS application")]
@@ -26,5 +26,5 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("5.3.0.*")]
-[assembly: AssemblyFileVersion("5.3.0.0")]
+[assembly: AssemblyVersion("5.4.0.*")]
+[assembly: AssemblyFileVersion("5.4.0.0")]
diff --git a/src/SolutionItems/SolutionInfoPlugins.cs b/src/SolutionItems/SolutionInfoPlugins.cs
@@ -1,6 +1,6 @@
 // -------------------------------------------------------------------------------------------
 // <copyright file="SolutionInfoPlugins.cs" company="MapWindow OSS Team - www.mapwindow.org">
-//  MapWindow OSS Team - 2015-2018
+//  MapWindow OSS Team - 2015-2019
 // </copyright>
 // -------------------------------------------------------------------------------------------
 
@@ -11,8 +11,8 @@
 
 #endregion
 
-[assembly: AssemblyCopyright("Copyright (C) 1998-2018 MapWindow OSS Team")]
-[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2018")]
+[assembly: AssemblyCopyright("Copyright (C) 1998-2019 MapWindow OSS Team")]
+[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019")]
 [assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible