Skip to content

Commit 0ef1bd6

Browse files
committed
Merge branch 'hotfix/v5.6.1'
2 parents 3eb676e + d2630d1 commit 0ef1bd6

3 files changed

Lines changed: 12 additions & 15 deletions

File tree

src/MW5.AdvancedSnapping/MW5.AdvancedSnapping.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<OutputPath>..\..\bin\x86\Release\Plugins\</OutputPath>
4444
<DefineConstants>TRACE</DefineConstants>
4545
<Optimize>true</Optimize>
46-
<DebugType>pdbonly</DebugType>
46+
<DebugType>none</DebugType>
4747
<PlatformTarget>x86</PlatformTarget>
4848
<ErrorReport>prompt</ErrorReport>
4949
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -190,7 +190,8 @@
190190
</ItemGroup>
191191
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
192192
<PropertyGroup>
193-
<PostBuildEvent>xcopy /C "$(ProjectDir)$(OutDir)*" "C:\Program Files\MapWindow5\Plugins\" /sy</PostBuildEvent>
193+
<PostBuildEvent>
194+
</PostBuildEvent>
194195
</PropertyGroup>
195196
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
196197
Other similar extension points exist, see Microsoft.Common.targets.

src/MW5.sln

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29806.167
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.1169
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MW5.Api", "MW5.Api\MW5.Api.csproj", "{8AAD34B3-8EF3-485F-A04D-ED2C07D8F1DF}"
77
EndProject
@@ -127,14 +127,12 @@ Global
127127
{76644CDF-5165-428D-8419-93C1E978DB1B}.Release|x64.Build.0 = Release|x64
128128
{76644CDF-5165-428D-8419-93C1E978DB1B}.Release|x86.ActiveCfg = Release|x86
129129
{76644CDF-5165-428D-8419-93C1E978DB1B}.Release|x86.Build.0 = Release|x86
130-
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131-
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|Any CPU.Build.0 = Debug|Any CPU
130+
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|Any CPU.ActiveCfg = Debug|x86
132131
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|x64.ActiveCfg = Debug|x64
133132
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|x64.Build.0 = Debug|x64
134133
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|x86.ActiveCfg = Debug|x86
135134
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Debug|x86.Build.0 = Debug|x86
136-
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Release|Any CPU.ActiveCfg = Release|Any CPU
137-
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Release|Any CPU.Build.0 = Release|Any CPU
135+
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Release|Any CPU.ActiveCfg = Release|x86
138136
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Release|x64.ActiveCfg = Release|x64
139137
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Release|x64.Build.0 = Release|x64
140138
{BC107A2C-9A23-48C0-A7D5-3C9A03EC8038}.Release|x86.ActiveCfg = Release|x86
@@ -406,9 +404,7 @@ Global
406404
{14ECC1A1-021F-46F4-9C90-247CE49E0ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
407405
{14ECC1A1-021F-46F4-9C90-247CE49E0ABA}.Release|Any CPU.Build.0 = Release|Any CPU
408406
{14ECC1A1-021F-46F4-9C90-247CE49E0ABA}.Release|x64.ActiveCfg = Release|Any CPU
409-
{14ECC1A1-021F-46F4-9C90-247CE49E0ABA}.Release|x64.Build.0 = Release|Any CPU
410407
{14ECC1A1-021F-46F4-9C90-247CE49E0ABA}.Release|x86.ActiveCfg = Release|Any CPU
411-
{14ECC1A1-021F-46F4-9C90-247CE49E0ABA}.Release|x86.Build.0 = Release|Any CPU
412408
EndGlobalSection
413409
GlobalSection(SolutionProperties) = preSolution
414410
HideSolutionNode = FALSE

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-2019
3+
// MapWindow OSS Team - 2015-2020
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-2019 MapWindow OSS Team")]
19-
[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2019")]
18+
[assembly: AssemblyCopyright("Copyright (C) 1998-2020 MapWindow OSS Team")]
19+
[assembly: AssemblyTrademark("MapWindow GIS is a trademark of Daniel P. Ames, 2005-2020")]
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.5.0.*")]
30-
[assembly: AssemblyFileVersion("5.5.0.0")]
29+
[assembly: AssemblyVersion("5.6.1.*")]
30+
[assembly: AssemblyFileVersion("5.6.1.0")]

0 commit comments

Comments
 (0)