diff --git a/NTwain.sln b/NTwain.sln index 834ce5d..c2055fc 100644 --- a/NTwain.sln +++ b/NTwain.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain", "src\NTwain\NTwain.csproj", "{0C5A6FB1-0282-4D61-8354-68DEB1515001}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTwain", "src\NTwain\NTwain.csproj", "{0C5A6FB1-0282-4D61-8354-68DEB1515001}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain.Tests", "Tests\NTwain.Tests\NTwain.Tests.csproj", "{6B034C50-A397-435F-8DDF-677B403FEBAA}" EndProject @@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{4CE0B9 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Console", "samples\Sample.Console\Sample.Console.csproj", "{12D761EF-68DF-41CE-92EF-0C7AE81857A3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain.Net35", "src\NTwain.Net35\NTwain.Net35.csproj", "{2E965494-94B0-4EC7-960C-24E5D7D04278}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B77C17FE-FD84-4FF4-9A1C-D49DB1749C9C}" EndProject Global @@ -85,16 +83,6 @@ Global {12D761EF-68DF-41CE-92EF-0C7AE81857A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {12D761EF-68DF-41CE-92EF-0C7AE81857A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {12D761EF-68DF-41CE-92EF-0C7AE81857A3}.Release|x86.ActiveCfg = Release|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Release|Any CPU.Build.0 = Release|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2E965494-94B0-4EC7-960C-24E5D7D04278}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -105,6 +93,9 @@ Global {1715C2B7-5C35-4F8B-9D9B-8D68A3D5284D} = {2F906640-1664-4960-93D2-A054AC6E66A3} {12D761EF-68DF-41CE-92EF-0C7AE81857A3} = {2F906640-1664-4960-93D2-A054AC6E66A3} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A823206C-F8D5-491B-8B01-B9A5884FAEA1} + EndGlobalSection GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = NTwain.vsmdi EndGlobalSection diff --git a/samples/Sample.WPF/Properties/Resources.Designer.cs b/samples/Sample.WPF/Properties/Resources.Designer.cs index 016b1b3..b138589 100644 --- a/samples/Sample.WPF/Properties/Resources.Designer.cs +++ b/samples/Sample.WPF/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.0 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Sample.WPF.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/samples/Sample.WPF/Properties/Settings.Designer.cs b/samples/Sample.WPF/Properties/Settings.Designer.cs index 3b0af87..6d348b2 100644 --- a/samples/Sample.WPF/Properties/Settings.Designer.cs +++ b/samples/Sample.WPF/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.0 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace Sample.WPF.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/samples/Sample.WPF/Sample.WPF.csproj b/samples/Sample.WPF/Sample.WPF.csproj index 2c7f7b0..8d0f584 100644 --- a/samples/Sample.WPF/Sample.WPF.csproj +++ b/samples/Sample.WPF/Sample.WPF.csproj @@ -14,7 +14,8 @@ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 ..\..\ - Client + + x86 diff --git a/samples/Sample.WPF/app.config b/samples/Sample.WPF/app.config index b7cbd58..bd6f002 100644 --- a/samples/Sample.WPF/app.config +++ b/samples/Sample.WPF/app.config @@ -1,15 +1,15 @@ - + - + - - + + - - + + diff --git a/samples/Sample.Winform/Properties/Resources.Designer.cs b/samples/Sample.Winform/Properties/Resources.Designer.cs index 350ef60..e490693 100644 --- a/samples/Sample.Winform/Properties/Resources.Designer.cs +++ b/samples/Sample.Winform/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Sample.Winform.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/samples/Sample.Winform/Properties/Settings.Designer.cs b/samples/Sample.Winform/Properties/Settings.Designer.cs index 21924a5..d64eea0 100644 --- a/samples/Sample.Winform/Properties/Settings.Designer.cs +++ b/samples/Sample.Winform/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Sample.Winform.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/samples/Sample.Winform/Sample.Winform.csproj b/samples/Sample.Winform/Sample.Winform.csproj index 326e60b..a39b9ca 100644 --- a/samples/Sample.Winform/Sample.Winform.csproj +++ b/samples/Sample.Winform/Sample.Winform.csproj @@ -12,7 +12,8 @@ Sample.Winform v3.5 512 - Client + + ..\..\ @@ -77,13 +78,13 @@ - - {2e965494-94b0-4ec7-960c-24e5d7d04278} - NTwain.Net35 - + - + + {0c5a6fb1-0282-4d61-8354-68deb1515001} + NTwain + - \ No newline at end of file diff --git a/src/NTwain.Net35/Sign.snk b/src/NTwain.Net35/Sign.snk deleted file mode 100644 index d65a7a6..0000000 Binary files a/src/NTwain.Net35/Sign.snk and /dev/null differ diff --git a/src/NTwain/GlobalSuppressions.cs b/src/NTwain/GlobalSuppressions.cs deleted file mode 100644 index 77ae691..0000000 Binary files a/src/NTwain/GlobalSuppressions.cs and /dev/null differ diff --git a/src/NTwain/NTwain.csproj b/src/NTwain/NTwain.csproj index 10d66ac..075de8a 100644 --- a/src/NTwain/NTwain.csproj +++ b/src/NTwain/NTwain.csproj @@ -1,52 +1,37 @@ - - - - Release - AnyCPU - 8.0.30703 - 2.0 - {0C5A6FB1-0282-4D61-8354-68DEB1515001} - Library - Properties - NTwain - NTwain - v4.0 - 512 - ..\ - Client - - - true - full - false - bin\Debug\ - TRACE;DEBUG;NET4 - prompt - 4 - false - - - false - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE;NET4 - prompt - 4 - bin\Release\NTwain.xml - false - AllRules.ruleset - + + NTwain + Library containing the TWAIN API for dotnet. + net35;net40 + https://github.com/soukoku/ntwain + twain scan + MIT + https://github.com/soukoku/ntwain/blob/master/Scanner-Icon.png?raw=true + https://github.com/soukoku/ntwain + GIT + en-US + + Eugene Wang true - - Sign.snk + 3.0.0.0 + 3.0.0.0 + 3.7.0 + 7.1 + + + true + true + true + true + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + + + + @@ -55,130 +40,25 @@ + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True + True + True Resources.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ResXFileCodeGenerator Resources.Designer.cs - - - \ No newline at end of file diff --git a/src/NTwain/NTwain.nuspec b/src/NTwain/NTwain.nuspec deleted file mode 100644 index cdb55ac..0000000 --- a/src/NTwain/NTwain.nuspec +++ /dev/null @@ -1,24 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://raw.githubusercontent.com/soukoku/ntwain/v3/LICENSE.txt - https://github.com/soukoku/ntwain/tree/v3 - https://raw.githubusercontent.com/soukoku/ntwain/v3/Scanner-Icon.png - false - $description$ - This release supports TWAIN 2.3. - $copyright$ - twain scan - - - - - - - - \ No newline at end of file diff --git a/src/NTwain/Properties/AssemblyInfo.cs b/src/NTwain/Properties/AssemblyInfo.cs index cc8dc6d..879b571 100644 --- a/src/NTwain/Properties/AssemblyInfo.cs +++ b/src/NTwain/Properties/AssemblyInfo.cs @@ -4,15 +4,10 @@ using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("NTwain")] -[assembly: AssemblyDescription("Library containing the TWAIN API for dotnet.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("NTwain")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: CLSCompliant(false)] -[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.MainAssembly)] #if DEBUG [assembly: InternalsVisibleTo(@"NTwain.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ad02a9cc0f8ee929ad066a59951057ba3b9f400ff5c176988935ea72d9738003df98d65ccde2c8eecd75fa0414e7816d7475d379ef9b93601ff4d2a8807d61398a19405e0f6a79c7c523fd02c93c2bfaf9b818f43a88542ba22df80811d24260be737d6e303e91aadf4588b23c809494d164728462d6f1292928c8fab7ea06c5")] diff --git a/src/NTwain/Properties/Resources.Designer.cs b/src/NTwain/Properties/Resources.Designer.cs index 9ebbf18..79db5b2 100644 --- a/src/NTwain/Properties/Resources.Designer.cs +++ b/src/NTwain/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.0 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace NTwain.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/NTwain/Properties/VersionInfo.cs b/src/NTwain/Properties/VersionInfo.cs deleted file mode 100644 index b6415e7..0000000 --- a/src/NTwain/Properties/VersionInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyCopyright("Copyright \x00a9 Yin-Chun Wang 2012-2018")] -[assembly: AssemblyCompany("Yin-Chun Wang")] - -[assembly: AssemblyVersion(NTwain.VersionInfo.Release)] -[assembly: AssemblyFileVersion(NTwain.VersionInfo.Build)] -[assembly: AssemblyInformationalVersion(NTwain.VersionInfo.Build)] - -namespace NTwain -{ - /// - /// Contains version info of NTwain. - /// - static class VersionInfo - { - /// - /// The major release version number. - /// - public const string Release = "3.0.0.0"; // keep this same in major (breaking) releases - - - /// - /// The build release version number. - /// - public const string Build = "3.6.0"; // change this for each nuget release - - - } -} \ No newline at end of file