Skip to content

Commit ce8babc

Browse files
committed
Changes needed for v5.6.2
1 parent 78a4327 commit ce8babc

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

install/MapWindow5.iss

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
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"
16-
#define GdalLicensePath ExeBinPath + "\..\..\..\..\..\MapWinGIS\git\support\GDAL_SDK\licenses\
16+
#define GdalLicensePath ExeBinPath + "\..\..\..\..\..\MapWinGIS\git\support\GDAL_SDK\licenses\"
1717

18-
;;#define x64BitVersion true
18+
#define x64BitVersion true
1919

2020
#ifdef x64BitVersion
2121
#define CPU "x64"
@@ -43,7 +43,7 @@ AppPublisher={#MyAppPublisher}
4343
AppPublisherURL={#MyAppURL}
4444
AppSupportURL={#MyAppURL}
4545
AppUpdatesURL={#MyAppURL}
46-
DefaultDirName={pf}\MapWindow5
46+
DefaultDirName={commonpf}\MapWindow5
4747
DisableProgramGroupPage=no
4848
DefaultGroupName={#MyAppName}
4949
LicenseFile={#ExeBinPath}\..\..\..\licenses\MapWindow5License.rtf
@@ -78,7 +78,6 @@ AlwaysShowComponentsList=false
7878
ArchitecturesInstallIn64BitMode=x64
7979
#endif
8080
ChangesAssociations=Yes
81-
UsePreviousAppDir=False
8281

8382
[Components]
8483
Name: "MapWindow"; Description: "MapWindow5 files"; Types: full custom compact; Flags: fixed
@@ -97,7 +96,7 @@ Source: "{#ExeBinPath}\Projections\*"; DestDir: "{app}\Projections"; Flags: igno
9796
;; Manuals sub folder
9897
Source: "{#ExeBinPath}\Manuals\*"; DestDir: "{app}\Manuals"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow
9998
;; Plugins subfolder
100-
Source: "{#ExeBinPath}\Plugins\*"; DestDir: "{app}\Plugins"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow; Excludes: "AxInterop.MapWinGIS.dll,Interop.MapWinGIS.dll,MW5.TemplatePlugin.dll,Syncfusion.*"
99+
Source: "{#ExeBinPath}\Plugins\*"; DestDir: "{app}\Plugins"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow; Excludes: "AxInterop.MapWinGIS.dll,Interop.MapWinGIS.dll,MW5.TemplatePlugin.dll,Syncfusion.*, *.pdb"
101100
;; Styles subfolder
102101
Source: "{#ExeBinPath}\Styles\*"; DestDir: "{app}\Styles"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow
103102
;; SQLite interop:
@@ -272,8 +271,6 @@ end;
272271
273272
// custom wizard page setup, for data dir.
274273
procedure InitializeWizard;
275-
var
276-
myLocalAppData: String;
277274
begin
278275
DataDirPage := CreateInputDirPage(
279276
wpSelectComponents,
@@ -302,7 +299,7 @@ begin
302299
// if the page that is asked to be skipped is your custom page, then...
303300
if PageID = DataDirPage.ID then
304301
// if the component is not selected, skip the page
305-
Result := not IsComponentSelected('USASampleData');
302+
Result := not WizardIsComponentSelected('USASampleData');
306303
end;
307304
308305
function IsDotNetDetected(version: string; service: cardinal): boolean;

src/Plugins/MW5.ImageRegistration/MW5.ImageRegistration.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
2727
<DefineConstants>TRACE</DefineConstants>
2828
<Optimize>true</Optimize>
29-
<DebugType>pdbonly</DebugType>
29+
<DebugType>none</DebugType>
3030
<PlatformTarget>x86</PlatformTarget>
3131
<ErrorReport>prompt</ErrorReport>
3232
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
33-
<LangVersion>7.1</LangVersion>
33+
<LangVersion>default</LangVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
3636
<DebugSymbols>true</DebugSymbols>
@@ -47,6 +47,7 @@
4747
<PlatformTarget>x64</PlatformTarget>
4848
<ErrorReport>prompt</ErrorReport>
4949
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
50+
<LangVersion>default</LangVersion>
5051
</PropertyGroup>
5152
<ItemGroup>
5253
<Reference Include="Syncfusion.Grid.Grouping.Windows, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">

src/SolutionItems/SolutionInfoCore.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
// COM, set the ComVisible attribute to true on that type.
2727
[assembly: ComVisible(false)]
2828

29-
[assembly: AssemblyVersion("5.6.0.*")]
30-
[assembly: AssemblyFileVersion("5.6.0.0")]
29+
[assembly: AssemblyVersion("5.6.2.*")]
30+
[assembly: AssemblyFileVersion("5.6.2.0")]

0 commit comments

Comments
 (0)