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

---
 MapControl/WPF/MapControl.WPF.csproj                 | 10 +++++++---
 SampleApps/WpfApplication/WpfApplication.csproj      |  2 +-
 SampleApps/WpfApplication/WpfApplication.csproj.user |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj
index 4b99dbde..17852922 100644
--- a/MapControl/WPF/MapControl.WPF.csproj
+++ b/MapControl/WPF/MapControl.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</RootNamespace>
         <SignAssembly>true</SignAssembly>
@@ -35,11 +35,15 @@
         <Compile Include="..\Shared\*.cs" />
     </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.Net.Http" />
         <Reference Include="System.Runtime.Caching" />
     </ItemGroup>
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index d33bad35..42943b19 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net5.0-windows;net48</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net48</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <RootNamespace>SampleApplication</RootNamespace>
         <Product>XAML Map Control</Product>
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj.user b/SampleApps/WpfApplication/WpfApplication.csproj.user
index 1cc3bdb2..41383baf 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj.user
+++ b/SampleApps/WpfApplication/WpfApplication.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ActiveDebugFramework>net5.0-windows</ActiveDebugFramework>
+    <ActiveDebugFramework>net6.0-windows</ActiveDebugFramework>
   </PropertyGroup>
   <ItemGroup>
     <ApplicationDefinition Update="App.xaml">