Skip to content

Commit cd0c3de

Browse files
pmeemspmeems
committed
Merge branch 'release/v5.3.0'
2 parents 2e338c1 + 4f06d5b commit cd0c3de

File tree

85 files changed

+474
-347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+474
-347
lines changed

‎install/MapWindow5.iss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#define SystemFlag "32bit"
1212
#define MyAppName "MapWindow5"
1313
#define MyAppPublisher "MapWindow Open Source GIS Community"
14-
#define MyAppURL "http://www.mapwindow.org/documentation/mapwindow5/"
14+
#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"

‎src/MW5.Api/Legend/Renderer/VectorSymbologyRenderer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void RenderChartFields(int left, int top)
160160
/// <summary>
161161
/// Draws the shapefile categories.
162162
/// </summary>
163-
private void DrawShapefileCategories(int top, bool isSnapshot, int maxWidth)
163+
private void DrawShapefileCategories(ref int top, bool isSnapshot, int maxWidth)
164164
{
165165
if (_sf.Categories.Count == 0)
166166
{
@@ -348,7 +348,7 @@ private void RenderCore()
348348

349349
top += height;
350350

351-
DrawShapefileCategories(top, _isSnapshot, maxWidth);
351+
DrawShapefileCategories(ref top, _isSnapshot, maxWidth);
352352

353353
DrawCharts(top);
354354
}

‎src/MW5.Api/MW5.Api.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MW5.Api</RootNamespace>
1111
<AssemblyName>MW5.Api</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
@@ -23,6 +23,7 @@
2323
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
2424
<Prefer32Bit>false</Prefer32Bit>
2525
<DocumentationFile>bin\x86\Debug\MW5.Api.XML</DocumentationFile>
26+
<NoWarn>1591</NoWarn>
2627
</PropertyGroup>
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
2829
<OutputPath>bin\x86\Release\</OutputPath>

‎src/MW5.Attributes/MW5.Attributes.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MW5.Attributes</RootNamespace>
1111
<AssemblyName>MW5.Attributes</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1617
<DebugSymbols>true</DebugSymbols>
@@ -49,28 +50,28 @@
4950
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5051
</PropertyGroup>
5152
<ItemGroup>
52-
<Reference Include="Syncfusion.Grid.Base, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
53+
<Reference Include="Syncfusion.Grid.Base, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
5354
<SpecificVersion>False</SpecificVersion>
5455
</Reference>
55-
<Reference Include="Syncfusion.Grid.Grouping.Windows, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
56+
<Reference Include="Syncfusion.Grid.Grouping.Windows, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
5657
<SpecificVersion>False</SpecificVersion>
5758
</Reference>
58-
<Reference Include="Syncfusion.Grid.Windows, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
59+
<Reference Include="Syncfusion.Grid.Windows, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
5960
<SpecificVersion>False</SpecificVersion>
6061
</Reference>
61-
<Reference Include="Syncfusion.Grouping.Base, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
62+
<Reference Include="Syncfusion.Grouping.Base, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
6263
<SpecificVersion>False</SpecificVersion>
6364
</Reference>
64-
<Reference Include="Syncfusion.Shared.Base, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
65+
<Reference Include="Syncfusion.Shared.Base, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
6566
<SpecificVersion>False</SpecificVersion>
6667
</Reference>
67-
<Reference Include="Syncfusion.Shared.Windows, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
68+
<Reference Include="Syncfusion.Shared.Windows, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
6869
<SpecificVersion>False</SpecificVersion>
6970
</Reference>
70-
<Reference Include="Syncfusion.Tools.Base, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
71+
<Reference Include="Syncfusion.Tools.Base, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
7172
<SpecificVersion>False</SpecificVersion>
7273
</Reference>
73-
<Reference Include="Syncfusion.Tools.Windows, Version=15.3450.0.26, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
74+
<Reference Include="Syncfusion.Tools.Windows, Version=16.1460.0.24, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
7475
<SpecificVersion>False</SpecificVersion>
7576
</Reference>
7677
<Reference Include="System" />

‎src/MW5.Attributes/Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/MW5.DI/MW5.DI.Castle/MW5.DI.Castle.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MW5.DI.Castle</RootNamespace>
1111
<AssemblyName>MW5.DI.Castle</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1819
<DebugSymbols>true</DebugSymbols>
@@ -60,7 +61,10 @@
6061
<Private>True</Private>
6162
</Reference>
6263
<Reference Include="System" />
64+
<Reference Include="System.Configuration" />
6365
<Reference Include="System.Core" />
66+
<Reference Include="System.Runtime.Remoting" />
67+
<Reference Include="System.Web" />
6468
<Reference Include="System.Windows.Forms" />
6569
<Reference Include="System.Xml.Linq" />
6670
<Reference Include="System.Data.DataSetExtensions" />

‎src/MW5.DI/MW5.DI.Castle/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>
11-
</configuration>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>

‎src/MW5.DI/MW5.DI.Castle/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="4.1.1" targetFramework="net45" />
4-
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
3+
<package id="Castle.Core" version="4.1.1" targetFramework="net46" />
4+
<package id="Castle.Windsor" version="4.0.0" targetFramework="net46" />
55
</packages>

‎src/MW5.DI/MW5.DI.LightInject/MW5.DI.LightInject.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MW5.DI.LightInject</RootNamespace>
1111
<AssemblyName>MW5.DI.LightInject</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -68,8 +69,8 @@
6869
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
6970
</PropertyGroup>
7071
<ItemGroup>
71-
<Reference Include="LightInject, Version=5.0.3.0, Culture=neutral, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\LightInject.5.0.3\lib\net45\LightInject.dll</HintPath>
72+
<Reference Include="LightInject, Version=5.1.3.0, Culture=neutral, processorArchitecture=MSIL">
73+
7374
<Private>True</Private>
7475
</Reference>
7576
<Reference Include="System" />

‎src/MW5.DI/MW5.DI.LightInject/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="LightInject" version="5.0.3" targetFramework="net45" />
3+
<package id="LightInject" version="5.1.3" targetFramework="net46" />
44
</packages>

‎src/MW5.DI/MW5.DI.Ninject/MW5.DI.Ninject.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MW5.DI.Ninject</RootNamespace>
1111
<AssemblyName>MW5.DI.Ninject</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1819
<DebugSymbols>true</DebugSymbols>
@@ -51,8 +52,8 @@
5152
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5253
</PropertyGroup>
5354
<ItemGroup>
54-
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
55+
<Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
56+
5657
<Private>True</Private>
5758
</Reference>
5859
<Reference Include="System" />

‎src/MW5.DI/MW5.DI.Ninject/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Ninject" version="3.2.2.0" targetFramework="net45" />
3+
<package id="Ninject" version="3.3.4" targetFramework="net46" />
44
</packages>

‎src/MW5.DI/MW5.DI.Unity/MW5.DI.Unity.csproj

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MW5.DI.Unity</RootNamespace>
1111
<AssemblyName>MW5.DI.Unity</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
1819
<DebugSymbols>true</DebugSymbols>
@@ -51,20 +52,8 @@
5152
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5253
</PropertyGroup>
5354
<ItemGroup>
54-
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
66-
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
55+
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
56+
6857
<Private>True</Private>
6958
</Reference>
7059
<Reference Include="System" />
@@ -75,6 +64,34 @@
7564
<Reference Include="Microsoft.CSharp" />
7665
<Reference Include="System.Data" />
7766
<Reference Include="System.Xml" />
67+
<Reference Include="Unity.Abstractions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
68+
69+
<Private>True</Private>
70+
</Reference>
71+
<Reference Include="Unity.Configuration, Version=5.2.1.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
72+
73+
<Private>True</Private>
74+
</Reference>
75+
<Reference Include="Unity.Container, Version=5.8.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
76+
77+
<Private>True</Private>
78+
</Reference>
79+
<Reference Include="Unity.Interception, Version=5.5.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
80+
81+
<Private>True</Private>
82+
</Reference>
83+
<Reference Include="Unity.Interception.Configuration, Version=5.1.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
84+
85+
<Private>True</Private>
86+
</Reference>
87+
<Reference Include="Unity.RegistrationByConvention, Version=2.1.5.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
88+
89+
<Private>True</Private>
90+
</Reference>
91+
<Reference Include="Unity.ServiceLocation, Version=2.1.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
92+
93+
<Private>True</Private>
94+
</Reference>
7895
</ItemGroup>
7996
<ItemGroup>
8097
<Compile Include="..\..\SolutionItems\SolutionInfoCore.cs">

‎src/MW5.DI/MW5.DI.Unity/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
4-
<package id="Unity" version="4.0.1" targetFramework="net45" />
3+
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
4+
<package id="Unity" version="5.8.6" targetFramework="net46" />
55
</packages>

0 commit comments

Comments
 (0)