Move twaindsm binaries out of projects.

samples/WinForm32/Program.cs

@@ -3,32 +3,43 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Runtime.ExceptionServices;
 using System.Text;
 using System.Windows.Forms;
 
 namespace WinFormSample
 {
-  internal static class Program
-  {
-    /// <summary>
-    ///  The main entry point for the application.
-    /// </summary>
-    [STAThread]
-    static void Main()
+    internal static class Program
     {
-      //if (DsmLoader.TryUseCustomDSM())
-      //{
-      //  Debug.WriteLine("Using our own dsm now :)");
-      //}
-      //else
-      //{
-      //  Debug.WriteLine("Will attempt to use default dsm :(");
-      //}
+        /// <summary>
+        ///  The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        [HandleProcessCorruptedStateExceptions]
+        static void Main()
+        {
+            //if (DsmLoader.TryUseCustomDSM())
+            //{
+            //  Debug.WriteLine("Using our own dsm now :)");
+            //}
+            //else
+            //{
+            //  Debug.WriteLine("Will attempt to use default dsm :(");
+            //}
 
-      // To customize application configuration such as set high DPI settings or default font,
-      // see https://aka.ms/applicationconfiguration.
-      ApplicationConfiguration.Initialize();
-      Application.Run(new Form1());
+            // To customize application configuration such as set high DPI settings or default font,
+            // see https://aka.ms/applicationconfiguration.
+            try
+            {
+                ApplicationConfiguration.Initialize();
+                Application.Run(new Form1());
+            }
+            catch (Exception ex)
+            {
+                if (!Debugger.IsAttached) Debugger.Launch();
+                Debugger.Break();
+                Debug.WriteLine("Unhandled exception: " + ex.ToString());
+            }
+        }
     }
-  }
 }

samples/WinForm32/WinForm32.csproj

@@ -23,9 +23,6 @@
 		<None Update="platforms\qwindows.dll">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Update="runtimes\win-x86\native\TWAINDSM.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
 	</ItemGroup>
 
 </Project>

src/NTwain/NTwain.csproj

@@ -22,18 +22,6 @@
 	<ItemGroup Condition=" '$(TargetFramework)' != 'net472'">
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
 	</ItemGroup>
-	<ItemGroup Condition="'$(Configuration)'!='Release'">
-		<None Remove="runtimes\win-x64\native\TWAINDSM.dll" />
-		<None Remove="runtimes\win-x86\native\TWAINDSM.dll" />
-	</ItemGroup>
-	<ItemGroup Condition="'$(Configuration)'!='Release'">
-		<Content Include="runtimes\win-x64\native\TWAINDSM.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="runtimes\win-x86\native\TWAINDSM.dll">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.264">