From 55abb6cd874a8e228e6bb1921c398dc230417c2c Mon Sep 17 00:00:00 2001
From: Clemens <fischer.clemens@gmail.com>
Date: Thu, 18 Nov 2021 16:30:45 +0100
Subject: [PATCH] Version 7.0: WinUI

---
 FileDbCache/WinUI/FileDbCache.WinUI.csproj       | 5 +----
 MBTiles/WinUI/MBTiles.WinUI.csproj               | 5 +----
 MapControl/WinUI/MapControl.WinUI.csproj         | 5 +----
 MapImages/WinUI/MapImages.WinUI.csproj           | 5 +----
 MapProjections/WinUI/MapProjections.WinUI.csproj | 5 +----
 SQLiteCache/WinUI/SQLiteCache.WinUI.csproj       | 5 +----
 SampleApps/WinUiApp/WinUiApp.csproj              | 7 ++-----
 7 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/FileDbCache/WinUI/FileDbCache.WinUI.csproj b/FileDbCache/WinUI/FileDbCache.WinUI.csproj
index a60f231d..a6a1de9f 100644
--- a/FileDbCache/WinUI/FileDbCache.WinUI.csproj
+++ b/FileDbCache/WinUI/FileDbCache.WinUI.csproj
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>MapControl.Caching</RootNamespace>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
+        <RootNamespace>MapControl.Caching</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
@@ -15,9 +15,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <PackageId>XAML.MapControl.FileDbCache</PackageId>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>
 
diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj
index 2e8e0d8a..3a8b027f 100644
--- a/MBTiles/WinUI/MBTiles.WinUI.csproj
+++ b/MBTiles/WinUI/MBTiles.WinUI.csproj
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>MapControl.MBTiles</RootNamespace>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
+        <RootNamespace>MapControl.MBTiles</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
@@ -15,9 +15,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <PackageId>XAML.MapControl.MBTiles</PackageId>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>
 
diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj
index 2b593549..2a0701b3 100644
--- a/MapControl/WinUI/MapControl.WinUI.csproj
+++ b/MapControl/WinUI/MapControl.WinUI.csproj
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>MapControl</RootNamespace>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
+        <RootNamespace>MapControl</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
@@ -15,9 +15,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <PackageId>XAML.MapControl</PackageId>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>
 
diff --git a/MapImages/WinUI/MapImages.WinUI.csproj b/MapImages/WinUI/MapImages.WinUI.csproj
index 87277dad..73cde7e5 100644
--- a/MapImages/WinUI/MapImages.WinUI.csproj
+++ b/MapImages/WinUI/MapImages.WinUI.csproj
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>MapControl.Images</RootNamespace>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
+        <RootNamespace>MapControl.Images</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
@@ -15,9 +15,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <PackageId>XAML.MapControl.MapImages</PackageId>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>
 
diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj
index 86e47e14..19ee3c07 100644
--- a/MapProjections/WinUI/MapProjections.WinUI.csproj
+++ b/MapProjections/WinUI/MapProjections.WinUI.csproj
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>MapControl.Projections</RootNamespace>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
+        <RootNamespace>MapControl.Projections</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
@@ -15,9 +15,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <PackageId>XAML.MapControl.MapProjections</PackageId>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>
 
diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
index 1a0711c1..eb52d196 100644
--- a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
+++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
@@ -2,9 +2,9 @@
     <PropertyGroup>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>MapControl.Caching</RootNamespace>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <UseWinUI>true</UseWinUI>
+        <RootNamespace>MapControl.Caching</RootNamespace>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <DelaySign>false</DelaySign>
@@ -15,9 +15,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <PackageId>XAML.MapControl.SQLiteCache</PackageId>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>
 
diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj
index 85c2fa2e..701c6e57 100644
--- a/SampleApps/WinUiApp/WinUiApp.csproj
+++ b/SampleApps/WinUiApp/WinUiApp.csproj
@@ -3,12 +3,12 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <RootNamespace>SampleApplication</RootNamespace>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
         <Platforms>x86;x64;arm64</Platforms>
         <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
         <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
         <UseWinUI>true</UseWinUI>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <RootNamespace>SampleApplication</RootNamespace>
         <Product>XAML Map Control</Product>
         <Version>7.0.0</Version>
         <Description>XAML Map Control WinUI Sample Application</Description>
@@ -16,9 +16,6 @@
         <Copyright>Copyright © 2021 Clemens Fischer</Copyright>
         <AnalysisLevel>none</AnalysisLevel>
         <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    </PropertyGroup>
-
-    <PropertyGroup>
         <DefineConstants>WINUI</DefineConstants>
     </PropertyGroup>