From 8c4952f83bf1b9dd250cfbe10c82b5c9f2d621e0 Mon Sep 17 00:00:00 2001
From: Clemens <fischer.clemens@gmail.com>
Date: Tue, 9 Nov 2021 19:59:52 +0100
Subject: [PATCH] Added target framework net6.0-windows

---
 FileDbCache/WPF/FileDbCache.WPF.csproj          | 12 ++++++++----
 MBTiles/UWP/MBTiles.UWP.csproj                  |  2 +-
 MBTiles/WPF/MBTiles.WPF.csproj                  |  5 ++---
 MBTiles/WinUI/MBTiles.WinUI.csproj              |  2 +-
 MapImages/WPF/MapImages.WPF.csproj              |  4 ++--
 MapProjections/WPF/MapProjections.WPF.csproj    |  3 +--
 SQLiteCache/UWP/SQLiteCache.UWP.csproj          |  2 +-
 SQLiteCache/WPF/SQLiteCache.WPF.csproj          | 13 ++++++++-----
 SQLiteCache/WinUI/SQLiteCache.WinUI.csproj      |  2 +-
 SampleApps/WpfApplication/WpfApplication.csproj |  2 +-
 10 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj
index 10223b65..4030f6f1 100644
--- a/FileDbCache/WPF/FileDbCache.WPF.csproj
+++ b/FileDbCache/WPF/FileDbCache.WPF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
     <PropertyGroup>
-        <TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <RootNamespace>MapControl.Caching</RootNamespace>
         <AssemblyName>FileDbCache.WPF</AssemblyName>
@@ -37,12 +36,17 @@
         <Compile Include="..\Shared\*" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
+        <PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
+        <PackageReference Include="FileDb.Standard" Version="7.4.4" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='netcoreapp3.1'">
         <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
         <PackageReference Include="FileDb.Standard" Version="7.4.4" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net462'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
         <Reference Include="System.Runtime.Caching" />
         <PackageReference Include="FileDb.NET" Version="7.4.3" />
     </ItemGroup>
diff --git a/MBTiles/UWP/MBTiles.UWP.csproj b/MBTiles/UWP/MBTiles.UWP.csproj
index 97aa9399..42512e8b 100644
--- a/MBTiles/UWP/MBTiles.UWP.csproj
+++ b/MBTiles/UWP/MBTiles.UWP.csproj
@@ -57,7 +57,7 @@
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="System.Data.SQLite.Core">
-      <Version>1.0.115</Version>
+      <Version>1.0.115.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj
index 38d00949..7f8dfc73 100644
--- a/MBTiles/WPF/MBTiles.WPF.csproj
+++ b/MBTiles/WPF/MBTiles.WPF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
     <PropertyGroup>
-        <TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <RootNamespace>MapControl.MBTiles</RootNamespace>
         <AssemblyName>MBTiles.WPF</AssemblyName>
@@ -38,7 +37,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj
index 2cca1963..b908955a 100644
--- a/MBTiles/WinUI/MBTiles.WinUI.csproj
+++ b/MBTiles/WinUI/MBTiles.WinUI.csproj
@@ -38,7 +38,7 @@
         <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
         <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" />
         <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" />
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MapImages/WPF/MapImages.WPF.csproj b/MapImages/WPF/MapImages.WPF.csproj
index 38637a64..e79f0d62 100644
--- a/MapImages/WPF/MapImages.WPF.csproj
+++ b/MapImages/WPF/MapImages.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
     <PropertyGroup>
-        <TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <RootNamespace>MapControl.Images</RootNamespace>
         <AssemblyName>MapImages.WPF</AssemblyName>
@@ -36,7 +36,7 @@
         <Compile Include="..\Shared\*" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net462'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
         <Reference Include="System.IO.Compression" />
     </ItemGroup>
 
diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj
index e80854d2..502c87fe 100644
--- a/MapProjections/WPF/MapProjections.WPF.csproj
+++ b/MapProjections/WPF/MapProjections.WPF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
     <PropertyGroup>
-        <TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <RootNamespace>MapControl.Projections</RootNamespace>
         <AssemblyName>MapProjections.WPF</AssemblyName>
diff --git a/SQLiteCache/UWP/SQLiteCache.UWP.csproj b/SQLiteCache/UWP/SQLiteCache.UWP.csproj
index 83f1d17f..3070ea80 100644
--- a/SQLiteCache/UWP/SQLiteCache.UWP.csproj
+++ b/SQLiteCache/UWP/SQLiteCache.UWP.csproj
@@ -52,7 +52,7 @@
       <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="System.Data.SQLite.Core">
-      <Version>1.0.115</Version>
+      <Version>1.0.115.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
index 204311e2..7b066f9c 100644
--- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj
+++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-
     <PropertyGroup>
-        <TargetFrameworks>net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net48;net462</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <RootNamespace>MapControl.Caching</RootNamespace>
         <AssemblyName>SQLiteCache.WPF</AssemblyName>
@@ -37,15 +36,19 @@
         <Compile Include="..\Shared\*" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'netcoreapp3.1'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
+        <PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows' or '$(TargetFramework)'=='netcoreapp3.1'">
         <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net462'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
         <Reference Include="System.Runtime.Caching" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
     </ItemGroup>
 </Project>
diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
index b50cff6e..873bb4f5 100644
--- a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
+++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
@@ -38,7 +38,7 @@
         <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.5" />
         <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.5" />
         <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.5" />
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index 42943b19..79973624 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -31,7 +31,7 @@
         <Resource Include="..\Shared\10_535_330.jpg" Link="10_535_330.jpg" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+    <ItemGroup Condition="'$(TargetFramework)'=='net48'">
         <Reference Include="System.Net.Http" />
         <Reference Include="System.Runtime.Caching" />
     </ItemGroup>