Simplify the TFM targeting.

There is only one place that needs OS specific APIs in BarrelUtils. So only the main MonkeyCache.csproj needs to be multi-targeted.
jamesmontemagno · Mar 31, 2022 · 390d0d7 · 390d0d7
1 parent 788715b
commit 390d0d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 35 deletions.
diff --git a/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj b/src/MonkeyCache.FileStore/MonkeyCache.FileStore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<AssemblyVersion>2.0.0.0</AssemblyVersion>
 		<AssemblyFileVersion>2.0.0.0</AssemblyFileVersion>
@@ -49,14 +49,6 @@
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
 
-	<PropertyGroup>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-android'))">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-ios'))">10.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-maccatalyst'))">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.16299.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.16299.0</TargetPlatformMinVersion>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<Compile Include="..\MonkeyCache.Shared\**\*.cs" LinkBase="Shared" />
 	</ItemGroup>

diff --git a/src/MonkeyCache.LiteDB/Barrel.cs b/src/MonkeyCache.LiteDB/Barrel.cs
@@ -56,19 +56,14 @@ public static IBarrel Create(string cacheDirectory, bool cache = false)
 				Directory.CreateDirectory(directory);
 			}
 
-#if __MACOS__
-
-			if (!string.IsNullOrWhiteSpace(EncryptionKey))
-				path = $"Filename={path}; Password={EncryptionKey}; Mode=Exclusive";
-			else
-				path = $"Filename={path}; Mode=Exclusive";
-#else
-
 			if (!string.IsNullOrWhiteSpace(EncryptionKey))
 				path = $"Filename={path}; Password={EncryptionKey}";
 			else
 				path = $"Filename={path}";
-#endif
+
+			if (OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst())
+				path += "; Mode=Exclusive";
+
 			if(Upgrade)
 				path += "; Upgrade=true";
 

diff --git a/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj b/src/MonkeyCache.LiteDB/MonkeyCache.LiteDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<AssemblyVersion>2.0.0.0</AssemblyVersion>
 		<AssemblyFileVersion>2.0.0.0</AssemblyFileVersion>
@@ -48,13 +48,6 @@
 	<ItemGroup Condition=" '$(Configuration)'=='Release' And '$(OS)' == 'Windows_NT' ">
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
-	<PropertyGroup>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-android'))">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-ios'))">10.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-maccatalyst'))">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.16299.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.16299.0</TargetPlatformMinVersion>
-	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="LiteDB" Version="5.0.11" />

diff --git a/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj b/src/MonkeyCache.SQLite/MonkeyCache.SQLite.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<AssemblyVersion>2.0.0.0</AssemblyVersion>
 		<AssemblyFileVersion>2.0.0.0</AssemblyFileVersion>
@@ -46,13 +46,6 @@
 	<ItemGroup Condition=" '$(Configuration)'=='Release' And '$(OS)' == 'Windows_NT' ">
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>
-	<PropertyGroup>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-android'))">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-ios'))">10.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-maccatalyst'))">13.1</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.16299.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows10'))">10.0.16299.0</TargetPlatformMinVersion>
-	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />

diff --git a/src/MonkeyCache/MonkeyCache.csproj b/src/MonkeyCache/MonkeyCache.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst;net6.0-windows10.0.19041</TargetFrameworks>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<AssemblyVersion>2.0.0.0</AssemblyVersion>
 		<AssemblyFileVersion>2.0.0.0</AssemblyFileVersion>