From 9de06b40e97711c1e54eb4fad5c5483f6bc2ce28 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Sat, 25 Nov 2023 13:01:25 +0100
Subject: [PATCH] Simplified ItemGroup Conditions

---
 FileDbCache/WPF/FileDbCache.WPF.csproj       | 4 ++--
 MapControl/WPF/MapControl.WPF.csproj         | 4 ++--
 MapProjections/WPF/MapProjections.WPF.csproj | 2 +-
 SQLiteCache/WPF/SQLiteCache.WPF.csproj       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj
index a2667778..76482131 100644
--- a/FileDbCache/WPF/FileDbCache.WPF.csproj
+++ b/FileDbCache/WPF/FileDbCache.WPF.csproj
@@ -24,11 +24,11 @@
         <Compile Include="..\Shared\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows' or '$(TargetFramework)'=='net7.0-windows' or '$(TargetFramework)'=='net6.0-windows'">
+    <ItemGroup Condition="$(TargetFramework.EndsWith('windows'))">
         <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
+    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`2468`))'=='net'">
         <Reference Include="System.Runtime.Caching" />
     </ItemGroup>
 
diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj
index fd136976..f3ebfbf5 100644
--- a/MapControl/WPF/MapControl.WPF.csproj
+++ b/MapControl/WPF/MapControl.WPF.csproj
@@ -24,11 +24,11 @@
         <Compile Include="..\Shared\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows' or '$(TargetFramework)'=='net7.0-windows' or '$(TargetFramework)'=='net6.0-windows'">
+    <ItemGroup Condition="$(TargetFramework.EndsWith('windows'))">
         <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
+    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`2468`))'=='net'">
         <Reference Include="System.IO.Compression" />
         <Reference Include="System.Net.Http" />
         <Reference Include="System.Runtime.Caching" />
diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj
index 8eb57091..d227aa06 100644
--- a/MapProjections/WPF/MapProjections.WPF.csproj
+++ b/MapProjections/WPF/MapProjections.WPF.csproj
@@ -24,7 +24,7 @@
         <Compile Include="..\Shared\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
+    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`2468`))'=='net'">
         <Reference Include="System.Net.Http" />
     </ItemGroup>
 
diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
index 04b2d23b..2635644a 100644
--- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj
+++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
@@ -24,11 +24,11 @@
         <Compile Include="..\Shared\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows' or '$(TargetFramework)'=='net7.0-windows' or '$(TargetFramework)'=='net6.0-windows'">
+    <ItemGroup Condition="$(TargetFramework.EndsWith('windows'))">
         <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)'=='net48' or '$(TargetFramework)'=='net462'">
+    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`2468`))'=='net'">
         <Reference Include="System.Runtime.Caching" />
     </ItemGroup>