initial net8.0-windows support

TownSuite · Oct 23, 2024 · 2367ca9 · 2367ca9
1 parent d3b905a
commit 2367ca9
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 30 deletions.
diff --git a/TownSuite.TwainScanner/MainFrame.Designer.cs b/TownSuite.TwainScanner/MainFrame.Designer.cs
diff --git a/TownSuite.TwainScanner/Properties/Resources.Designer.cs b/TownSuite.TwainScanner/Properties/Resources.Designer.cs
diff --git a/TownSuite.TwainScanner/Twain32.cs b/TownSuite.TwainScanner/Twain32.cs
@@ -84,7 +84,7 @@ public Twain32() {
                 case PlatformID.MacOSX:
                     throw new NotImplementedException();
                 default:
-                    Form _window=new Form();
+                    var _window=new System.Windows.Forms.Form();
                     this._components.Add(_window);
                     this._hwnd=_window.Handle;
                     break;

diff --git a/TownSuite.TwainScanner/TwainScanner.csproj b/TownSuite.TwainScanner/TwainScanner.csproj
@@ -3,9 +3,9 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>WinExe</OutputType>
     <RootNamespace>TownSuite.TwainScanner</RootNamespace>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
     <RuntimeIdentifiers>win;win-x86;win-x64</RuntimeIdentifiers>
-	 <AssemblyName>TownSuite.TwainScanner</AssemblyName>
+	<AssemblyName>TownSuite.TwainScanner</AssemblyName>
     <AssemblyTitle>TownSuite.TwainScanner</AssemblyTitle>
     <Company>TownSuite</Company>
     <Product>TownSuite.TwainScanner</Product>
@@ -17,6 +17,8 @@
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Platforms>AnyCPU;x86</Platforms>
+	<UseWindowsForms>true</UseWindowsForms>
+	<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile />
@@ -39,13 +41,12 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
+	  <Reference Include="Microsoft.CSharp" />
+	  <Reference Include="PresentationCore" />
+	  <Reference Include="PresentationFramework" />
+	  <Reference Include="System.Security" />
+	  <Reference Include="System.Xaml" />
+	  <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="MainFrame.cs">
@@ -88,4 +89,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\scanner.bmp" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net48' ">
+	<FrameworkReference Include="Microsoft.WindowsDesktop.App" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
+	<PackageReference Include="System.Windows.Extensions" Version="8.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/TownSuite.TwainScanner/TwainScanner_enhanced.csproj b/TownSuite.TwainScanner/TwainScanner_enhanced.csproj
@@ -3,7 +3,7 @@
 	  <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
 	  <OutputType>WinExe</OutputType>
 	  <RootNamespace>TownSuite.TwainScanner</RootNamespace>
-	  <TargetFramework>net48</TargetFramework>
+	  <TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
 	  <RuntimeIdentifiers>win;win-x86;win-x64</RuntimeIdentifiers>
 	  <AssemblyName>TownSuite.TwainScanner</AssemblyName>
 	  <AssemblyTitle>TownSuite.TwainScanner</AssemblyTitle>
@@ -17,6 +17,8 @@
 	  <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
 	  <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
 	  <Platforms>AnyCPU;x86</Platforms>
+	  <UseWindowsForms>true</UseWindowsForms>
+	  <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 	<DefineConstants>INCLUDE_TELERIK</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>