ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version 4.16.0. MapControl.WPF.csproj targets multiple frameworks.

Browse source
This commit is contained in:
ClemensF 2019-12-08 22:28:04 +01:00
parent a3ecc76d3e
commit 79e1d79a87
38 changed files with 214 additions and 521 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
FileDbCache/UWP/FileDbCache.UWP.csproj
View file

@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -32,7 +32,7 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
FileDbCache/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

5
FileDbCache/WPF/FileDbCache.WPF.csproj
View file

@ -18,7 +18,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -26,7 +26,8 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
FileDbCache/WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
MBTiles/UWP/MBTiles.UWP.csproj
View file

@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -32,7 +32,7 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MBTiles/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

5
MBTiles/WPF/MBTiles.WPF.csproj
View file

@ -20,7 +20,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -28,7 +28,8 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MBTiles/WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

57
MapControl.sln
View file

@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29102.190
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapControl.WPF", "MapControl\WPF\MapControl.WPF.csproj", "{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleApps", "SampleApps", "{8F2103C2-78AF-4810-8FB9-67572F50C8FC}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleApps", "SampleApps", "{8F2103C2-78AF-4810-8FB9-67572F50C8FC}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication", "SampleApps\WpfApplication\WpfApplication.csproj", "{F92DA93D-75DB-4308-A5F9-6B4C3908A675}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication", "SampleApps\WpfApplication\WpfApplication.csproj", "{F92DA93D-75DB-4308-A5F9-6B4C3908A675}"
@ -15,9 +13,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalApp", "SampleApps\
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapControl.UWP", "MapControl\UWP\MapControl.UWP.csproj", "{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapControl.UWP", "MapControl\UWP\MapControl.UWP.csproj", "{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapControl.WPF.Core", "MapControl\WPF.Core\MapControl.WPF.Core.csproj", "{257D91EB-4DD1-4179-B9F3-7584BF5435D3}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfCoreApp", "SampleApps\WpfCoreApp\WpfCoreApp.csproj", "{E9D15B9A-75F5-40A9-A582-9BFBB074C127}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfCoreApp", "SampleApps\WpfCoreApp\WpfCoreApp.csproj", "{E9D15B9A-75F5-40A9-A582-9BFBB074C127}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapControl.WPF", "MapControl\WPF\MapControl.WPF.csproj", "{62F1726B-3144-49F4-8BCC-94160A3B2186}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -31,22 +29,6 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|ARM.Build.0 = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|x64.ActiveCfg = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|x64.Build.0 = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|x86.ActiveCfg = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|x86.Build.0 = Debug|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|Any CPU.Build.0 = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|ARM.ActiveCfg = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|ARM.Build.0 = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|x64.ActiveCfg = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|x64.Build.0 = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|x86.ActiveCfg = Release|Any CPU
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|x86.Build.0 = Release|Any CPU
{F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|Any CPU.Build.0 = Debug|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|ARM.ActiveCfg = Debug|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -103,22 +85,6 @@ Global
{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x64.Build.0 = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x64.Build.0 = Release|Any CPU
{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x86.ActiveCfg = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x86.ActiveCfg = Release|Any CPU
{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x86.Build.0 = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x86.Build.0 = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|ARM.ActiveCfg = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|ARM.Build.0 = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|x64.ActiveCfg = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|x64.Build.0 = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|x86.ActiveCfg = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Debug|x86.Build.0 = Debug|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|Any CPU.Build.0 = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|ARM.ActiveCfg = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|ARM.Build.0 = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|x64.ActiveCfg = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|x64.Build.0 = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|x86.ActiveCfg = Release|Any CPU
{257D91EB-4DD1-4179-B9F3-7584BF5435D3}.Release|x86.Build.0 = Release|Any CPU
{E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Debug|ARM.ActiveCfg = Debug|Any CPU {E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -135,17 +101,32 @@ Global
{E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Release|x64.Build.0 = Release|Any CPU {E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Release|x64.Build.0 = Release|Any CPU
{E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Release|x86.ActiveCfg = Release|Any CPU {E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Release|x86.ActiveCfg = Release|Any CPU
{E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Release|x86.Build.0 = Release|Any CPU {E9D15B9A-75F5-40A9-A582-9BFBB074C127}.Release|x86.Build.0 = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|ARM.ActiveCfg = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|ARM.Build.0 = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x64.ActiveCfg = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x64.Build.0 = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x86.ActiveCfg = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|x86.Build.0 = Debug|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|Any CPU.Build.0 = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|ARM.ActiveCfg = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|ARM.Build.0 = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x64.ActiveCfg = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x64.Build.0 = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x86.ActiveCfg = Release|Any CPU
{62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{A204A102-C745-4D65-AEC8-7B96FAEDEF2D} = {52AECE49-F314-4F76-98F2-FA800F07824B}
{F92DA93D-75DB-4308-A5F9-6B4C3908A675} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {F92DA93D-75DB-4308-A5F9-6B4C3908A675} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC}
{AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC}
{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344} = {52AECE49-F314-4F76-98F2-FA800F07824B} {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344} = {52AECE49-F314-4F76-98F2-FA800F07824B}
{257D91EB-4DD1-4179-B9F3-7584BF5435D3} = {52AECE49-F314-4F76-98F2-FA800F07824B}
{E9D15B9A-75F5-40A9-A582-9BFBB074C127} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {E9D15B9A-75F5-40A9-A582-9BFBB074C127} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC}
{62F1726B-3144-49F4-8BCC-94160A3B2186} = {52AECE49-F314-4F76-98F2-FA800F07824B}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB} SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB}

4
MapControl/UWP/MapControl.UWP.csproj
View file

@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -32,7 +32,7 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MapControl/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

93
MapControl/WPF.Core/MapControl.WPF.Core.csproj
View file

@ -1,93 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF>
<RootNamespace>MapControl</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Product>XAML Map Control</Product>
<Authors>Clemens Fischer</Authors>
<Version>4.15.1</Version>
<Description>XAML Map Control Library</Description>
<Copyright>Copyright © 2019 Clemens Fischer</Copyright>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageId>XAML.MapControl.Core</PackageId>
<AssemblyName>MapControl.WPF</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE;NET_CORE</DefineConstants>
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;NET_CORE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Shared\AutoEquirectangularProjection.cs" Link="AutoEquirectangularProjection.cs" />
<Compile Include="..\Shared\AzimuthalEquidistantProjection.cs" Link="AzimuthalEquidistantProjection.cs" />
<Compile Include="..\Shared\AzimuthalProjection.cs" Link="AzimuthalProjection.cs" />
<Compile Include="..\Shared\BingMapsTileLayer.cs" Link="BingMapsTileLayer.cs" />
<Compile Include="..\Shared\BingMapsTileSource.cs" Link="BingMapsTileSource.cs" />
<Compile Include="..\Shared\BoundingBox.cs" Link="BoundingBox.cs" />
<Compile Include="..\Shared\CenteredBoundingBox.cs" Link="CenteredBoundingBox.cs" />
<Compile Include="..\Shared\EquirectangularProjection.cs" Link="EquirectangularProjection.cs" />
<Compile Include="..\Shared\GnomonicProjection.cs" Link="GnomonicProjection.cs" />
<Compile Include="..\Shared\HyperlinkText.cs" Link="HyperlinkText.cs" />
<Compile Include="..\Shared\ImageLoader.cs" Link="ImageLoader.cs" />
<Compile Include="..\Shared\Intersections.cs" Link="Intersections.cs" />
<Compile Include="..\Shared\Location.cs" Link="Location.cs" />
<Compile Include="..\Shared\LocationCollection.cs" Link="LocationCollection.cs" />
<Compile Include="..\Shared\LocationEx.cs" Link="LocationEx.cs" />
<Compile Include="..\Shared\MapBase.cs" Link="MapBase.cs" />
<Compile Include="..\Shared\MapGraticule.cs" Link="MapGraticule.cs" />
<Compile Include="..\Shared\MapImageLayer.cs" Link="MapImageLayer.cs" />
<Compile Include="..\Shared\MapItemsControl.cs" Link="MapItemsControl.cs" />
<Compile Include="..\Shared\MapOverlay.cs" Link="MapOverlay.cs" />
<Compile Include="..\Shared\MapPanel.cs" Link="MapPanel.cs" />
<Compile Include="..\Shared\MapPolygon.cs" Link="MapPolygon.cs" />
<Compile Include="..\Shared\MapPolyline.cs" Link="MapPolyline.cs" />
<Compile Include="..\Shared\MapProjection.cs" Link="MapProjection.cs" />
<Compile Include="..\Shared\MapScale.cs" Link="MapScale.cs" />
<Compile Include="..\Shared\MapShape.cs" Link="MapShape.cs" />
<Compile Include="..\Shared\MapTileLayer.cs" Link="MapTileLayer.cs" />
<Compile Include="..\Shared\OrthographicProjection.cs" Link="OrthographicProjection.cs" />
<Compile Include="..\Shared\PolygonCollection.cs" Link="PolygonCollection.cs" />
<Compile Include="..\Shared\Pushpin.cs" Link="Pushpin.cs" />
<Compile Include="..\Shared\StereographicProjection.cs" Link="StereographicProjection.cs" />
<Compile Include="..\Shared\Tile.cs" Link="Tile.cs" />
<Compile Include="..\Shared\TileGrid.cs" Link="TileGrid.cs" />
<Compile Include="..\Shared\TileImageLoader.cs" Link="TileImageLoader.cs" />
<Compile Include="..\Shared\TileSource.cs" Link="TileSource.cs" />
<Compile Include="..\Shared\ViewportChangedEventArgs.cs" Link="ViewportChangedEventArgs.cs" />
<Compile Include="..\Shared\WebMercatorProjection.cs" Link="WebMercatorProjection.cs" />
<Compile Include="..\Shared\WmsImageLayer.cs" Link="WmsImageLayer.cs" />
<Compile Include="..\Shared\WorldMercatorProjection.cs" Link="WorldMercatorProjection.cs" />
<Compile Include="..\WPF\ImageFileCache.WPF.cs" Link="ImageFileCache.WPF.cs" />
<Compile Include="..\WPF\ImageLoader.WPF.cs" Link="ImageLoader.WPF.cs" />
<Compile Include="..\WPF\Map.WPF.cs" Link="Map.WPF.cs" />
<Compile Include="..\WPF\MapBase.WPF.cs" Link="MapBase.WPF.cs" />
<Compile Include="..\WPF\MapGraticule.WPF.cs" Link="MapGraticule.WPF.cs" />
<Compile Include="..\WPF\MapItemsControl.WPF.cs" Link="MapItemsControl.WPF.cs" />
<Compile Include="..\WPF\MapMultiPolygon.WPF.cs" Link="MapMultiPolygon.WPF.cs" />
<Compile Include="..\WPF\MapOverlay.WPF.cs" Link="MapOverlay.WPF.cs" />
<Compile Include="..\WPF\MapPanel.WPF.cs" Link="MapPanel.WPF.cs" />
<Compile Include="..\WPF\MapShape.WPF.cs" Link="MapShape.WPF.cs" />
<Compile Include="..\WPF\Tile.WPF.cs" Link="Tile.WPF.cs" />
<Compile Include="..\WPF\TileImageLoader.WPF.cs" Link="TileImageLoader.WPF.cs" />
<Compile Include="..\WPF\TypeConverters.WPF.cs" Link="TypeConverters.WPF.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\MapControl.snk" Link="MapControl.snk" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
</ItemGroup>
</Project>

9
MapControl/WPF.Core/MapControl.WPF.Core.csproj.user
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<ItemGroup>
<Page Update="Themes\Generic.xaml">
<SubType>Designer</SubType>
</Page>
</ItemGroup>
</Project>

67
MapControl/WPF.Core/Themes/Generic.xaml
View file

@ -1,67 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:map="clr-namespace:MapControl">
<Style TargetType="map:MapItemsControl">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<ItemsPresenter/>
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<map:MapPanel/>
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="map:MapItem">
<Setter Property="Focusable" Value="False"/>
<Setter Property="HorizontalAlignment" Value="Stretch"/>
<Setter Property="VerticalAlignment" Value="Stretch"/>
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="map:MapItem">
<ContentPresenter Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="map:Pushpin">
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Bottom"/>
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
<Setter Property="Padding" Value="3"/>
<Setter Property="Foreground" Value="Black"/>
<Setter Property="Background" Value="White"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="map:Pushpin">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Rectangle Fill="{TemplateBinding Background}"/>
<Path Grid.Row="1" Fill="{TemplateBinding Background}" Data="M 0,-0.5 L 0,16 16,-0.5"/>
<ContentPresenter Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>

0
MapControl/WPF.Core/AssemblyInfo.cs → MapControl/WPF/AssemblyInfo.cs
View file

2
MapControl/WPF/ImageFileCache.WPF.cs
View file

@ -185,7 +185,7 @@ namespace MapControl.Caching
stream.Write(Encoding.ASCII.GetBytes("EXPIRES:"), 0, 8); stream.Write(Encoding.ASCII.GetBytes("EXPIRES:"), 0, 8);
stream.Write(BitConverter.GetBytes(imageCacheItem.Expiration.Ticks), 0, 8); stream.Write(BitConverter.GetBytes(imageCacheItem.Expiration.Ticks), 0, 8);
} }
#if !NET_CORE #if !NETCOREAPP3_0
var fileSecurity = File.GetAccessControl(path); var fileSecurity = File.GetAccessControl(path);
fileSecurity.AddAccessRule(fullControlRule); fileSecurity.AddAccessRule(fullControlRule);
File.SetAccessControl(path, fileSecurity); File.SetAccessControl(path, fileSecurity);

299
MapControl/WPF/MapControl.WPF.csproj
View file

@ -1,206 +1,95 @@
<?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup>
<PropertyGroup> <TargetFrameworks>netcoreapp3.0;net462;net48</TargetFrameworks>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <UseWPF>true</UseWPF>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <RootNamespace>MapControl</RootNamespace>
<ProjectGuid>{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}</ProjectGuid> <SignAssembly>true</SignAssembly>
<OutputType>library</OutputType> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<AppDesignerFolder>Properties</AppDesignerFolder> <DelaySign>false</DelaySign>
<RootNamespace>MapControl</RootNamespace> <Product>XAML Map Control</Product>
<AssemblyName>MapControl.WPF</AssemblyName> <Authors>Clemens Fischer</Authors>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <Version>4.16.0</Version>
<FileAlignment>512</FileAlignment> <Description>XAML Map Control Library</Description>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <Copyright>Copyright © 2019 Clemens Fischer</Copyright>
<WarningLevel>4</WarningLevel> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworkProfile> <PackageId>XAML.MapControl</PackageId>
</TargetFrameworkProfile> <AssemblyName>MapControl.WPF</AssemblyName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>full</DebugType> <DebugType>none</DebugType>
<Optimize>false</Optimize> <DebugSymbols>false</DebugSymbols>
<OutputPath>bin\Debug\</OutputPath> </PropertyGroup>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<WarningLevel>4</WarningLevel> </PropertyGroup>
<NoWarn>
</NoWarn> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit> <DefineConstants>DEBUG</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType> <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.0|AnyCPU'">
<Optimize>true</Optimize> <DefineConstants />
<OutputPath>bin\Release\</OutputPath> </PropertyGroup>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ItemGroup>
<WarningLevel>4</WarningLevel> <None Include="..\..\MapControl.snk" Link="MapControl.snk" />
<Prefer32Bit>false</Prefer32Bit> </ItemGroup>
</PropertyGroup>
<PropertyGroup> <ItemGroup>
<SignAssembly>true</SignAssembly> <Compile Remove="Properties\AssemblyInfo.cs" />
</PropertyGroup> </ItemGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <ItemGroup>
</PropertyGroup> <Compile Include="..\Shared\AutoEquirectangularProjection.cs" Link="AutoEquirectangularProjection.cs" />
<ItemGroup> <Compile Include="..\Shared\AzimuthalEquidistantProjection.cs" Link="AzimuthalEquidistantProjection.cs" />
<Reference Include="System" /> <Compile Include="..\Shared\AzimuthalProjection.cs" Link="AzimuthalProjection.cs" />
<Reference Include="System.Net.Http" /> <Compile Include="..\Shared\BingMapsTileLayer.cs" Link="BingMapsTileLayer.cs" />
<Reference Include="System.Runtime.Caching" /> <Compile Include="..\Shared\BingMapsTileSource.cs" Link="BingMapsTileSource.cs" />
<Reference Include="System.Xaml"> <Compile Include="..\Shared\BoundingBox.cs" Link="BoundingBox.cs" />
<RequiredTargetFramework>4.0</RequiredTargetFramework> <Compile Include="..\Shared\CenteredBoundingBox.cs" Link="CenteredBoundingBox.cs" />
</Reference> <Compile Include="..\Shared\EquirectangularProjection.cs" Link="EquirectangularProjection.cs" />
<Reference Include="System.Xml" /> <Compile Include="..\Shared\GnomonicProjection.cs" Link="GnomonicProjection.cs" />
<Reference Include="System.Xml.Linq" /> <Compile Include="..\Shared\HyperlinkText.cs" Link="HyperlinkText.cs" />
<Reference Include="WindowsBase" /> <Compile Include="..\Shared\ImageLoader.cs" Link="ImageLoader.cs" />
<Reference Include="PresentationCore" /> <Compile Include="..\Shared\Intersections.cs" Link="Intersections.cs" />
<Reference Include="PresentationFramework" /> <Compile Include="..\Shared\Location.cs" Link="Location.cs" />
</ItemGroup> <Compile Include="..\Shared\LocationCollection.cs" Link="LocationCollection.cs" />
<ItemGroup> <Compile Include="..\Shared\LocationEx.cs" Link="LocationEx.cs" />
<Page Include="Themes\Generic.xaml"> <Compile Include="..\Shared\MapBase.cs" Link="MapBase.cs" />
<Generator>MSBuild:Compile</Generator> <Compile Include="..\Shared\MapGraticule.cs" Link="MapGraticule.cs" />
<SubType>Designer</SubType> <Compile Include="..\Shared\MapImageLayer.cs" Link="MapImageLayer.cs" />
</Page> <Compile Include="..\Shared\MapItemsControl.cs" Link="MapItemsControl.cs" />
</ItemGroup> <Compile Include="..\Shared\MapOverlay.cs" Link="MapOverlay.cs" />
<ItemGroup> <Compile Include="..\Shared\MapPanel.cs" Link="MapPanel.cs" />
<Compile Include="..\Shared\AutoEquirectangularProjection.cs"> <Compile Include="..\Shared\MapPolygon.cs" Link="MapPolygon.cs" />
<Link>AutoEquirectangularProjection.cs</Link> <Compile Include="..\Shared\MapPolyline.cs" Link="MapPolyline.cs" />
</Compile> <Compile Include="..\Shared\MapProjection.cs" Link="MapProjection.cs" />
<Compile Include="..\Shared\AzimuthalEquidistantProjection.cs"> <Compile Include="..\Shared\MapScale.cs" Link="MapScale.cs" />
<Link>AzimuthalEquidistantProjection.cs</Link> <Compile Include="..\Shared\MapShape.cs" Link="MapShape.cs" />
</Compile> <Compile Include="..\Shared\MapTileLayer.cs" Link="MapTileLayer.cs" />
<Compile Include="..\Shared\AzimuthalProjection.cs"> <Compile Include="..\Shared\OrthographicProjection.cs" Link="OrthographicProjection.cs" />
<Link>AzimuthalProjection.cs</Link> <Compile Include="..\Shared\PolygonCollection.cs" Link="PolygonCollection.cs" />
</Compile> <Compile Include="..\Shared\Pushpin.cs" Link="Pushpin.cs" />
<Compile Include="..\Shared\BingMapsTileLayer.cs"> <Compile Include="..\Shared\StereographicProjection.cs" Link="StereographicProjection.cs" />
<Link>BingMapsTileLayer.cs</Link> <Compile Include="..\Shared\Tile.cs" Link="Tile.cs" />
</Compile> <Compile Include="..\Shared\TileGrid.cs" Link="TileGrid.cs" />
<Compile Include="..\Shared\BingMapsTileSource.cs"> <Compile Include="..\Shared\TileImageLoader.cs" Link="TileImageLoader.cs" />
<Link>BingMapsTileSource.cs</Link> <Compile Include="..\Shared\TileSource.cs" Link="TileSource.cs" />
</Compile> <Compile Include="..\Shared\ViewportChangedEventArgs.cs" Link="ViewportChangedEventArgs.cs" />
<Compile Include="..\Shared\BoundingBox.cs"> <Compile Include="..\Shared\WebMercatorProjection.cs" Link="WebMercatorProjection.cs" />
<Link>BoundingBox.cs</Link> <Compile Include="..\Shared\WmsImageLayer.cs" Link="WmsImageLayer.cs" />
</Compile> <Compile Include="..\Shared\WorldMercatorProjection.cs" Link="WorldMercatorProjection.cs" />
<Compile Include="..\Shared\CenteredBoundingBox.cs"> </ItemGroup>
<Link>CenteredBoundingBox.cs</Link>
</Compile> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="..\Shared\EquirectangularProjection.cs"> <PackageReference Include="System.Runtime.Caching" Version="4.7.0" />
<Link>EquirectangularProjection.cs</Link> </ItemGroup>
</Compile>
<Compile Include="..\Shared\GnomonicProjection.cs"> <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.0'">
<Link>GnomonicProjection.cs</Link> <Reference Include="System.Net.Http" />
</Compile> <Reference Include="System.Runtime.Caching" />
<Compile Include="..\Shared\HyperlinkText.cs"> </ItemGroup>
<Link>HyperlinkText.cs</Link>
</Compile>
<Compile Include="..\Shared\ImageLoader.cs">
<Link>ImageLoader.cs</Link>
</Compile>
<Compile Include="..\Shared\Intersections.cs">
<Link>Intersections.cs</Link>
</Compile>
<Compile Include="..\Shared\Location.cs">
<Link>Location.cs</Link>
</Compile>
<Compile Include="..\Shared\LocationCollection.cs">
<Link>LocationCollection.cs</Link>
</Compile>
<Compile Include="..\Shared\LocationEx.cs">
<Link>LocationEx.cs</Link>
</Compile>
<Compile Include="..\Shared\MapBase.cs">
<Link>MapBase.cs</Link>
</Compile>
<Compile Include="..\Shared\MapGraticule.cs">
<Link>MapGraticule.cs</Link>
</Compile>
<Compile Include="..\Shared\MapImageLayer.cs">
<Link>MapImageLayer.cs</Link>
</Compile>
<Compile Include="..\Shared\MapItemsControl.cs">
<Link>MapItemsControl.cs</Link>
</Compile>
<Compile Include="..\Shared\MapOverlay.cs">
<Link>MapOverlay.cs</Link>
</Compile>
<Compile Include="..\Shared\MapPanel.cs">
<Link>MapPanel.cs</Link>
</Compile>
<Compile Include="..\Shared\MapPolygon.cs">
<Link>MapPolygon.cs</Link>
</Compile>
<Compile Include="..\Shared\MapPolyline.cs">
<Link>MapPolyline.cs</Link>
</Compile>
<Compile Include="..\Shared\MapProjection.cs">
<Link>MapProjection.cs</Link>
</Compile>
<Compile Include="..\Shared\MapScale.cs">
<Link>MapScale.cs</Link>
</Compile>
<Compile Include="..\Shared\MapShape.cs">
<Link>MapShape.cs</Link>
</Compile>
<Compile Include="..\Shared\MapTileLayer.cs">
<Link>MapTileLayer.cs</Link>
</Compile>
<Compile Include="..\Shared\OrthographicProjection.cs">
<Link>OrthographicProjection.cs</Link>
</Compile>
<Compile Include="..\Shared\PolygonCollection.cs">
<Link>PolygonCollection.cs</Link>
</Compile>
<Compile Include="..\Shared\Pushpin.cs">
<Link>Pushpin.cs</Link>
</Compile>
<Compile Include="..\Shared\StereographicProjection.cs">
<Link>StereographicProjection.cs</Link>
</Compile>
<Compile Include="..\Shared\Tile.cs">
<Link>Tile.cs</Link>
</Compile>
<Compile Include="..\Shared\TileGrid.cs">
<Link>TileGrid.cs</Link>
</Compile>
<Compile Include="..\Shared\TileImageLoader.cs">
<Link>TileImageLoader.cs</Link>
</Compile>
<Compile Include="..\Shared\TileSource.cs">
<Link>TileSource.cs</Link>
</Compile>
<Compile Include="..\Shared\ViewportChangedEventArgs.cs">
<Link>ViewportChangedEventArgs.cs</Link>
</Compile>
<Compile Include="..\Shared\WebMercatorProjection.cs">
<Link>WebMercatorProjection.cs</Link>
</Compile>
<Compile Include="..\Shared\WmsImageLayer.cs">
<Link>WmsImageLayer.cs</Link>
</Compile>
<Compile Include="..\Shared\WorldMercatorProjection.cs">
<Link>WorldMercatorProjection.cs</Link>
</Compile>
<Compile Include="ImageFileCache.WPF.cs" />
<Compile Include="Map.WPF.cs" />
<Compile Include="MapBase.WPF.cs" />
<Compile Include="MapGraticule.WPF.cs" />
<Compile Include="MapItemsControl.WPF.cs" />
<Compile Include="MapMultiPolygon.WPF.cs" />
<Compile Include="MapOverlay.WPF.cs" />
<Compile Include="MapPanel.WPF.cs" />
<Compile Include="MapShape.WPF.cs" />
<Compile Include="TileImageLoader.WPF.cs" />
<Compile Include="ImageLoader.WPF.cs" />
<Compile Include="TypeConverters.WPF.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Tile.WPF.cs" />
<None Include="..\..\MapControl.snk">
<Link>MapControl.snk</Link>
</None>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

4
MapControl/WPF/Properties/AssemblyInfo.cs
View file

@ -8,8 +8,8 @@ using System.Windows;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

7
MapControl/WPF/Themes/Generic.xaml
View file

@ -1,6 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:map="clr-namespace:MapControl"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:map="clr-namespace:MapControl">
<Style TargetType="map:MapItemsControl"> <Style TargetType="map:MapItemsControl">
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>

25
MapControlExtended.sln
View file

@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29102.190
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapControl.WPF", "MapControl\WPF\MapControl.WPF.csproj", "{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapControl.WPF", "MapControl\WPF\MapControl.WPF.csproj", "{A204A102-C745-4D65-AEC8-7B96FAEDEF2D}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleApps", "SampleApps", "{8F2103C2-78AF-4810-8FB9-67572F50C8FC}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleApps", "SampleApps", "{8F2103C2-78AF-4810-8FB9-67572F50C8FC}"
EndProject EndProject
@ -45,8 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteCache.UWP", "SQLiteCa
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteCache.WPF", "SQLiteCache\WPF\SQLiteCache.WPF.csproj", "{0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteCache.WPF", "SQLiteCache\WPF\SQLiteCache.WPF.csproj", "{0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapControl.WPF.Core", "MapControl\WPF.Core\MapControl.WPF.Core.csproj", "{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfCoreApp", "SampleApps\WpfCoreApp\WpfCoreApp.csproj", "{43380AAB-EE6E-40BF-90EB-FFD86F885CAF}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfCoreApp", "SampleApps\WpfCoreApp\WpfCoreApp.csproj", "{43380AAB-EE6E-40BF-90EB-FFD86F885CAF}"
EndProject EndProject
Global Global
@ -349,26 +347,6 @@ Global
{0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x64.Build.0 = Release|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x64.Build.0 = Release|Any CPU
{0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x86.ActiveCfg = Release|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x86.ActiveCfg = Release|Any CPU
{0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x86.Build.0 = Release|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x86.Build.0 = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|ARM.Build.0 = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|ARM64.Build.0 = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|x64.ActiveCfg = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|x64.Build.0 = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|x86.ActiveCfg = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Debug|x86.Build.0 = Debug|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|Any CPU.Build.0 = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|ARM.ActiveCfg = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|ARM.Build.0 = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|ARM64.ActiveCfg = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|ARM64.Build.0 = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|x64.ActiveCfg = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|x64.Build.0 = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|x86.ActiveCfg = Release|Any CPU
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820}.Release|x86.Build.0 = Release|Any CPU
{43380AAB-EE6E-40BF-90EB-FFD86F885CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43380AAB-EE6E-40BF-90EB-FFD86F885CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43380AAB-EE6E-40BF-90EB-FFD86F885CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {43380AAB-EE6E-40BF-90EB-FFD86F885CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43380AAB-EE6E-40BF-90EB-FFD86F885CAF}.Debug|ARM.ActiveCfg = Debug|Any CPU {43380AAB-EE6E-40BF-90EB-FFD86F885CAF}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -408,7 +386,6 @@ Global
{BE08B7BC-8C89-4837-BCE7-EDDDABEAB372} = {2FDC8B91-FB95-4C57-8183-63587FBFE180} {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372} = {2FDC8B91-FB95-4C57-8183-63587FBFE180}
{56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1} = {96FD1258-1597-48A2-8D64-1ADAE13E886A} {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1} = {96FD1258-1597-48A2-8D64-1ADAE13E886A}
{0109C2F0-BA2C-420F-B2CA-DB5B29B1A349} = {96FD1258-1597-48A2-8D64-1ADAE13E886A} {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349} = {96FD1258-1597-48A2-8D64-1ADAE13E886A}
{F97DEEC5-734B-4FFF-A28F-7CC82EA21820} = {52AECE49-F314-4F76-98F2-FA800F07824B}
{43380AAB-EE6E-40BF-90EB-FFD86F885CAF} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {43380AAB-EE6E-40BF-90EB-FFD86F885CAF} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution

4
MapImages/UWP/MapImages.UWP.csproj
View file

@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -32,7 +32,7 @@
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MapImages/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

5
MapImages/WPF/MapImages.WPF.csproj
View file

@ -19,7 +19,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -27,7 +27,8 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MapImages/WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
MapProjections/UWP/MapProjections.UWP.csproj
View file

@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -32,7 +32,7 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MapProjections/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

5
MapProjections/WPF/MapProjections.WPF.csproj
View file

@ -20,7 +20,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -28,7 +28,8 @@
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
MapProjections/WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SQLiteCache/UWP/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SQLiteCache/UWP/SQLiteCache.UWP.csproj
View file

@ -23,7 +23,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -32,7 +32,7 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
SQLiteCache/WPF/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

5
SQLiteCache/WPF/SQLiteCache.WPF.csproj
View file

@ -22,7 +22,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -30,7 +30,8 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>

4
SampleApps/UniversalApp/Properties/AssemblyInfo.cs
View file

@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SampleApps/UniversalApp/UniversalApp.csproj
View file

@ -50,7 +50,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath> <OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants> <DefineConstants>DEBUG;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
<NoWarn>;2008</NoWarn> <NoWarn>;2008</NoWarn>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
@ -62,7 +62,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath> <OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants> <DefineConstants>WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<NoWarn>;2008</NoWarn> <NoWarn>;2008</NoWarn>
<DebugType>none</DebugType> <DebugType>none</DebugType>

4
SampleApps/WpfApplication/Properties/AssemblyInfo.cs
View file

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("4.15.1")] [assembly: AssemblyVersion("4.16.0")]
[assembly: AssemblyFileVersion("4.15.1")] [assembly: AssemblyFileVersion("4.16.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

17
SampleApps/WpfApplication/WpfApplication.csproj
View file

@ -24,7 +24,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -33,7 +33,8 @@
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
@ -83,17 +84,17 @@
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MapControl\WPF\MapControl.WPF.csproj">
<Project>{a204a102-c745-4d65-aec8-7b96faedef2d}</Project>
<Name>MapControl.WPF</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Resource Include="..\Shared\10_535_330.jpg"> <Resource Include="..\Shared\10_535_330.jpg">
<Link>10_535_330.jpg</Link> <Link>10_535_330.jpg</Link>
</Resource> </Resource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MapControl\WPF\MapControl.WPF.csproj">
<Project>{62f1726b-3144-49f4-8bcc-94160a3b2186}</Project>
<Name>MapControl.WPF</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
SampleApps/WpfCoreApp/MainWindow.xaml
View file

@ -7,7 +7,7 @@
xmlns:vm="clr-namespace:ViewModel" xmlns:vm="clr-namespace:ViewModel"
xmlns:local="clr-namespace:WpfCoreApp" xmlns:local="clr-namespace:WpfCoreApp"
mc:Ignorable="d" mc:Ignorable="d"
Title="MainWindow" Height="600" Width="800"> Title="XAML MapControl - WPF .NET Core 3.0 Test Application" Height="600" Width="800">
<Window.Resources> <Window.Resources>
<local:LocationToVisibilityConverter x:Key="LocationToVisibilityConverter"/> <local:LocationToVisibilityConverter x:Key="LocationToVisibilityConverter"/>

46
SampleApps/WpfCoreApp/WpfCoreApp.csproj
View file

@ -1,26 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>WpfCoreApp</RootNamespace> <RootNamespace>WpfCoreApp</RootNamespace>
<Version>4.15.1</Version> <Version>4.16.0</Version>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Compile Include="..\Shared\MapLayers.cs" Link="MapLayers.cs" /> <DefineConstants>DEBUG</DefineConstants>
<Compile Include="..\Shared\MapViewModel.cs" Link="MapViewModel.cs" /> </PropertyGroup>
</ItemGroup>
<ItemGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Resource Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" /> <DefineConstants></DefineConstants>
</ItemGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\MapControl\WPF.Core\MapControl.WPF.Core.csproj" /> <Compile Include="..\Shared\MapLayers.cs" Link="MapLayers.cs" />
</ItemGroup> <Compile Include="..\Shared\MapViewModel.cs" Link="MapViewModel.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MapControl\WPF\MapControl.WPF.csproj" />
</ItemGroup>
<ItemGroup>
<Resource Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" />
</ItemGroup>
</Project> </Project>