Upgrading to .NET 6, adjusting change log

koszeggy · Nov 17, 2022 · 258970d · 258970d
1 parent b5bdcf1
commit 258970d
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 33 deletions.
diff --git a/....DebuggerVisualizers.GdiPlus.Test/KGySoft.Drawing.DebuggerVisualizers.GdiPlus.Test.csproj b/....DebuggerVisualizers.GdiPlus.Test/KGySoft.Drawing.DebuggerVisualizers.GdiPlus.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net6.0-windows</TargetFrameworks>
     <!--<TargetFrameworks>net5.0-windows</TargetFrameworks>-->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>KGySoft.Drawing.DebuggerVisualizers.GdiPlus.Test</RootNamespace>
@@ -17,9 +17,8 @@
     <Nullable>enable</Nullable>
 
     <!--Suppressions
-        - NETSDK1138: The target framework 'net5.0-windows' is out of support - this is not just an application but also a library with public API so targeting the lowest possible versions is intended
         - WFAC010: Remove high DPI settings from app.manifest and configure via Application.SetHighDpiMode - as targeting many frameworks handling it manually everywhere is intended. Otherwise, it would cause conflicts, eg. scaling sizes multiple times, etc. -->
-    <NoWarn>$(NoWarn);NETSDK1138;WFAC010</NoWarn>
+    <NoWarn>$(NoWarn);WFAC010</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ft.Drawing.DebuggerVisualizers.GdiPlus/KGySoft.Drawing.DebuggerVisualizers.GdiPlus.csproj b/...ft.Drawing.DebuggerVisualizers.GdiPlus/KGySoft.Drawing.DebuggerVisualizers.GdiPlus.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net5.0-windows</TargetFrameworks>
-    <!--<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>-->
+    <TargetFrameworks>net35;net40;net45;net6.0-windows</TargetFrameworks>
+    <!--<TargetFrameworks>net45;net6.0-windows</TargetFrameworks>-->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>KGySoft.Drawing.DebuggerVisualizers.GdiPlus</RootNamespace>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -13,9 +13,6 @@
     <PackageLicenseFile>..\..\..\LICENSE</PackageLicenseFile>
     <Authors>György Kőszeg</Authors>
     <Nullable>enable</Nullable>
