Housekeeping Properly remove NET5 support (#928)

* Fix comment * Move from Net5 to Net6 folder * Remove Net5.0 from Splat.Drawing * Remove empty lines Co-authored-by: Tomáš Filip <tomas.filip@meac.cz>
reactiveui · Jun 27, 2022 · 60cc43b · 60cc43b
1 parent dbd6a43
commit 60cc43b
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 19 deletions.
diff --git a/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs b/src/Splat.Drawing/Platforms/ServiceLocationDrawingInitialization.cs
@@ -24,7 +24,7 @@ public static void RegisterPlatformBitmapLoader(this IMutableDependencyResolver
             }
 
 #if !IS_SHARED_NET
-            // not supported in netstandard2.0 or NET5/6 library
+            // not supported in netstandard or NET6 library
             if (!resolver.HasRegistration(typeof(IBitmapLoader)))
             {
                 resolver.RegisterLazySingleton(() => new PlatformBitmapLoader(), typeof(IBitmapLoader));

diff --git a/...ng/Platforms/net5/Bitmaps/BitmapMixins.cs → ...ng/Platforms/net6/Bitmaps/BitmapMixins.cs b/...ng/Platforms/net5/Bitmaps/BitmapMixins.cs → ...ng/Platforms/net6/Bitmaps/BitmapMixins.cs
diff --git a/...tforms/net5/Bitmaps/BitmapSourceBitmap.cs → ...tforms/net6/Bitmaps/BitmapSourceBitmap.cs b/...tforms/net5/Bitmaps/BitmapSourceBitmap.cs → ...tforms/net6/Bitmaps/BitmapSourceBitmap.cs
diff --git a/...orms/net5/Bitmaps/PlatformBitmapLoader.cs → ...orms/net6/Bitmaps/PlatformBitmapLoader.cs b/...orms/net5/Bitmaps/PlatformBitmapLoader.cs → ...orms/net6/Bitmaps/PlatformBitmapLoader.cs
diff --git a/.../Platforms/net5/Colors/ColorExtensions.cs → .../Platforms/net6/Colors/ColorExtensions.cs b/.../Platforms/net5/Colors/ColorExtensions.cs → .../Platforms/net6/Colors/ColorExtensions.cs
diff --git a/...forms/net5/Colors/SplatColorExtensions.cs → ...forms/net6/Colors/SplatColorExtensions.cs b/...forms/net5/Colors/SplatColorExtensions.cs → ...forms/net6/Colors/SplatColorExtensions.cs
diff --git a/...g/Platforms/net5/Maths/PointExtensions.cs → ...g/Platforms/net6/Maths/PointExtensions.cs b/...g/Platforms/net5/Maths/PointExtensions.cs → ...g/Platforms/net6/Maths/PointExtensions.cs
diff --git a/...ng/Platforms/net5/Maths/RectExtensions.cs → ...ng/Platforms/net6/Maths/RectExtensions.cs b/...ng/Platforms/net5/Maths/RectExtensions.cs → ...ng/Platforms/net6/Maths/RectExtensions.cs
diff --git a/...ng/Platforms/net5/Maths/SizeExtensions.cs → ...ng/Platforms/net6/Maths/SizeExtensions.cs b/...ng/Platforms/net5/Maths/SizeExtensions.cs → ...ng/Platforms/net6/Maths/SizeExtensions.cs
diff --git a/src/Splat.Drawing/Splat.Drawing.csproj b/src/Splat.Drawing/Splat.Drawing.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;netstandard2.0;net6.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
@@ -12,7 +12,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" ($(TargetFramework.StartsWith('netcoreapp3')) or $(TargetFramework.StartsWith('net5.0-windows'))or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net4'))) and '$(OS)' == 'Windows_NT' ">
+  <PropertyGroup Condition=" ($(TargetFramework.StartsWith('netcoreapp3')) or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net4'))) and '$(OS)' == 'Windows_NT' ">
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
@@ -30,7 +30,6 @@
     <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
-
     <Compile Include="Platforms\ReflectionStubs.cs" />
   </ItemGroup>
 
@@ -42,7 +41,6 @@
     <Compile Include="Platforms\net4\**\*.cs" />
     <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
     <Compile Include="Platforms\ReflectionStubs.cs" />
-
     <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
   </ItemGroup>
 
@@ -52,21 +50,12 @@
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3')) ">
     <Compile Include="Platforms\netcoreapp3\**\*.cs" />
-
-    <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
-    <Compile Include="Platforms\ReflectionStubs.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net5.0-windows')) ">
-    <Compile Include="Platforms\net5\**\*.cs" />
-
     <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
     <Compile Include="Platforms\ReflectionStubs.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows')) ">
-    <Compile Include="Platforms\net5\**\*.cs" />
-
+    <Compile Include="Platforms\net6\**\*.cs" />
     <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
     <Compile Include="Platforms\ReflectionStubs.cs" />
   </ItemGroup>
@@ -80,7 +69,6 @@
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) or $(TargetFramework.StartsWith('Xamarin.TVOS')) or $(TargetFramework.StartsWith('Xamarin.WatchOS')) ">
     <Compile Include="Platforms\Cocoa\**\*.cs" />
     <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
-
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
 
@@ -91,7 +79,6 @@
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
     <Compile Include="Platforms\Cocoa\**\*.cs" />
-
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="netstandard" />
   </ItemGroup>
@@ -103,15 +90,13 @@
   <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
     <Compile Include="Platforms\Android\**\*.cs" />
     <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
-
     <Compile Include="Resources\**\*.cs" />
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-android')) ">
     <Compile Include="Platforms\Android\**\*.cs" />
     <Compile Include="Platforms\TypeForwardedSystemDrawing.cs" />
-
     <Compile Include="Resources\**\*.cs" />
   </ItemGroup>