From 79e1d79a87678708a2b40f0e3edcb8c4fc7a8533 Mon Sep 17 00:00:00 2001 From: ClemensF Date: Sun, 8 Dec 2019 22:28:04 +0100 Subject: [PATCH] Version 4.16.0. MapControl.WPF.csproj targets multiple frameworks. --- FileDbCache/UWP/FileDbCache.UWP.csproj | 4 +- FileDbCache/UWP/Properties/AssemblyInfo.cs | 4 +- FileDbCache/WPF/FileDbCache.WPF.csproj | 5 +- FileDbCache/WPF/Properties/AssemblyInfo.cs | 4 +- MBTiles/UWP/MBTiles.UWP.csproj | 4 +- MBTiles/UWP/Properties/AssemblyInfo.cs | 4 +- MBTiles/WPF/MBTiles.WPF.csproj | 5 +- MBTiles/WPF/Properties/AssemblyInfo.cs | 4 +- MapControl.sln | 57 ++-- MapControl/UWP/MapControl.UWP.csproj | 4 +- MapControl/UWP/Properties/AssemblyInfo.cs | 4 +- .../WPF.Core/MapControl.WPF.Core.csproj | 93 ------ .../WPF.Core/MapControl.WPF.Core.csproj.user | 9 - MapControl/WPF.Core/Themes/Generic.xaml | 67 ---- MapControl/{WPF.Core => WPF}/AssemblyInfo.cs | 0 MapControl/WPF/ImageFileCache.WPF.cs | 2 +- MapControl/WPF/MapControl.WPF.csproj | 301 ++++++------------ MapControl/WPF/Properties/AssemblyInfo.cs | 4 +- MapControl/WPF/Themes/Generic.xaml | 7 +- MapControlExtended.sln | 25 +- MapImages/UWP/MapImages.UWP.csproj | 4 +- MapImages/UWP/Properties/AssemblyInfo.cs | 4 +- MapImages/WPF/MapImages.WPF.csproj | 5 +- MapImages/WPF/Properties/AssemblyInfo.cs | 4 +- MapProjections/UWP/MapProjections.UWP.csproj | 4 +- MapProjections/UWP/Properties/AssemblyInfo.cs | 4 +- MapProjections/WPF/MapProjections.WPF.csproj | 5 +- MapProjections/WPF/Properties/AssemblyInfo.cs | 4 +- SQLiteCache/UWP/Properties/AssemblyInfo.cs | 4 +- SQLiteCache/UWP/SQLiteCache.UWP.csproj | 4 +- SQLiteCache/WPF/Properties/AssemblyInfo.cs | 4 +- SQLiteCache/WPF/SQLiteCache.WPF.csproj | 5 +- .../UniversalApp/Properties/AssemblyInfo.cs | 4 +- SampleApps/UniversalApp/UniversalApp.csproj | 4 +- .../WpfApplication/Properties/AssemblyInfo.cs | 4 +- .../WpfApplication/WpfApplication.csproj | 17 +- SampleApps/WpfCoreApp/MainWindow.xaml | 2 +- SampleApps/WpfCoreApp/WpfCoreApp.csproj | 46 +-- 38 files changed, 214 insertions(+), 521 deletions(-) delete mode 100644 MapControl/WPF.Core/MapControl.WPF.Core.csproj delete mode 100644 MapControl/WPF.Core/MapControl.WPF.Core.csproj.user delete mode 100644 MapControl/WPF.Core/Themes/Generic.xaml rename MapControl/{WPF.Core => WPF}/AssemblyInfo.cs (100%) diff --git a/FileDbCache/UWP/FileDbCache.UWP.csproj b/FileDbCache/UWP/FileDbCache.UWP.csproj index d0e914c5..04b88368 100644 --- a/FileDbCache/UWP/FileDbCache.UWP.csproj +++ b/FileDbCache/UWP/FileDbCache.UWP.csproj @@ -23,7 +23,7 @@ full false bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;WINDOWS_UWP prompt 4 @@ -32,7 +32,7 @@ none true bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + WINDOWS_UWP prompt 4 diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs index b6adbe18..510af944 100644 --- a/FileDbCache/UWP/Properties/AssemblyInfo.cs +++ b/FileDbCache/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.15.1")] -[assembly: AssemblyFileVersion("4.15.1")] +[assembly: AssemblyVersion("4.16.0")] +[assembly: AssemblyFileVersion("4.16.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj index 95cb5c08..d2b1680b 100644 --- a/FileDbCache/WPF/FileDbCache.WPF.csproj +++ b/FileDbCache/WPF/FileDbCache.WPF.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + DEBUG prompt 4 @@ -26,7 +26,8 @@ none true bin\Release\ - TRACE + + prompt 4 diff --git a/FileDbCache/WPF/Properties/AssemblyInfo.cs b/FileDbCache/WPF/Properties/AssemblyInfo.cs index 8db3c5a9..11d102f9 100644 --- a/FileDbCache/WPF/Properties/AssemblyInfo.cs +++ b/FileDbCache/WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.15.1")] -[assembly: AssemblyFileVersion("4.15.1")] +[assembly: AssemblyVersion("4.16.0")] +[assembly: AssemblyFileVersion("4.16.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/UWP/MBTiles.UWP.csproj b/MBTiles/UWP/MBTiles.UWP.csproj index 6aaac5e9..18a6c367 100644 --- a/MBTiles/UWP/MBTiles.UWP.csproj +++ b/MBTiles/UWP/MBTiles.UWP.csproj @@ -23,7 +23,7 @@ full false bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;WINDOWS_UWP prompt 4 @@ -32,7 +32,7 @@ none true bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + WINDOWS_UWP prompt 4 diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs index 9845dbb0..fe331f1e 100644 --- a/MBTiles/UWP/Properties/AssemblyInfo.cs +++ b/MBTiles/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.15.1")] -[assembly: AssemblyFileVersion("4.15.1")] +[assembly: AssemblyVersion("4.16.0")] +[assembly: AssemblyFileVersion("4.16.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj index 9519d613..5f2f8cca 100644 --- a/MBTiles/WPF/MBTiles.WPF.csproj +++ b/MBTiles/WPF/MBTiles.WPF.csproj @@ -20,7 +20,7 @@ full false bin\Debug\ - DEBUG;TRACE + DEBUG prompt 4 @@ -28,7 +28,8 @@ none true bin\Release\ - TRACE + + prompt 4 diff --git a/MBTiles/WPF/Properties/AssemblyInfo.cs b/MBTiles/WPF/Properties/AssemblyInfo.cs index f8d62467..3d45d3c6 100644 --- a/MBTiles/WPF/Properties/AssemblyInfo.cs +++ b/MBTiles/WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.15.1")] -[assembly: AssemblyFileVersion("4.15.1")] +[assembly: AssemblyVersion("4.16.0")] +[assembly: AssemblyFileVersion("4.16.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl.sln b/MapControl.sln index d84e9874..e22a014f 100644 --- a/MapControl.sln +++ b/MapControl.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29102.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}" 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}" EndProject 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 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapControl.UWP", "MapControl\UWP\MapControl.UWP.csproj", "{9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}" 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 -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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -31,22 +29,6 @@ Global Release|x86 = Release|x86 EndGlobalSection 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.Build.0 = 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|x86.ActiveCfg = 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.Build.0 = 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|x86.ActiveCfg = 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 GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A204A102-C745-4D65-AEC8-7B96FAEDEF2D} = {52AECE49-F314-4F76-98F2-FA800F07824B} {F92DA93D-75DB-4308-A5F9-6B4C3908A675} = {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} - {257D91EB-4DD1-4179-B9F3-7584BF5435D3} = {52AECE49-F314-4F76-98F2-FA800F07824B} {E9D15B9A-75F5-40A9-A582-9BFBB074C127} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} + {62F1726B-3144-49F4-8BCC-94160A3B2186} = {52AECE49-F314-4F76-98F2-FA800F07824B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB} diff --git a/MapControl/UWP/MapControl.UWP.csproj b/MapControl/UWP/MapControl.UWP.csproj index 13198ba9..cf12f12f 100644 --- a/MapControl/UWP/MapControl.UWP.csproj +++ b/MapControl/UWP/MapControl.UWP.csproj @@ -23,7 +23,7 @@ full false bin\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + DEBUG;WINDOWS_UWP prompt 4 @@ -32,7 +32,7 @@ none true bin\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP + WINDOWS_UWP prompt 4 diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index be414880..702db651 100644 --- a/MapControl/UWP/Properties/AssemblyInfo.cs +++ b/MapControl/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.15.1")] -[assembly: AssemblyFileVersion("4.15.1")] +[assembly: AssemblyVersion("4.16.0")] +[assembly: AssemblyFileVersion("4.16.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF.Core/MapControl.WPF.Core.csproj b/MapControl/WPF.Core/MapControl.WPF.Core.csproj deleted file mode 100644 index e12cc377..00000000 --- a/MapControl/WPF.Core/MapControl.WPF.Core.csproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - netcoreapp3.0 - true - MapControl - true - ..\..\MapControl.snk - false - XAML Map Control - Clemens Fischer - 4.15.1 - XAML Map Control Library - Copyright © 2019 Clemens Fischer - false - XAML.MapControl.Core - MapControl.WPF - - - - TRACE;NET_CORE - none - false - - - - TRACE;NET_CORE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MapControl/WPF.Core/MapControl.WPF.Core.csproj.user b/MapControl/WPF.Core/MapControl.WPF.Core.csproj.user deleted file mode 100644 index 3c8701a4..00000000 --- a/MapControl/WPF.Core/MapControl.WPF.Core.csproj.user +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - Designer - - - \ No newline at end of file diff --git a/MapControl/WPF.Core/Themes/Generic.xaml b/MapControl/WPF.Core/Themes/Generic.xaml deleted file mode 100644 index 5fb6de02..00000000 --- a/MapControl/WPF.Core/Themes/Generic.xaml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/MapControl/WPF.Core/AssemblyInfo.cs b/MapControl/WPF/AssemblyInfo.cs similarity index 100% rename from MapControl/WPF.Core/AssemblyInfo.cs rename to MapControl/WPF/AssemblyInfo.cs diff --git a/MapControl/WPF/ImageFileCache.WPF.cs b/MapControl/WPF/ImageFileCache.WPF.cs index d1f32d3d..9c3efad7 100644 --- a/MapControl/WPF/ImageFileCache.WPF.cs +++ b/MapControl/WPF/ImageFileCache.WPF.cs @@ -185,7 +185,7 @@ namespace MapControl.Caching stream.Write(Encoding.ASCII.GetBytes("EXPIRES:"), 0, 8); stream.Write(BitConverter.GetBytes(imageCacheItem.Expiration.Ticks), 0, 8); } -#if !NET_CORE +#if !NETCOREAPP3_0 var fileSecurity = File.GetAccessControl(path); fileSecurity.AddAccessRule(fullControlRule); File.SetAccessControl(path, fileSecurity); diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj index e4ac0451..e9164ef2 100644 --- a/MapControl/WPF/MapControl.WPF.csproj +++ b/MapControl/WPF/MapControl.WPF.csproj @@ -1,206 +1,95 @@ - - - - - Debug - AnyCPU - {A204A102-C745-4D65-AEC8-7B96FAEDEF2D} - library - Properties - MapControl - MapControl.WPF - v4.6.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - false - - - none - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - - - ..\..\MapControl.snk - - - - - - - 4.0 - - - - - - - - - - MSBuild:Compile - Designer - - - - - AutoEquirectangularProjection.cs - - - AzimuthalEquidistantProjection.cs - - - AzimuthalProjection.cs - - - BingMapsTileLayer.cs - - - BingMapsTileSource.cs - - - BoundingBox.cs - - - CenteredBoundingBox.cs - - - EquirectangularProjection.cs - - - GnomonicProjection.cs - - - HyperlinkText.cs - - - ImageLoader.cs - - - Intersections.cs - - - Location.cs - - - LocationCollection.cs - - - LocationEx.cs - - - MapBase.cs - - - MapGraticule.cs - - - MapImageLayer.cs - - - MapItemsControl.cs - - - MapOverlay.cs - - - MapPanel.cs - - - MapPolygon.cs - - - MapPolyline.cs - - - MapProjection.cs - - - MapScale.cs - - - MapShape.cs - - - MapTileLayer.cs - - - OrthographicProjection.cs - - - PolygonCollection.cs - - - Pushpin.cs - - - StereographicProjection.cs - - - Tile.cs - - - TileGrid.cs - - - TileImageLoader.cs - - - TileSource.cs - - - ViewportChangedEventArgs.cs - - - WebMercatorProjection.cs - - - WmsImageLayer.cs - - - WorldMercatorProjection.cs - - - - - - - - - - - - - - - Code - - - - MapControl.snk - - - - - - \ No newline at end of file + + + + netcoreapp3.0;net462;net48 + true + MapControl + true + ..\..\MapControl.snk + false + XAML Map Control + Clemens Fischer + 4.16.0 + XAML Map Control Library + Copyright © 2019 Clemens Fischer + true + XAML.MapControl + MapControl.WPF + + + + none + false + + + + + + + DEBUG + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MapControl/WPF/Properties/AssemblyInfo.cs b/MapControl/WPF/Properties/AssemblyInfo.cs index 51a8cddb..66273f9e 100644 --- a/MapControl/WPF/Properties/AssemblyInfo.cs +++ b/MapControl/WPF/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2019 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("4.15.1")] -[assembly: AssemblyFileVersion("4.15.1")] +[assembly: AssemblyVersion("4.16.0")] +[assembly: AssemblyFileVersion("4.16.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/Themes/Generic.xaml b/MapControl/WPF/Themes/Generic.xaml index 68019ade..a243f46b 100644 --- a/MapControl/WPF/Themes/Generic.xaml +++ b/MapControl/WPF/Themes/Generic.xaml @@ -1,6 +1,7 @@ - +