diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs index 5e4538bd..4e250fe7 100644 --- a/FileDbCache/UWP/Properties/AssemblyInfo.cs +++ b/FileDbCache/UWP/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("XAML Map Control FileDbCache (UWP)")] -[assembly: AssemblyDescription("IImageCache implementation based on EzTools FileDb")] +[assembly: AssemblyTitle("XAML Map Control FileDbCache Library for UWP")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj index b71b9d13..10c374d8 100644 --- a/FileDbCache/WPF/FileDbCache.WPF.csproj +++ b/FileDbCache/WPF/FileDbCache.WPF.csproj @@ -3,15 +3,14 @@ net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 true MapControl.Caching - FileDbCache.WPF + XAML Map Control FileDbCache Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - ObjectCache implementation based on EzTools FileDb - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.FileDbCache diff --git a/FileDbCache/WinUI/FileDbCache.WinUI.csproj b/FileDbCache/WinUI/FileDbCache.WinUI.csproj index a6a1de9f..38bcb661 100644 --- a/FileDbCache/WinUI/FileDbCache.WinUI.csproj +++ b/FileDbCache/WinUI/FileDbCache.WinUI.csproj @@ -5,14 +5,14 @@ win10-x86;win10-x64;win10-arm64 true MapControl.Caching + XAML Map Control FileDbCache Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - IImageCache implementation based on EzTools FileDb - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.FileDbCache WINUI diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs index 0b9bba5c..3342d752 100644 --- a/MBTiles/UWP/Properties/AssemblyInfo.cs +++ b/MBTiles/UWP/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("XAML Map Control MBTiles Support (UWP)")] -[assembly: AssemblyDescription("MBTiles Support Library for XAML Map Control")] +[assembly: AssemblyTitle("XAML Map Control MBTiles Library for UWP")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj index 3ebf8630..c1454370 100644 --- a/MBTiles/WPF/MBTiles.WPF.csproj +++ b/MBTiles/WPF/MBTiles.WPF.csproj @@ -3,15 +3,14 @@ net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 true MapControl.MBTiles - MBTiles.WPF + XAML Map Control MBTiles Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - MBTiles Support Library for XAML Map Control - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.MBTiles diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj index 3a8b027f..a9b98807 100644 --- a/MBTiles/WinUI/MBTiles.WinUI.csproj +++ b/MBTiles/WinUI/MBTiles.WinUI.csproj @@ -5,14 +5,14 @@ win10-x86;win10-x64;win10-arm64 true MapControl.MBTiles + XAML Map Control MBTiles Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - MBTiles Support Library for XAML Map Control - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.MBTiles WINUI diff --git a/MapControl.sln b/MapControl.sln index 149ba2af..5bb0787d 100644 --- a/MapControl.sln +++ b/MapControl.sln @@ -19,130 +19,102 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapControl.WinUI", "MapCont EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUiApp", "SampleApps\WinUiApp\WinUiApp.csproj", "{579B29D7-91CA-44F3-A96D-5D9BC957BADA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapUiTools", "MapUiTools", "{ABFA5526-FCE4-47C9-94F4-84D5F59EECA8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapUiTools.WPF", "MapUiTools\WPF\MapUiTools.WPF.csproj", "{9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapUiTools.WinUI", "MapUiTools\WinUI\MapUiTools.WinUI.csproj", "{A877A741-9FF5-453D-89C8-3BE7A94D74C1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapUiTools.UWP", "MapUiTools\UWP\MapUiTools.UWP.csproj", "{DFFE8E49-AA07-457E-A459-99326B44F828}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|arm64 = Release|arm64 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.ActiveCfg = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.Build.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.Deploy.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.ActiveCfg = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.Build.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.Deploy.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.ActiveCfg = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.Build.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.Deploy.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.ActiveCfg = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.Build.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.Deploy.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.ActiveCfg = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.Build.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.Deploy.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.ActiveCfg = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.Build.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.Deploy.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.ActiveCfg = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.Build.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.Deploy.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.ActiveCfg = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.Build.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.Deploy.0 = Release|x64 {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|arm64.ActiveCfg = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|arm64.Build.0 = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x64.ActiveCfg = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x64.Build.0 = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x86.ActiveCfg = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x86.Build.0 = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|Any CPU.ActiveCfg = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|Any CPU.Build.0 = Release|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|arm64.ActiveCfg = Release|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|arm64.Build.0 = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x64.ActiveCfg = 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.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|arm64.ActiveCfg = Debug|Any CPU - {62F1726B-3144-49F4-8BCC-94160A3B2186}.Debug|arm64.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|arm64.ActiveCfg = Release|Any CPU - {62F1726B-3144-49F4-8BCC-94160A3B2186}.Release|arm64.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 {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|arm64.ActiveCfg = Debug|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|arm64.Build.0 = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x64.ActiveCfg = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x64.Build.0 = Debug|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x86.ActiveCfg = Debug|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Debug|x86.Build.0 = Debug|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|Any CPU.Build.0 = Release|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|arm64.ActiveCfg = Release|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|arm64.Build.0 = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x64.ActiveCfg = Release|Any CPU {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x64.Build.0 = Release|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x86.ActiveCfg = Release|Any CPU - {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E}.Release|x86.Build.0 = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Debug|arm64.ActiveCfg = Debug|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Debug|arm64.Build.0 = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|x64.ActiveCfg = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Debug|x64.Build.0 = Debug|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Debug|x86.Build.0 = Debug|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|Any CPU.ActiveCfg = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|Any CPU.Build.0 = Release|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Release|arm64.ActiveCfg = Release|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Release|arm64.Build.0 = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|x64.ActiveCfg = Release|Any CPU {92894476-02E1-47CB-936E-4154023456F0}.Release|x64.Build.0 = Release|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Release|x86.ActiveCfg = Release|Any CPU - {92894476-02E1-47CB-936E-4154023456F0}.Release|x86.Build.0 = Release|Any CPU {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|Any CPU.ActiveCfg = Debug|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|Any CPU.Build.0 = Debug|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|Any CPU.Deploy.0 = Debug|x64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|arm64.ActiveCfg = Debug|arm64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|arm64.Build.0 = Debug|arm64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|arm64.Deploy.0 = Debug|arm64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x64.ActiveCfg = Debug|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x64.Build.0 = Debug|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x64.Deploy.0 = Debug|x64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x86.ActiveCfg = Debug|x86 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x86.Build.0 = Debug|x86 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Debug|x86.Deploy.0 = Debug|x86 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|Any CPU.ActiveCfg = Release|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|Any CPU.Build.0 = Release|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|Any CPU.Deploy.0 = Release|x64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|arm64.ActiveCfg = Release|arm64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|arm64.Build.0 = Release|arm64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|arm64.Deploy.0 = Release|arm64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x64.ActiveCfg = Release|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x64.Build.0 = Release|x64 {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x64.Deploy.0 = Release|x64 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x86.ActiveCfg = Release|x86 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x86.Build.0 = Release|x86 - {579B29D7-91CA-44F3-A96D-5D9BC957BADA}.Release|x86.Deploy.0 = Release|x86 + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Debug|x64.ActiveCfg = Debug|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Debug|x64.Build.0 = Debug|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Release|Any CPU.Build.0 = Release|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Release|x64.ActiveCfg = Release|Any CPU + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E}.Release|x64.Build.0 = Release|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Debug|x64.ActiveCfg = Debug|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Debug|x64.Build.0 = Debug|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Release|Any CPU.Build.0 = Release|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Release|x64.ActiveCfg = Release|Any CPU + {A877A741-9FF5-453D-89C8-3BE7A94D74C1}.Release|x64.Build.0 = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|x64.ActiveCfg = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|x64.Build.0 = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|Any CPU.Build.0 = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|x64.ActiveCfg = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -154,6 +126,9 @@ Global {CA60DFDB-0BE1-40F6-B575-CDC797A40E2E} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {92894476-02E1-47CB-936E-4154023456F0} = {52AECE49-F314-4F76-98F2-FA800F07824B} {579B29D7-91CA-44F3-A96D-5D9BC957BADA} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} + {9B2886B0-D2A8-479B-B52E-1C7B63CAB97E} = {ABFA5526-FCE4-47C9-94F4-84D5F59EECA8} + {A877A741-9FF5-453D-89C8-3BE7A94D74C1} = {ABFA5526-FCE4-47C9-94F4-84D5F59EECA8} + {DFFE8E49-AA07-457E-A459-99326B44F828} = {ABFA5526-FCE4-47C9-94F4-84D5F59EECA8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB} diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index 2a97d1b1..fa16a7de 100644 --- a/MapControl/UWP/Properties/AssemblyInfo.cs +++ b/MapControl/UWP/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("XAML Map Control (UWP)")] -[assembly: AssemblyDescription("XAML Map Control Library")] +[assembly: AssemblyTitle("XAML Map Control Library for UWP")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj index b32119ff..6bab31a8 100644 --- a/MapControl/WPF/MapControl.WPF.csproj +++ b/MapControl/WPF/MapControl.WPF.csproj @@ -3,14 +3,14 @@ net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 true MapControl + XAML Map Control Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - XAML Map Control Library - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj index 2a0701b3..2e042e6d 100644 --- a/MapControl/WinUI/MapControl.WinUI.csproj +++ b/MapControl/WinUI/MapControl.WinUI.csproj @@ -5,14 +5,14 @@ win10-x86;win10-x64;win10-arm64 true MapControl + XAML Map Control Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - XAML Map Control Library - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl WINUI diff --git a/MapControlExtended.sln b/MapControlExtended.sln index d6c33a82..2398f3d7 100644 --- a/MapControlExtended.sln +++ b/MapControlExtended.sln @@ -53,11 +53,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteCache.WinUI", "SQLite EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapProjections.WinUI", "MapProjections\WinUI\MapProjections.WinUI.csproj", "{3572F71A-83FE-459D-8370-002CA28827FE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{60A0BD05-219C-4A4F-9539-520D4A6D0161}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapImages.WinUI", "MapImages\WinUI\MapImages.WinUI.csproj", "{1F9FBADF-65C0-453D-9B45-7A88044F807F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MBTiles.WinUI", "MBTiles\WinUI\MBTiles.WinUI.csproj", "{817D606F-A22D-485C-89CF-86062C8E97EF}" @@ -66,386 +61,230 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUiApp", "SampleApps\WinU EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectionDemo", "SampleApps\ProjectionDemo\ProjectionDemo.csproj", "{AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapUiTools", "MapUiTools", "{90C681E9-12AE-4B5F-932D-7EF5D35D8436}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapUiTools.UWP", "MapUiTools\UWP\MapUiTools.UWP.csproj", "{DFFE8E49-AA07-457E-A459-99326B44F828}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapUiTools.WinUI", "MapUiTools\WinUI\MapUiTools.WinUI.csproj", "{C412209E-D81D-4ACB-BECD-FEEF52B93468}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapUiTools.WPF", "MapUiTools\WPF\MapUiTools.WPF.csproj", "{12430DAE-DC53-4C37-95D5-B8923B5FD3D7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|arm64 = Release|arm64 Release|x64 = Release|x64 - 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|arm64.ActiveCfg = Debug|Any CPU - {A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Debug|arm64.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|arm64.ActiveCfg = Release|Any CPU - {A204A102-C745-4D65-AEC8-7B96FAEDEF2D}.Release|arm64.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 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.ActiveCfg = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.Build.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|Any CPU.Deploy.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.ActiveCfg = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.Build.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|arm64.Deploy.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.ActiveCfg = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.Build.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x64.Deploy.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.ActiveCfg = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.Build.0 = Debug|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Debug|x86.Deploy.0 = Debug|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.ActiveCfg = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.Build.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|Any CPU.Deploy.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.ActiveCfg = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.Build.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|arm64.Deploy.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.ActiveCfg = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.Build.0 = Release|x64 {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x64.Deploy.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.ActiveCfg = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.Build.0 = Release|x64 - {AA62B4AA-1CA3-4C20-BEB7-B824D0FC4BD1}.Release|x86.Deploy.0 = Release|x64 {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|arm64.ActiveCfg = Debug|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|arm64.Build.0 = Debug|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|x64.ActiveCfg = Debug|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|x64.Build.0 = Debug|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|x86.ActiveCfg = Debug|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Debug|x86.Build.0 = Debug|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|Any CPU.ActiveCfg = Release|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|Any CPU.Build.0 = Release|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|arm64.ActiveCfg = Release|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|arm64.Build.0 = Release|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|x64.ActiveCfg = Release|Any CPU {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|x64.Build.0 = Release|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|x86.ActiveCfg = Release|Any CPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C}.Release|x86.Build.0 = Release|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|arm64.ActiveCfg = Debug|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|arm64.Build.0 = Debug|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|x64.ActiveCfg = Debug|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|x64.Build.0 = Debug|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|x86.ActiveCfg = Debug|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Debug|x86.Build.0 = Debug|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|Any CPU.ActiveCfg = Release|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|Any CPU.Build.0 = Release|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|arm64.ActiveCfg = Release|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|arm64.Build.0 = Release|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|x64.ActiveCfg = Release|Any CPU {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|x64.Build.0 = Release|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|x86.ActiveCfg = Release|Any CPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133}.Release|x86.Build.0 = Release|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|arm64.ActiveCfg = Debug|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|arm64.Build.0 = Debug|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|x64.ActiveCfg = Debug|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|x64.Build.0 = Debug|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|x86.ActiveCfg = Debug|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Debug|x86.Build.0 = Debug|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|Any CPU.Build.0 = Release|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|arm64.ActiveCfg = Release|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|arm64.Build.0 = Release|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|x64.ActiveCfg = Release|Any CPU {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|x64.Build.0 = Release|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|x86.ActiveCfg = Release|Any CPU - {BEEB142A-5FA3-468D-810A-32A4A5BD6D5D}.Release|x86.Build.0 = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|arm64.ActiveCfg = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|arm64.Build.0 = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x64.ActiveCfg = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x64.Build.0 = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x86.ActiveCfg = Debug|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Debug|x86.Build.0 = Debug|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|Any CPU.ActiveCfg = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|Any CPU.Build.0 = Release|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|arm64.ActiveCfg = Release|Any CPU - {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|arm64.Build.0 = Release|Any CPU {9545F73C-9C35-4CF6-BAAE-19A0BAEBD344}.Release|x64.ActiveCfg = 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.Build.0 = Release|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|arm64.ActiveCfg = Debug|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|arm64.Build.0 = Debug|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|x64.ActiveCfg = Debug|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|x64.Build.0 = Debug|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|x86.ActiveCfg = Debug|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Debug|x86.Build.0 = Debug|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|Any CPU.Build.0 = Release|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|arm64.ActiveCfg = Release|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|arm64.Build.0 = Release|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|x64.ActiveCfg = Release|Any CPU {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|x64.Build.0 = Release|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|x86.ActiveCfg = Release|Any CPU - {DCC111E9-EC8B-492A-A09D-DF390D83AE8D}.Release|x86.Build.0 = Release|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|Any CPU.Build.0 = Debug|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|arm64.ActiveCfg = Debug|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|arm64.Build.0 = Debug|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|x64.ActiveCfg = Debug|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|x64.Build.0 = Debug|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|x86.ActiveCfg = Debug|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Debug|x86.Build.0 = Debug|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|Any CPU.ActiveCfg = Release|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|Any CPU.Build.0 = Release|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|arm64.ActiveCfg = Release|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|arm64.Build.0 = Release|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|x64.ActiveCfg = Release|Any CPU {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|x64.Build.0 = Release|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.Release|x86.ActiveCfg = Release|Any CPU - {426C21C0-5F14-491F-BCD1-6D2993510420}.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|arm64.ActiveCfg = Debug|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|arm64.Build.0 = Debug|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|x64.ActiveCfg = Debug|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|x64.Build.0 = Debug|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|x86.ActiveCfg = Debug|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Debug|x86.Build.0 = Debug|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|Any CPU.ActiveCfg = Release|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|Any CPU.Build.0 = Release|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|arm64.ActiveCfg = Release|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|arm64.Build.0 = Release|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|x64.ActiveCfg = Release|Any CPU {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|x64.Build.0 = Release|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|x86.ActiveCfg = Release|Any CPU - {F92DA93D-75DB-4308-A5F9-6B4C3908A675}.Release|x86.Build.0 = Release|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|arm64.ActiveCfg = Debug|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|arm64.Build.0 = Debug|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|x64.ActiveCfg = Debug|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|x64.Build.0 = Debug|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|x86.ActiveCfg = Debug|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Debug|x86.Build.0 = Debug|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|Any CPU.ActiveCfg = Release|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|Any CPU.Build.0 = Release|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|arm64.ActiveCfg = Release|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|arm64.Build.0 = Release|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|x64.ActiveCfg = Release|Any CPU {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|x64.Build.0 = Release|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|x86.ActiveCfg = Release|Any CPU - {9EE69591-5EDC-45E3-893E-2F9A4B82D538}.Release|x86.Build.0 = Release|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|arm64.ActiveCfg = Debug|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|arm64.Build.0 = Debug|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|x64.ActiveCfg = Debug|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|x64.Build.0 = Debug|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|x86.ActiveCfg = Debug|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Debug|x86.Build.0 = Debug|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|Any CPU.ActiveCfg = Release|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|Any CPU.Build.0 = Release|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|arm64.ActiveCfg = Release|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|arm64.Build.0 = Release|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|x64.ActiveCfg = Release|Any CPU {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|x64.Build.0 = Release|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|x86.ActiveCfg = Release|Any CPU - {52042F63-563A-45BB-9A08-A8635AAAB84C}.Release|x86.Build.0 = Release|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|arm64.ActiveCfg = Debug|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|arm64.Build.0 = Debug|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|x64.ActiveCfg = Debug|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|x64.Build.0 = Debug|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|x86.ActiveCfg = Debug|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Debug|x86.Build.0 = Debug|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|Any CPU.ActiveCfg = Release|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|Any CPU.Build.0 = Release|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|arm64.ActiveCfg = Release|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|arm64.Build.0 = Release|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|x64.ActiveCfg = Release|Any CPU {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|x64.Build.0 = Release|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|x86.ActiveCfg = Release|Any CPU - {BE08B7BC-8C89-4837-BCE7-EDDDABEAB372}.Release|x86.Build.0 = Release|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|arm64.ActiveCfg = Debug|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|arm64.Build.0 = Debug|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|x64.ActiveCfg = Debug|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|x64.Build.0 = Debug|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|x86.ActiveCfg = Debug|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Debug|x86.Build.0 = Debug|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|Any CPU.ActiveCfg = Release|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|Any CPU.Build.0 = Release|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|arm64.ActiveCfg = Release|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|arm64.Build.0 = Release|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|x64.ActiveCfg = Release|Any CPU {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|x64.Build.0 = Release|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|x86.ActiveCfg = Release|Any CPU - {56DFA7CF-F31D-45CE-9C36-DA8DBB8413B1}.Release|x86.Build.0 = Release|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|arm64.ActiveCfg = Debug|Any CPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|arm64.Build.0 = Debug|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|x64.ActiveCfg = Debug|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|x64.Build.0 = Debug|Any CPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|x86.ActiveCfg = Debug|Any CPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Debug|x86.Build.0 = Debug|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|Any CPU.ActiveCfg = Release|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|Any CPU.Build.0 = Release|Any CPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|arm64.ActiveCfg = Release|Any CPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|arm64.Build.0 = Release|Any CPU {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349}.Release|x64.ActiveCfg = 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.Build.0 = Release|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|arm64.ActiveCfg = Debug|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|arm64.Build.0 = Debug|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|x64.ActiveCfg = Debug|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|x64.Build.0 = Debug|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|x86.ActiveCfg = Debug|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Debug|x86.Build.0 = Debug|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|Any CPU.Build.0 = Release|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|arm64.ActiveCfg = Release|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|arm64.Build.0 = Release|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|x64.ActiveCfg = Release|Any CPU {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|x64.Build.0 = Release|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|x86.ActiveCfg = Release|Any CPU - {ACA8E56C-0F82-4010-A83E-2DBFF5D16919}.Release|x86.Build.0 = Release|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|arm64.ActiveCfg = Debug|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|arm64.Build.0 = Debug|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|x64.ActiveCfg = Debug|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|x64.Build.0 = Debug|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|x86.ActiveCfg = Debug|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Debug|x86.Build.0 = Debug|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|Any CPU.Build.0 = Release|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|arm64.ActiveCfg = Release|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|arm64.Build.0 = Release|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|x64.ActiveCfg = Release|Any CPU {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|x64.Build.0 = Release|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|x86.ActiveCfg = Release|Any CPU - {DFE09FD5-530D-48AB-8A46-4611F21BBBC3}.Release|x86.Build.0 = Release|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|arm64.ActiveCfg = Debug|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|arm64.Build.0 = Debug|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|x64.ActiveCfg = Debug|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|x64.Build.0 = Debug|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|x86.ActiveCfg = Debug|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Debug|x86.Build.0 = Debug|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|Any CPU.Build.0 = Release|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|arm64.ActiveCfg = Release|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|arm64.Build.0 = Release|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x64.ActiveCfg = Release|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x64.Build.0 = Release|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x86.ActiveCfg = Release|Any CPU - {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x86.Build.0 = Release|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|arm64.ActiveCfg = Debug|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|arm64.Build.0 = Debug|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|x64.ActiveCfg = Debug|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|x64.Build.0 = Debug|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|x86.ActiveCfg = Debug|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|x86.Build.0 = Debug|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Release|Any CPU.Build.0 = Release|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Release|arm64.ActiveCfg = Release|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Release|arm64.Build.0 = Release|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Release|x64.ActiveCfg = Release|Any CPU {3572F71A-83FE-459D-8370-002CA28827FE}.Release|x64.Build.0 = Release|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Release|x86.ActiveCfg = Release|Any CPU - {3572F71A-83FE-459D-8370-002CA28827FE}.Release|x86.Build.0 = Release|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|arm64.ActiveCfg = Debug|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|arm64.Build.0 = Debug|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|x64.ActiveCfg = Debug|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|x64.Build.0 = Debug|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|x86.ActiveCfg = Debug|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Debug|x86.Build.0 = Debug|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|Any CPU.Build.0 = Release|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|arm64.ActiveCfg = Release|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|arm64.Build.0 = Release|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|x64.ActiveCfg = Release|Any CPU {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|x64.Build.0 = Release|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|x86.ActiveCfg = Release|Any CPU - {1F9FBADF-65C0-453D-9B45-7A88044F807F}.Release|x86.Build.0 = Release|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|arm64.ActiveCfg = Debug|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|arm64.Build.0 = Debug|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|x64.ActiveCfg = Debug|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|x64.Build.0 = Debug|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|x86.ActiveCfg = Debug|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Debug|x86.Build.0 = Debug|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|Any CPU.Build.0 = Release|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|arm64.ActiveCfg = Release|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|arm64.Build.0 = Release|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|x64.ActiveCfg = Release|Any CPU {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|x64.Build.0 = Release|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|x86.ActiveCfg = Release|Any CPU - {817D606F-A22D-485C-89CF-86062C8E97EF}.Release|x86.Build.0 = Release|Any CPU {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|Any CPU.ActiveCfg = Debug|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|Any CPU.Build.0 = Debug|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|Any CPU.Deploy.0 = Debug|x64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|arm64.ActiveCfg = Debug|arm64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|arm64.Build.0 = Debug|arm64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|arm64.Deploy.0 = Debug|arm64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|x64.ActiveCfg = Debug|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|x64.Build.0 = Debug|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|x64.Deploy.0 = Debug|x64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|x86.ActiveCfg = Debug|x86 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|x86.Build.0 = Debug|x86 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Debug|x86.Deploy.0 = Debug|x86 {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|Any CPU.ActiveCfg = Release|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|Any CPU.Build.0 = Release|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|Any CPU.Deploy.0 = Release|x64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|arm64.ActiveCfg = Release|arm64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|arm64.Build.0 = Release|arm64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|arm64.Deploy.0 = Release|arm64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|x64.ActiveCfg = Release|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|x64.Build.0 = Release|x64 {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|x64.Deploy.0 = Release|x64 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|x86.ActiveCfg = Release|x86 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|x86.Build.0 = Release|x86 - {751EF297-7CF4-4879-BA8F-42661FA68668}.Release|x86.Deploy.0 = Release|x86 {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|arm64.ActiveCfg = Debug|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|arm64.Build.0 = Debug|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|x64.ActiveCfg = Debug|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|x64.Build.0 = Debug|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|x86.ActiveCfg = Debug|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Debug|x86.Build.0 = Debug|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|Any CPU.ActiveCfg = Release|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|Any CPU.Build.0 = Release|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|arm64.ActiveCfg = Release|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|arm64.Build.0 = Release|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|x64.ActiveCfg = Release|Any CPU {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|x64.Build.0 = Release|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|x86.ActiveCfg = Release|Any CPU - {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C}.Release|x86.Build.0 = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|x64.ActiveCfg = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Debug|x64.Build.0 = Debug|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|Any CPU.Build.0 = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|x64.ActiveCfg = Release|Any CPU + {DFFE8E49-AA07-457E-A459-99326B44F828}.Release|x64.Build.0 = Release|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Debug|x64.ActiveCfg = Debug|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Debug|x64.Build.0 = Debug|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Release|Any CPU.Build.0 = Release|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Release|x64.ActiveCfg = Release|Any CPU + {C412209E-D81D-4ACB-BECD-FEEF52B93468}.Release|x64.Build.0 = Release|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Debug|x64.ActiveCfg = Debug|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Debug|x64.Build.0 = Debug|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Release|Any CPU.Build.0 = Release|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Release|x64.ActiveCfg = Release|Any CPU + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -473,6 +312,9 @@ Global {817D606F-A22D-485C-89CF-86062C8E97EF} = {CEAD0EA1-A971-4F5F-9EAE-C72F75D1F737} {751EF297-7CF4-4879-BA8F-42661FA68668} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {AC8C7BE0-9E72-434B-8BF3-FAEFAC2E859C} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} + {DFFE8E49-AA07-457E-A459-99326B44F828} = {90C681E9-12AE-4B5F-932D-7EF5D35D8436} + {C412209E-D81D-4ACB-BECD-FEEF52B93468} = {90C681E9-12AE-4B5F-932D-7EF5D35D8436} + {12430DAE-DC53-4C37-95D5-B8923B5FD3D7} = {90C681E9-12AE-4B5F-932D-7EF5D35D8436} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB} diff --git a/MapImages/UWP/Properties/AssemblyInfo.cs b/MapImages/UWP/Properties/AssemblyInfo.cs index f9bdc9da..9763a405 100644 --- a/MapImages/UWP/Properties/AssemblyInfo.cs +++ b/MapImages/UWP/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("XAML Map Control Image Support (UWP)")] -[assembly: AssemblyDescription("Image Support Library for XAML Map Control")] +[assembly: AssemblyTitle("XAML Map Control Image Support Library for UWP")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapImages/WPF/MapImages.WPF.csproj b/MapImages/WPF/MapImages.WPF.csproj index 6ca8a03c..1d9be0bc 100644 --- a/MapImages/WPF/MapImages.WPF.csproj +++ b/MapImages/WPF/MapImages.WPF.csproj @@ -3,15 +3,14 @@ net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 true MapControl.Images - MapImages.WPF + XAML Map Control Image Support Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - Image Support Library for XAML Map Control - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.MapImages diff --git a/MapImages/WinUI/MapImages.WinUI.csproj b/MapImages/WinUI/MapImages.WinUI.csproj index 73cde7e5..64212e9b 100644 --- a/MapImages/WinUI/MapImages.WinUI.csproj +++ b/MapImages/WinUI/MapImages.WinUI.csproj @@ -5,14 +5,14 @@ win10-x86;win10-x64;win10-arm64 true MapControl.Images + XAML Map Control Image Support Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - Image Support Library for XAML Map Control - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.MapImages WINUI diff --git a/MapProjections/UWP/Properties/AssemblyInfo.cs b/MapProjections/UWP/Properties/AssemblyInfo.cs index fdeae199..952b8906 100644 --- a/MapProjections/UWP/Properties/AssemblyInfo.cs +++ b/MapProjections/UWP/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("XAML Map Control Projections (UWP)")] -[assembly: AssemblyDescription("Map Projections Library for XAML Map Control")] +[assembly: AssemblyTitle("XAML Map Control Projections Library for UWP")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj index 0419f499..821e61d1 100644 --- a/MapProjections/WPF/MapProjections.WPF.csproj +++ b/MapProjections/WPF/MapProjections.WPF.csproj @@ -3,15 +3,14 @@ net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 true MapControl.Projections - MapProjections.WPF + XAML Map Control Projections Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - Map Projections Library for XAML Map Control - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.MapProjections diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj index 19ee3c07..31f2bcde 100644 --- a/MapProjections/WinUI/MapProjections.WinUI.csproj +++ b/MapProjections/WinUI/MapProjections.WinUI.csproj @@ -5,14 +5,14 @@ win10-x86;win10-x64;win10-arm64 true MapControl.Projections + XAML Map Control Projections Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - Map Projections Library for XAML Map Control - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.MapProjections WINUI diff --git a/SampleApps/Shared/MapLayersMenuButton.cs b/MapUiTools/Shared/MapLayersMenuButton.cs similarity index 89% rename from SampleApps/Shared/MapLayersMenuButton.cs rename to MapUiTools/Shared/MapLayersMenuButton.cs index 3716ae92..d1bf671e 100644 --- a/SampleApps/Shared/MapLayersMenuButton.cs +++ b/MapUiTools/Shared/MapLayersMenuButton.cs @@ -1,36 +1,24 @@ -using MapControl; +// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control +// © 2022 Clemens Fischer +// Licensed under the Microsoft Public License (Ms-PL) + using System.Collections.Generic; using System.Linq; #if WINUI using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; #elif UWP using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Media; #else using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; #endif -namespace SampleApplication +namespace MapControl.UiTools { public class MapLayersMenuButton : MenuButton { public MapLayersMenuButton() + : base("\uE81E") { -#if WINUI || UWP - Content = new FontIcon - { - FontFamily = new FontFamily("Segoe MDL2 Assets"), - Glyph = "\uE81E" - }; -#else - FontFamily = new FontFamily("Segoe MDL2 Assets"); - Content = "\uE81E"; -#endif } public static readonly DependencyProperty MapProperty = DependencyProperty.Register( diff --git a/SampleApps/Shared/MapProjectionsMenuButton.cs b/MapUiTools/Shared/MapProjectionsMenuButton.cs similarity index 82% rename from SampleApps/Shared/MapProjectionsMenuButton.cs rename to MapUiTools/Shared/MapProjectionsMenuButton.cs index dbd427a5..a5359298 100644 --- a/SampleApps/Shared/MapProjectionsMenuButton.cs +++ b/MapUiTools/Shared/MapProjectionsMenuButton.cs @@ -1,36 +1,24 @@ -using MapControl; +// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control +// © 2022 Clemens Fischer +// Licensed under the Microsoft Public License (Ms-PL) + using System.Collections.Generic; using System.Linq; #if WINUI using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; #elif UWP using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Media; #else using System.Windows; -using System.Windows.Controls; -using System.Windows.Media; #endif -namespace SampleApplication +namespace MapControl.UiTools { public class MapProjectionsMenuButton : MenuButton { public MapProjectionsMenuButton() + : base("\uE809") { -#if WINUI || UWP - Content = new FontIcon - { - FontFamily = new FontFamily("Segoe MDL2 Assets"), - Glyph = "\uE809" - }; -#else - FontFamily = new FontFamily("Segoe MDL2 Assets"); - Content = "\uE809"; -#endif } public static readonly DependencyProperty MapProperty = DependencyProperty.Register( diff --git a/MapUiTools/UWP/MapUiTools.UWP.csproj b/MapUiTools/UWP/MapUiTools.UWP.csproj new file mode 100644 index 00000000..3e7360c3 --- /dev/null +++ b/MapUiTools/UWP/MapUiTools.UWP.csproj @@ -0,0 +1,88 @@ + + + + + Debug + AnyCPU + {DFFE8E49-AA07-457E-A459-99326B44F828} + Library + Properties + MapControl.UiTools + MapUiTools.UWP + en-US + UAP + 10.0.19041.0 + 10.0.17134.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;UWP + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + UWP + prompt + 4 + + + PackageReference + + + + MapLayersMenuButton.cs + + + MapProjectionsMenuButton.cs + + + MenuButton.WinUI.cs + + + + + + + 6.2.13 + + + + + {9545f73c-9c35-4cf6-baae-19a0baebd344} + MapControl.UWP + + + + + MapControl.snk + + + + 14.0 + + + true + + + ..\..\MapControl.snk + + + + \ No newline at end of file diff --git a/MapUiTools/UWP/Properties/AssemblyInfo.cs b/MapUiTools/UWP/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..3eeabe2c --- /dev/null +++ b/MapUiTools/UWP/Properties/AssemblyInfo.cs @@ -0,0 +1,13 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("XAML Map Control UI Tools Library for UWP")] +[assembly: AssemblyProduct("XAML Map Control")] +[assembly: AssemblyCompany("Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCulture("")] +[assembly: ComVisible(false)] diff --git a/MapUiTools/UWP/Properties/MapUiTools.UWP.rd.xml b/MapUiTools/UWP/Properties/MapUiTools.UWP.rd.xml new file mode 100644 index 00000000..75ca7b4f --- /dev/null +++ b/MapUiTools/UWP/Properties/MapUiTools.UWP.rd.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/MapUiTools/WPF/MapUiTools.WPF.csproj b/MapUiTools/WPF/MapUiTools.WPF.csproj new file mode 100644 index 00000000..70c130d8 --- /dev/null +++ b/MapUiTools/WPF/MapUiTools.WPF.csproj @@ -0,0 +1,28 @@ + + + net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 + true + MapControl.UiTools + XAML Map Control UI Tools Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer + true + ..\..\MapControl.snk + false + + + + + + + + + + + + + + + diff --git a/MapUiTools/WPF/MenuButton.WPF.cs b/MapUiTools/WPF/MenuButton.WPF.cs new file mode 100644 index 00000000..4476a3be --- /dev/null +++ b/MapUiTools/WPF/MenuButton.WPF.cs @@ -0,0 +1,47 @@ +// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control +// © 2022 Clemens Fischer +// Licensed under the Microsoft Public License (Ms-PL) + +using System.Collections.Generic; +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Media; + +namespace MapControl.UiTools +{ + public class MenuButton : Button + { + protected MenuButton(string icon) + { + FontFamily = new FontFamily("Segoe MDL2 Assets"); + Content = icon; + + Click += (s, e) => ContextMenu.IsOpen = true; + } + + protected ContextMenu CreateMenu() + { + var menu = new ContextMenu(); + ContextMenu = menu; + return menu; + } + + protected IEnumerable GetMenuItems() + { + return ContextMenu.Items.OfType(); + } + + protected static MenuItem CreateMenuItem(string text, object item, RoutedEventHandler click) + { + var menuItem = new MenuItem { Header = text, Tag = item }; + menuItem.Click += click; + return menuItem; + } + + protected static Separator CreateSeparator() + { + return new Separator(); + } + } +} diff --git a/MapUiTools/WinUI/MapUiTools.WinUI.csproj b/MapUiTools/WinUI/MapUiTools.WinUI.csproj new file mode 100644 index 00000000..70d55377 --- /dev/null +++ b/MapUiTools/WinUI/MapUiTools.WinUI.csproj @@ -0,0 +1,35 @@ + + + net6.0-windows10.0.19041.0 + 10.0.17763.0 + win10-x86;win10-x64;win10-arm64 + true + MapControl.UiTools + XAML Map Control UI Tools Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer + true + ..\..\MapControl.snk + false + WINUI + + + + + + + + + + + + + + + + + + + diff --git a/SampleApps/Shared/MenuButton.cs b/MapUiTools/WinUI/MenuButton.WinUI.cs similarity index 51% rename from SampleApps/Shared/MenuButton.cs rename to MapUiTools/WinUI/MenuButton.WinUI.cs index 02f8d4ee..3a14cd77 100644 --- a/SampleApps/Shared/MenuButton.cs +++ b/MapUiTools/WinUI/MenuButton.WinUI.cs @@ -1,21 +1,32 @@ -using System.Collections.Generic; +// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control +// © 2022 Clemens Fischer +// Licensed under the Microsoft Public License (Ms-PL) + +using System.Collections.Generic; using System.Linq; #if WINUI using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media; #elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -#else -using System.Windows; -using System.Windows.Controls; +using Windows.UI.Xaml.Media; #endif -namespace SampleApplication +namespace MapControl.UiTools { public class MenuButton : Button { -#if WINUI || UWP + protected MenuButton(string icon) + { + Content = new FontIcon + { + FontFamily = new FontFamily("Segoe Fluent Icons"), + Glyph = icon + }; + } + protected MenuFlyout CreateMenu() { var menu = new MenuFlyout(); @@ -39,35 +50,5 @@ namespace SampleApplication { return new MenuFlyoutSeparator(); } -#else - protected ContextMenu CreateMenu() - { - var menu = new ContextMenu(); - ContextMenu = menu; - return menu; - } - - protected IEnumerable GetMenuItems() - { - return ContextMenu.Items.OfType(); - } - - protected static MenuItem CreateMenuItem(string text, object item, RoutedEventHandler click) - { - var menuItem = new MenuItem { Header = text, Tag = item }; - menuItem.Click += click; - return menuItem; - } - - protected static Separator CreateSeparator() - { - return new Separator(); - } - - protected MenuButton() - { - Click += (s, e) => ContextMenu.IsOpen = true; - } -#endif } } diff --git a/SQLiteCache/UWP/Properties/AssemblyInfo.cs b/SQLiteCache/UWP/Properties/AssemblyInfo.cs index bc382b3f..d8397e24 100644 --- a/SQLiteCache/UWP/Properties/AssemblyInfo.cs +++ b/SQLiteCache/UWP/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("XAML Map Control SQLiteCache (UWP)")] -[assembly: AssemblyDescription("IImageCache implementation based on SQLite")] +[assembly: AssemblyTitle("XAML Map Control SQLiteCache Library for UWP")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj index be2efcef..2487be70 100644 --- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj +++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj @@ -3,15 +3,14 @@ net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462 true MapControl.Caching - SQLiteCache.WPF + XAML Map Control SQLiteCache Library for WPF + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - ObjectCache implementation based on SQLite - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.SQLiteCache diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj index eb52d196..a49a08e2 100644 --- a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj +++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj @@ -5,14 +5,14 @@ win10-x86;win10-x64;win10-arm64 true MapControl.Caching + XAML Map Control SQLiteCache Library for WinUI + XAML Map Control + 7.1.0 + Clemens Fischer + Copyright © 2022 Clemens Fischer true ..\..\MapControl.snk false - XAML Map Control - 7.0.0 - IImageCache implementation based on SQLite - Clemens Fischer - Copyright © 2021 Clemens Fischer false XAML.MapControl.SQLiteCache WINUI diff --git a/SampleApps/ProjectionDemo/ProjectionDemo.csproj b/SampleApps/ProjectionDemo/ProjectionDemo.csproj index 02bcc573..be11c014 100644 --- a/SampleApps/ProjectionDemo/ProjectionDemo.csproj +++ b/SampleApps/ProjectionDemo/ProjectionDemo.csproj @@ -1,14 +1,14 @@  - WinExe net6.0-windows true - 7.0.0 + ProjectionDemo + XAML Map Control Projection Demo Application + XAML Map Control + 7.1.0 Clemens Fischer - XAML Map Control Map Projection Demo Application - XAML Map Control - Copyright © 2021 Clemens Fischer + Copyright © 2022 Clemens Fischer diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml index ab28fcde..f22c0329 100644 --- a/SampleApps/UniversalApp/MainPage.xaml +++ b/SampleApps/UniversalApp/MainPage.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:map="using:MapControl" + xmlns:tools="using:MapControl.UiTools" xmlns:local="using:SampleApplication"> @@ -115,16 +116,16 @@ - - + MapProjections="{Binding MapProjections}"/> - + diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index 136f4a17..1bef60ce 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -1,14 +1,13 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("Universal Windows Sample Application")] -[assembly: AssemblyDescription("XAML Map Control Universal Windows Sample Application")] +[assembly: AssemblyTitle("XAML Map Control UWP Sample Application")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] +[assembly: AssemblyCopyright("Copyright © 2022 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("7.0.0")] -[assembly: AssemblyFileVersion("7.0.0")] +[assembly: AssemblyVersion("7.1.0")] +[assembly: AssemblyFileVersion("7.1.0")] [assembly: AssemblyConfiguration("")] +[assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj index fa470c14..3f58b9fc 100644 --- a/SampleApps/UniversalApp/UniversalApp.csproj +++ b/SampleApps/UniversalApp/UniversalApp.csproj @@ -51,18 +51,9 @@ HyperlinkText.cs - - MapLayersMenuButton.cs - - - MapProjectionsMenuButton.cs - MapViewModel.cs - - MenuButton.cs - ValueConverters.cs @@ -108,6 +99,10 @@ {951bc5d2-d653-42d9-9a91-21dc50de0182} MapControl.UWP + + {dffe8e49-aa07-457e-a459-99326b44f828} + MapUiTools.UWP + diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml index 6d2ab09e..a612ac48 100644 --- a/SampleApps/WinUiApp/MainWindow.xaml +++ b/SampleApps/WinUiApp/MainWindow.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:map="using:MapControl" + xmlns:tools="using:MapControl.UiTools" xmlns:local="using:SampleApplication"> @@ -116,16 +117,16 @@ - - + MapProjections="{Binding MapProjections}"/> - + diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj index 7dcb51bd..82039910 100644 --- a/SampleApps/WinUiApp/WinUiApp.csproj +++ b/SampleApps/WinUiApp/WinUiApp.csproj @@ -3,17 +3,17 @@ WinExe net6.0-windows10.0.19041.0 10.0.17763.0 - x86;x64;arm64 + x64 win10-x86;win10-x64;win10-arm64 win10-$(Platform).pubxml true app.manifest SampleApplication + XAML Map Control WinUI Sample Application XAML Map Control - 7.0.0 - XAML Map Control WinUI Sample Application + 7.1.0 Clemens Fischer - Copyright © 2021 Clemens Fischer + Copyright © 2022 Clemens Fischer none true WINUI @@ -24,7 +24,7 @@ - + @@ -42,6 +42,7 @@ + + MapProjections="{Binding MapProjections}"/> net6.0-windows;net48 true SampleApplication + XAML Map Control WPF Sample Application XAML Map Control - 7.0.0 - XAML Map Control WPF Sample Application + 7.1.0 Clemens Fischer - Copyright © 2021 Clemens Fischer + Copyright © 2022 Clemens Fischer @@ -16,12 +16,9 @@ - - - - +