From fc79873a209a1330c58cf174e9dbf7d20511ebeb Mon Sep 17 00:00:00 2001 From: Clemens Date: Wed, 17 Nov 2021 22:21:34 +0100 Subject: [PATCH] Use WinAppSDK --- FileDbCache/WinUI/FileDbCache.WinUI.csproj | 9 ++++----- MBTiles/WinUI/MBTiles.WinUI.csproj | 9 ++++----- MapControl/WinUI/MapControl.WinUI.csproj | 2 +- MapControlExtended.sln | 15 ++------------- MapImages/WinUI/MapImages.WinUI.csproj | 8 ++++---- MapProjections/WinUI/MapProjections.WinUI.csproj | 11 +++++------ SQLiteCache/WinUI/SQLiteCache.WinUI.csproj | 9 ++++----- 7 files changed, 24 insertions(+), 39 deletions(-) diff --git a/FileDbCache/WinUI/FileDbCache.WinUI.csproj b/FileDbCache/WinUI/FileDbCache.WinUI.csproj index d1b2e1ab..287d0933 100644 --- a/FileDbCache/WinUI/FileDbCache.WinUI.csproj +++ b/FileDbCache/WinUI/FileDbCache.WinUI.csproj @@ -1,9 +1,10 @@  - net5.0-windows10.0.19041 + net6.0-windows10.0.19041.0 10.0.17763.0 MapControl.Caching win10-x86;win10-x64;win10-arm64 + true true ..\..\MapControl.snk false @@ -14,7 +15,6 @@ Copyright © 2021 Clemens Fischer false XAML.MapControl.FileDbCache - true @@ -36,9 +36,8 @@ - - - + + diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj index b908955a..b8314e1d 100644 --- a/MBTiles/WinUI/MBTiles.WinUI.csproj +++ b/MBTiles/WinUI/MBTiles.WinUI.csproj @@ -1,9 +1,10 @@  - net5.0-windows10.0.19041 + net6.0-windows10.0.19041.0 10.0.17763.0 MapControl.MBTiles win10-x86;win10-x64;win10-arm64 + true true ..\..\MapControl.snk false @@ -14,7 +15,6 @@ Copyright © 2021 Clemens Fischer false XAML.MapControl.MBTiles - true @@ -35,9 +35,8 @@ - - - + + diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj index 7d71415d..cf1e3ec5 100644 --- a/MapControl/WinUI/MapControl.WinUI.csproj +++ b/MapControl/WinUI/MapControl.WinUI.csproj @@ -4,9 +4,9 @@ 10.0.17763.0 MapControl win10-x86;win10-x64;win10-arm64 + true true ..\..\MapControl.snk - true false XAML Map Control 6.1.0 diff --git a/MapControlExtended.sln b/MapControlExtended.sln index 488872e4..5c7a56bf 100644 --- a/MapControlExtended.sln +++ b/MapControlExtended.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29102.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MapControl", "MapControl", "{52AECE49-F314-4F76-98F2-FA800F07824B}" EndProject @@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapControl.WinUI", "MapCont EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinUiApp", "SampleApps\WinUiApp\WinUiApp.csproj", "{66C8D0B6-1D19-4023-9A8B-C7E41857EB73}" EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "WinUiApp (Package)", "SampleApps\WinUiApp (Package)\WinUiApp (Package).wapproj", "{2DB6959F-1768-495C-8EED-4830EF185584}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileDbCache.WinUI", "FileDbCache\WinUI\FileDbCache.WinUI.csproj", "{DFE09FD5-530D-48AB-8A46-4611F21BBBC3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteCache.WinUI", "SQLiteCache\WinUI\SQLiteCache.WinUI.csproj", "{E33FC359-F713-462C-8A8E-7EEA15E36BE1}" @@ -204,14 +202,6 @@ Global {66C8D0B6-1D19-4023-9A8B-C7E41857EB73}.Release|Any CPU.ActiveCfg = Release|x64 {66C8D0B6-1D19-4023-9A8B-C7E41857EB73}.Release|x64.ActiveCfg = Release|x64 {66C8D0B6-1D19-4023-9A8B-C7E41857EB73}.Release|x64.Build.0 = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|Any CPU.ActiveCfg = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|x64.ActiveCfg = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|x64.Build.0 = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Debug|x64.Deploy.0 = Debug|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|Any CPU.ActiveCfg = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.ActiveCfg = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.Build.0 = Release|x64 - {2DB6959F-1768-495C-8EED-4830EF185584}.Release|x64.Deploy.0 = Release|x64 {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|x64.ActiveCfg = Debug|Any CPU @@ -273,7 +263,6 @@ Global {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349} = {96FD1258-1597-48A2-8D64-1ADAE13E886A} {ACA8E56C-0F82-4010-A83E-2DBFF5D16919} = {52AECE49-F314-4F76-98F2-FA800F07824B} {66C8D0B6-1D19-4023-9A8B-C7E41857EB73} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} - {2DB6959F-1768-495C-8EED-4830EF185584} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {DFE09FD5-530D-48AB-8A46-4611F21BBBC3} = {261905DE-9653-4567-B498-1F46BEA2A4F3} {E33FC359-F713-462C-8A8E-7EEA15E36BE1} = {96FD1258-1597-48A2-8D64-1ADAE13E886A} {3572F71A-83FE-459D-8370-002CA28827FE} = {7BC11E28-8D3B-4C5B-AC08-AB249CC95F6D} diff --git a/MapImages/WinUI/MapImages.WinUI.csproj b/MapImages/WinUI/MapImages.WinUI.csproj index b90eb4a1..0fab7363 100644 --- a/MapImages/WinUI/MapImages.WinUI.csproj +++ b/MapImages/WinUI/MapImages.WinUI.csproj @@ -1,9 +1,10 @@  - net5.0-windows10.0.19041 + net6.0-windows10.0.19041.0 10.0.17763.0 MapControl.Images win10-x86;win10-x64;win10-arm64 + true true ..\..\MapControl.snk false @@ -38,9 +39,8 @@ - - - + + diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj index 7a94302f..6e712a91 100644 --- a/MapProjections/WinUI/MapProjections.WinUI.csproj +++ b/MapProjections/WinUI/MapProjections.WinUI.csproj @@ -1,9 +1,10 @@  - net5.0-windows10.0.19041.0 + net6.0-windows10.0.19041.0 10.0.17763.0 - MapProjections.WinUI + MapControl.Projections win10-x86;win10-x64;win10-arm64 + true true ..\..\MapControl.snk false @@ -14,7 +15,6 @@ Copyright © 2021 Clemens Fischer false XAML.MapControl.MapProjections - true @@ -34,9 +34,8 @@ - - - + + diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj index 873bb4f5..fcd71982 100644 --- a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj +++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj @@ -1,9 +1,10 @@  - net5.0-windows10.0.19041 + net6.0-windows10.0.19041.0 10.0.17763.0 MapControl.Caching win10-x86;win10-x64;win10-arm64 + true true ..\..\MapControl.snk false @@ -14,7 +15,6 @@ Copyright © 2021 Clemens Fischer false XAML.MapControl.SQLiteCache - true @@ -35,9 +35,8 @@ - - - + +