-
-    <!--Suppression NETSDK1138: The target framework 'net5.0-windows' is out of support - this is not an application but a library so targeting the lowest possible versions is intended -->
-    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <!-- Common NuGet references -->
@@ -35,7 +32,7 @@
   </ItemGroup>
 
   <!-- .NET only references (note: doesn't really make sense but allows testing from KGySoft.Drawing.DebuggerVisualizers.GdiPlus.Test) -->
-  <ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
       <HintPath>..\..\_ref\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>

diff --git a/....Drawing.DebuggerVisualizers.Wpf.Test/KGySoft.Drawing.DebuggerVisualizers.Wpf.Test.csproj b/....Drawing.DebuggerVisualizers.Wpf.Test/KGySoft.Drawing.DebuggerVisualizers.Wpf.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net6.0-windows</TargetFrameworks>
     <!--<TargetFrameworks>net6.0-windows</TargetFrameworks>-->
     <OutputType>WinExe</OutputType>
     <Nullable>enable</Nullable>

diff --git a/...pf/KGySoft.Drawing.DebuggerVisualizers.Wpf/KGySoft.Drawing.DebuggerVisualizers.Wpf.csproj b/...pf/KGySoft.Drawing.DebuggerVisualizers.Wpf/KGySoft.Drawing.DebuggerVisualizers.Wpf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net6.0-windows</TargetFrameworks>
     <!--<TargetFrameworks>net6.0-windows</TargetFrameworks>-->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>KGySoft.Drawing.DebuggerVisualizers.Wpf</RootNamespace>
@@ -14,9 +14,6 @@
     <Authors>György Kőszeg</Authors>
     <UseWPF>true</UseWPF>
     <Nullable>enable</Nullable>
-
-    <!--Suppression NETSDK1138: The target framework 'net5.0-windows' is out of support - this is not an application but a library so targeting the lowest possible versions is intended -->
-    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <!-- Common NuGet references -->
@@ -36,7 +33,7 @@
   </ItemGroup>
 
   <!-- .NET only references (note: doesn't really make sense but allows testing from KGySoft.Drawing.DebuggerVisualizers.Wpf.Test) -->
-  <ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
       <HintPath>..\..\_ref\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>
@@ -46,7 +43,7 @@
   But debugger visualizers have to be compiled as .NET Framework assemblies anyway. -->
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="xcopy bin\$(ConfigurationName)\$(TargetFramework)\$(TargetFileName) ..\..\..\KGySoft.Drawing.ImagingTools\bin\$(ConfigurationName)\$(TargetFramework)\ /Y" />
-    <Exec Command="xcopy bin\$(ConfigurationName)\$(TargetFramework)\KGySoft.Drawing.Wpf.dll ..\..\..\KGySoft.Drawing.ImagingTools\bin\$(ConfigurationName)\$(TargetFramework)\ /Y" />
+    <Exec Condition="'$(TargetFramework)'!='net6.0-windows'" Command="xcopy bin\$(ConfigurationName)\$(TargetFramework)\KGySoft.Drawing.Wpf.dll ..\..\..\KGySoft.Drawing.ImagingTools\bin\$(ConfigurationName)\$(TargetFramework)\ /Y" />
   </Target>
 
   <!-- Project references -->

diff --git a/DebuggerVisualizers/_Common/KGySoft.Drawing.DebuggerVisualizers.csproj b/DebuggerVisualizers/_Common/KGySoft.Drawing.DebuggerVisualizers.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net5.0-windows</TargetFrameworks>
-    <!--<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>-->
+    <TargetFrameworks>net35;net40;net45;net6.0-windows</TargetFrameworks>
+    <!--<TargetFrameworks>net45;net6.0-windows</TargetFrameworks>-->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>KGySoft.Drawing.DebuggerVisualizers</RootNamespace>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -13,9 +13,6 @@
     <PackageLicenseFile>..\..\LICENSE</PackageLicenseFile>
     <Authors>György Kőszeg</Authors>
     <Nullable>enable</Nullable>
-
-    <!--Suppression NETSDK1138: The target framework 'net5.0-windows' is out of support - this is not an application but a library so targeting the lowest possible versions is intended -->
-    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <!-- Common NuGet references -->
@@ -34,7 +31,7 @@
   </ItemGroup>
 
   <!-- .NET only references (note: doesn't really make sense but allows testing from KGySoft.Drawing.DebuggerVisualizers.Test) -->
-  <ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
     <Reference Include="Microsoft.VisualStudio.DebuggerVisualizers">
       <HintPath>..\_ref\Microsoft.VisualStudio.DebuggerVisualizers.dll</HintPath>
     </Reference>

diff --git a/KGySoft.Drawing.ImagingTools/KGySoft.Drawing.ImagingTools.csproj b/KGySoft.Drawing.ImagingTools/KGySoft.Drawing.ImagingTools.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net5.0-windows</TargetFrameworks>
-    <!--<TargetFrameworks>net45;net5.0-windows</TargetFrameworks>-->
+    <TargetFrameworks>net35;net40;net45;net6.0-windows</TargetFrameworks>
+    <!--<TargetFrameworks>net45;net6.0-windows</TargetFrameworks>-->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <RootNamespace>KGySoft.Drawing.ImagingTools</RootNamespace>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -19,9 +19,8 @@
     <Nullable>enable</Nullable>
 
     <!--Suppressions
-        - NETSDK1138: The target framework 'net5.0-windows' is out of support - this is not just an application but also a library with public API so targeting the lowest possible versions is intended
         - WFAC010: Remove high DPI settings from app.manifest and configure via Application.SetHighDpiMode - as targeting many frameworks handling it manually everywhere is intended. Otherwise, it would cause conflicts, eg. scaling sizes multiple times, etc. -->
-    <NoWarn>$(NoWarn);NETSDK1138;WFAC010</NoWarn>
+    <NoWarn>$(NoWarn);WFAC010</NoWarn>
   </PropertyGroup>
 
   <!--Common package references-->
@@ -40,11 +39,6 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
 
-  <!--.NET-only references-->
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0-rc.2.22472.3 " />
-  </ItemGroup>
-
   <ItemGroup>
     <!--Icon resources-->
     <EmbeddedResource Update="Properties\Resources.resx">

diff --git a/changelog.txt b/changelog.txt
@@ -30,7 +30,6 @@
 ! KGySoft.Drawing.DebuggerVisualizers.dll
 =========================================
 ! The actual debugger visualizers have been extracted into a new assembly.
-- Supporting CMYK images
 
 + API changes:
   + New KGySoft.Drawing.DebuggerVisualizers.Serialization namespace
@@ -40,10 +39,11 @@
     + New DebugCustomColor method
     + New DebugCustomPalette method
 
-+ KGySoft.Drawing.DebuggerVisualizers.GdiPlus.dll
+* KGySoft.Drawing.DebuggerVisualizers.GdiPlus.dll
 =================================================
 + A new assembly. The original debugger visualizers of KGySoft.Drawing.DebuggerVisualizers have been
   extracted into this assembly to support GDI+ (System.Drawing) types.
+- Supporting CMYK images
 
 + KGySoft.Drawing.DebuggerVisualizers.Wpf.dll
 =============================================