Skip to content

Commit d6e1912

Browse files
pmeemspmeems
committed
Making v5.4.0
1 parent 4a2b6e9 commit d6e1912

16 files changed

+35
-25
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,3 +169,4 @@ src/Plugins/MW5.TemplateNtk/
169169
src/Plugins/MW5.TopoGISPlugin/
170170
test/MW5.Test/packages/
171171
src/.nuget/
172+
src/.vs/

‎install/MapWindow5.iss

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
#define ExeBinPath "..\bin\x86\Release"
88
#define SamplePath "testdata"
99
#define CPU "Win32"
10-
#define vcredist "vcredist_x86-2013.exe"
10+
#define vcredist "vcredist_x86-2015.exe"
1111
#define SystemFlag "32bit"
1212
#define MyAppName "MapWindow5"
1313
#define MyAppPublisher "MapWindow Open Source GIS Community"
1414
#define MyAppURL "https://www.mapwindow.org/documentation/mapwindow5/"
1515
#define ReleaseNotes ExeBinPath + "\..\..\..\src\SolutionItems\ReleaseNotes.rtf"
1616

17-
;; #define x64BitVersion true
17+
#define x64BitVersion true
1818

1919
#ifdef x64BitVersion
2020
#define CPU "x64"
21-
#define vcredist "vcredist_x64_2013.exe"
21+
#define vcredist "vcredist_x64_2015.exe"
2222
#define ExeBinPath "..\bin\x64\Release"
2323
#define SystemFlag "64bit"
2424
#endif
@@ -123,7 +123,7 @@ Source: "{#ReleaseNotes}"; DestDir: "{app}"; Flags: ignoreversion; Components: M
123123
BeveledLabel={#MyAppName}
124124

125125
[Run]
126-
; Install VC++ 2013 if needed:
126+
; Install VC++ 2015 if needed:
127127
#ifdef x64BitVersion
128128
Filename: "{tmp}\{#vcredist}"; Parameters: "/quiet"; Flags: waituntilterminated; Check: VCRedistNeedsInstall_x64()
129129
#else
@@ -200,6 +200,8 @@ const
200200
VC_2013_REDIST_X86 = '{13A4EE12-23EA-3371-91EE-EFB36DDFFF3E}'; //Microsoft.VS.VC_RuntimeMinimumVSU_x86,v12
201201
VC_2013_REDIST_X64 = '{A749D8E6-B613-3BE3-8F5F-045C84EBA29B}'; //Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v12
202202
203+
VC_2015_REDIST_X86 = '{8F271F6C-6E7B-3D0A-951B-6E7B694D78BD}'; //Microsoft.VS.VC_RuntimeMinimumVSU_x86,v14
204+
VC_2015_REDIST_X64 = '{221D6DB4-46E2-333C-B09B-5F49351D0980}'; //Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14
203205
204206
function MsiQueryProductState(szProduct: string): INSTALLSTATE;
205207
external 'MsiQueryProductState{#AW}@msi.dll stdcall';
@@ -216,7 +218,7 @@ begin
216218
// this statement, the following won't install your VC redist only when
217219
// the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
218220
// are installed for the current user
219-
Result := not (VCVersionInstalled(VC_2013_REDIST_X86));
221+
Result := not (VCVersionInstalled(VC_2015_REDIST_X86));
220222
end;
221223
222224
function VCRedistNeedsInstall_x64(): Boolean;
@@ -226,7 +228,7 @@ begin
226228
// this statement, the following won't install your VC redist only when
227229
// the Visual C++ 2008 Redist (x86) and Visual C++ 2008 SP1 Redist(x86)
228230
// are installed for the current user
229-
Result := not (VCVersionInstalled(VC_2013_REDIST_X64));
231+
Result := not (VCVersionInstalled(VC_2015_REDIST_X64));
230232
end;
231233
232234
function NeedsAddPath(Param: string): boolean;

‎install/vcredist_x64_2013.exe

-6.86 MB
Binary file not shown.

‎install/vcredist_x86-2013.exe

-6.2 MB
Binary file not shown.

‎src/Plugins/MW5.TemplatePlugin/CompositionRoot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="CompositionRoot.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The composition root.

‎src/Plugins/MW5.TemplatePlugin/InitPlugin.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="InitPlugin.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The initialization of the plugin.

‎src/Plugins/MW5.TemplatePlugin/MapListener.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="MapListener.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The map listener.

‎src/Plugins/MW5.TemplatePlugin/Menu/MenuCommands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="MenuCommands.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The menu commands.

‎src/Plugins/MW5.TemplatePlugin/Menu/MenuGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="MenuGenerator.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The menu generator.

‎src/Plugins/MW5.TemplatePlugin/Menu/MenuKeys.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="MenuKeys.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The menu keys.

‎src/Plugins/MW5.TemplatePlugin/Menu/MenuListener.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="MenuListener.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015-2017
3+
// MapWindow OSS Team - 2015-2019
44
// </copyright>
55
// <summary>
66
// The menu listener.

‎src/Plugins/MW5.TemplatePlugin/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@
2525
// The following GUID is for the ID of the typelib if this project is exposed to COM
2626
[assembly: Guid("6B16DD0D-D739-4A15-B247-CF30EBCE2875")]
2727

28-
[assembly: AssemblyVersion("0.0.1.*")]
29-
[assembly: AssemblyFileVersion("0.0.1.0")]
28+
[assembly: AssemblyVersion("0.0.2.*")]
29+
[assembly: AssemblyFileVersion("0.0.2.0")]
30+
[assembly: ComVisible(false)]
31+

‎src/Plugins/MW5.TemplatePlugin/SampleDockWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="SampleDockWindow.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015 - 2017
3+
// MapWindow OSS Team - 2015 - 2019
44
// </copyright>
55
// <summary>
66
// The sample dock window.

‎src/SolutionItems/ReleaseNotes.rtf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1043{\fonttbl{\f0\fnil\fcharset0 Calibri;}{\f1\fnil\fcharset0 Cambria;}{\f2\fnil\fcharset2 Symbol;}}
22
{\colortbl ;\red0\green0\blue255;}
33
{\*\generator Riched20 10.0.17134}\viewkind4\uc1
4-
\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
4+
\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
5+
\ul\fs44 MW5 v5.4.0\ulnone\line\f1\fs20 Released Jan. 19, 2019\par
6+
\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
7+
\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
8+
\b\f1 Bug fixes\b0\par
9+
[MW5CORE-211] - WMS url cannot be secure (https)\f0\fs44\par
510
\ul MW5 v5.3.0\ulnone\line\f1\fs20 Released Jul. 20, 2018\par
611
\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
712
\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

‎src/SolutionItems/SolutionInfoCore.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --------------------------------------------------------------------------------------------------------------------
22
// <copyright file="SolutionInfo.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015-2018
3+
// MapWindow OSS Team - 2015-2019
44
// </copyright>
55
// <summary>
66
// SolutionInfo.cs
@@ -15,8 +15,8 @@
1515
#endregion
1616

1717
[assembly: AssemblyCompany("MapWindow OSS Team - www.mapwindow.org")]
18-
[assembly: AssemblyCopyright("Copyright (C) 1998-2018 MapWindow OSS Team")]
19-
[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2018")]
18+
[assembly: AssemblyCopyright("Copyright (C) 1998-2019 MapWindow OSS Team")]
19+
[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019")]
2020
[assembly: AssemblyCulture("")]
2121
[assembly: AssemblyTitle("MapWindow5 GIS")]
2222
[assembly: AssemblyDescription("MapWindow5 Open Source GIS application")]
@@ -26,5 +26,5 @@
2626
// COM, set the ComVisible attribute to true on that type.
2727
[assembly: ComVisible(false)]
2828

29-
[assembly: AssemblyVersion("5.3.0.*")]
30-
[assembly: AssemblyFileVersion("5.3.0.0")]
29+
[assembly: AssemblyVersion("5.4.0.*")]
30+
[assembly: AssemblyFileVersion("5.4.0.0")]

‎src/SolutionItems/SolutionInfoPlugins.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -------------------------------------------------------------------------------------------
22
// <copyright file="SolutionInfoPlugins.cs" company="MapWindow OSS Team - www.mapwindow.org">
3-
// MapWindow OSS Team - 2015-2018
3+
// MapWindow OSS Team - 2015-2019
44
// </copyright>
55
// -------------------------------------------------------------------------------------------
66

@@ -11,8 +11,8 @@
1111

1212
#endregion
1313

14-
[assembly: AssemblyCopyright("Copyright (C) 1998-2018 MapWindow OSS Team")]
15-
[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2018")]
14+
[assembly: AssemblyCopyright("Copyright (C) 1998-2019 MapWindow OSS Team")]
15+
[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019")]
1616
[assembly: AssemblyCulture("")]
1717

1818
// Setting ComVisible to false makes the types in this assembly not visible

0 commit comments

Comments
 (0)