Update to new csproj type and got rid of old 3.5 proj and.

This commit is contained in:
Eugene Wang 2021-02-02 11:30:54 -05:00
parent 6a0ee44eee
commit 2e3f7422df
17 changed files with 70 additions and 621 deletions

View File

@ -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

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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 {

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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())));

View File

@ -14,7 +14,8 @@
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>

View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" /></startup>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
<assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="GalaSoft.MvvmLight" publicKeyToken="0e453835af4ee6ce" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.3.0.19038" newVersion="5.3.0.19038" />
<assemblyIdentity name="GalaSoft.MvvmLight" publicKeyToken="0e453835af4ee6ce" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.3.0.19038" newVersion="5.3.0.19038"/>
</dependentAssembly>
</assemblyBinding>
</runtime>

View File

@ -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 {

View File

@ -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())));

View File

@ -12,7 +12,8 @@
<AssemblyName>Sample.Winform</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@ -77,13 +78,13 @@
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\NTwain.Net35\NTwain.Net35.csproj">
<Project>{2e965494-94b0-4ec7-960c-24e5d7d04278}</Project>
<Name>NTwain.Net35</Name>
</ProjectReference>
<None Include="scanner.ico" />
</ItemGroup>
<ItemGroup>
<None Include="scanner.ico" />
<ProjectReference Include="..\..\src\NTwain\NTwain.csproj">
<Project>{0c5a6fb1-0282-4d61-8354-68deb1515001}</Project>
<Name>NTwain</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

View File

@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup></configuration>
<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

View File

@ -1,365 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2E965494-94B0-4EC7-960C-24E5D7D04278}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NTwain</RootNamespace>
<AssemblyName>NTwain</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\NTwain\bin\Debug\Net35\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\NTwain\bin\Release\Net35\</OutputPath>
<DefineConstants>TRACE;NET35</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\NTwain\bin\Release\Net35\NTwain.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Sign.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\NTwain\Capabilities.cs">
<Link>Capabilities.cs</Link>
</Compile>
<Compile Include="..\NTwain\CapabilityReader.cs">
<Link>CapabilityReader.cs</Link>
</Compile>
<Compile Include="..\NTwain\CapWrapper.cs">
<Link>CapWrapper.cs</Link>
</Compile>
<Compile Include="..\NTwain\DataSource.cs">
<Link>DataSource.cs</Link>
</Compile>
<Compile Include="..\NTwain\DataTransferredEventArgs.cs">
<Link>DataTransferredEventArgs.cs</Link>
</Compile>
<Compile Include="..\NTwain\Data\TwainTypes.cs">
<Link>Data\TwainTypes.cs</Link>
</Compile>
<Compile Include="..\NTwain\Data\TwainTypesExtended.cs">
<Link>Data\TwainTypesExtended.cs</Link>
</Compile>
<Compile Include="..\NTwain\Data\TwainValues.cs">
<Link>Data\TwainValues.cs</Link>
</Compile>
<Compile Include="..\NTwain\Data\TypeExtensions.cs">
<Link>Data\TypeExtensions.cs</Link>
</Compile>
<Compile Include="..\NTwain\Data\ValueExtensions.cs">
<Link>Data\ValueExtensions.cs</Link>
</Compile>
<Compile Include="..\NTwain\DeviceEventArgs.cs">
<Link>DeviceEventArgs.cs</Link>
</Compile>
<Compile Include="..\NTwain\ICapabilities.cs">
<Link>ICapabilities.cs</Link>
</Compile>
<Compile Include="..\NTwain\ICapWrapper.cs">
<Link>ICapWrapper.cs</Link>
</Compile>
<Compile Include="..\NTwain\IDataSource.cs">
<Link>IDataSource.cs</Link>
</Compile>
<Compile Include="..\NTwain\ILog.cs">
<Link>ILog.cs</Link>
</Compile>
<Compile Include="..\NTwain\IMemoryManager.cs">
<Link>IMemoryManager.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\Extensions.cs">
<Link>Internals\Extensions.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\ICommittable.cs">
<Link>Internals\ICommittable.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\ImageTools.cs">
<Link>Internals\ImageTools.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\InternalMessageLoopHook.cs">
<Link>Internals\InternalMessageLoopHook.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\ITwainSessionInternal.cs">
<Link>Internals\ITwainSessionInternal.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\IWinMessageFilter.cs">
<Link>Internals\IWinMessageFilter.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\LinuxMemoryManager.cs">
<Link>Internals\LinuxMemoryManager.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\TentativeStateCommitable.cs">
<Link>Internals\TentativeStateCommitable.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\TraceLog.cs">
<Link>Internals\TraceLog.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\TransferLogic.cs">
<Link>Internals\TransferLogic.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\WindowsHook.cs">
<Link>Internals\WindowsHook.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\WinMemoryManager.cs">
<Link>Internals\WinMemoryManager.cs</Link>
</Compile>
<Compile Include="..\NTwain\Internals\WrappedManualResetEvent.cs">
<Link>Internals\WrappedManualResetEvent.cs</Link>
</Compile>
<Compile Include="..\NTwain\Interop\BITMAP.cs">
<Link>Interop\BITMAP.cs</Link>
</Compile>
<Compile Include="..\NTwain\Interop\MESSAGE.cs">
<Link>Interop\MESSAGE.cs</Link>
</Compile>
<Compile Include="..\NTwain\Interop\NativeMethods.cs">
<Link>Interop\NativeMethods.cs</Link>
</Compile>
<Compile Include="..\NTwain\Interop\TIFF.cs">
<Link>Interop\TIFF.cs</Link>
</Compile>
<Compile Include="..\NTwain\Interop\UnsafeNativeMethods.cs">
<Link>Interop\UnsafeNativeMethods.cs</Link>
</Compile>
<Compile Include="..\NTwain\IPlatformInfo.cs">
<Link>IPlatformInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\ITripletControl.cs">
<Link>ITripletControl.cs</Link>
</Compile>
<Compile Include="..\NTwain\ITwainSession.cs">
<Link>ITwainSession.cs</Link>
</Compile>
<Compile Include="..\NTwain\MessageLoopHooks.cs">
<Link>MessageLoopHooks.cs</Link>
</Compile>
<Compile Include="..\NTwain\PlatformInfo.cs">
<Link>PlatformInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\Properties\AssemblyInfo.cs">
<Link>Properties\AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\Properties\Resources.Designer.cs">
<Link>Properties\Resources.Designer.cs</Link>
<DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="..\NTwain\Properties\VersionInfo.cs">
<Link>Properties\VersionInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\ProtocolVersions.cs">
<Link>ProtocolVersions.cs</Link>
</Compile>
<Compile Include="..\NTwain\SourceEnableMode.cs">
<Link>SourceEnableMode.cs</Link>
</Compile>
<Compile Include="..\NTwain\State.cs">
<Link>State.cs</Link>
</Compile>
<Compile Include="..\NTwain\TransferErrorEventArgs.cs">
<Link>TransferErrorEventArgs.cs</Link>
</Compile>
<Compile Include="..\NTwain\TransferReadyEventArgs.cs">
<Link>TransferReadyEventArgs.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGAudio\DGAudio.AudioFileXfer.cs">
<Link>Triplets\DGAudio\DGAudio.AudioFileXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGAudio\DGAudio.AudioInfo.cs">
<Link>Triplets\DGAudio\DGAudio.AudioInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGAudio\DGAudio.AudioNativeXfer.cs">
<Link>Triplets\DGAudio\DGAudio.AudioNativeXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGAudio\DGAudio.cs">
<Link>Triplets\DGAudio\DGAudio.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Callback.cs">
<Link>Triplets\DGControl\DGControl.Callback.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Callback2.cs">
<Link>Triplets\DGControl\DGControl.Callback2.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Capability.cs">
<Link>Triplets\DGControl\DGControl.Capability.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.CapabilityCustom.cs">
<Link>Triplets\DGControl\DGControl.CapabilityCustom.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.cs">
<Link>Triplets\DGControl\DGControl.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.CustomDSData.cs">
<Link>Triplets\DGControl\DGControl.CustomDSData.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.DeviceEvent.cs">
<Link>Triplets\DGControl\DGControl.DeviceEvent.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.EntryPoint.cs">
<Link>Triplets\DGControl\DGControl.EntryPoint.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Event.cs">
<Link>Triplets\DGControl\DGControl.Event.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.FileSystem.cs">
<Link>Triplets\DGControl\DGControl.FileSystem.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Identity.cs">
<Link>Triplets\DGControl\DGControl.Identity.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Parent.cs">
<Link>Triplets\DGControl\DGControl.Parent.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.PassThru.cs">
<Link>Triplets\DGControl\DGControl.PassThru.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.PendingXfers.cs">
<Link>Triplets\DGControl\DGControl.PendingXfers.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.SetupFileXfer.cs">
<Link>Triplets\DGControl\DGControl.SetupFileXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.SetupMemXfer.cs">
<Link>Triplets\DGControl\DGControl.SetupMemXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.Status.cs">
<Link>Triplets\DGControl\DGControl.Status.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.StatusUtf8.cs">
<Link>Triplets\DGControl\DGControl.StatusUtf8.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.UserInterface.cs">
<Link>Triplets\DGControl\DGControl.UserInterface.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGControl\DGControl.XferGroup.cs">
<Link>Triplets\DGControl\DGControl.XferGroup.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGCustom.cs">
<Link>Triplets\DGCustom.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.CieColor.cs">
<Link>Triplets\DGImage\DGImage.CieColor.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.cs">
<Link>Triplets\DGImage\DGImage.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ExtImageInfo.cs">
<Link>Triplets\DGImage\DGImage.ExtImageInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.Filter.cs">
<Link>Triplets\DGImage\DGImage.Filter.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.GrayResponse.cs">
<Link>Triplets\DGImage\DGImage.GrayResponse.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.IccProfile.cs">
<Link>Triplets\DGImage\DGImage.IccProfile.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ImageFileXfer.cs">
<Link>Triplets\DGImage\DGImage.ImageFileXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ImageInfo.cs">
<Link>Triplets\DGImage\DGImage.ImageInfo.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ImageLayout.cs">
<Link>Triplets\DGImage\DGImage.ImageLayout.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ImageMemFileXfer.cs">
<Link>Triplets\DGImage\DGImage.ImageMemFileXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ImageMemXfer.cs">
<Link>Triplets\DGImage\DGImage.ImageMemXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.ImageNativeXfer.cs">
<Link>Triplets\DGImage\DGImage.ImageNativeXfer.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.JpegCompression.cs">
<Link>Triplets\DGImage\DGImage.JpegCompression.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.Palette8.cs">
<Link>Triplets\DGImage\DGImage.Palette8.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\DGImage\DGImage.RgbResponse.cs">
<Link>Triplets\DGImage\DGImage.RgbResponse.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\Dsm.cs">
<Link>Triplets\Dsm.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\Dsm.Linux.cs">
<Link>Triplets\Dsm.Linux.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\Dsm.WinNew.cs">
<Link>Triplets\Dsm.WinNew.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\Dsm.WinOld.cs">
<Link>Triplets\Dsm.WinOld.cs</Link>
</Compile>
<Compile Include="..\NTwain\Triplets\TripletBase.cs">
<Link>Triplets\TripletBase.cs</Link>
</Compile>
<Compile Include="..\NTwain\TwainException.cs">
<Link>TwainException.cs</Link>
</Compile>
<Compile Include="..\NTwain\TwainSession.cs">
<Link>TwainSession.cs</Link>
</Compile>
<Compile Include="..\NTwain\TwainSessionInternal.cs">
<Link>TwainSessionInternal.cs</Link>
</Compile>
<Compile Include="..\NTwain\TwainStateException.cs">
<Link>TwainStateException.cs</Link>
</Compile>
<Compile Include="..\NTwain\WpfImageTools.cs">
<Link>WpfImageTools.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\NTwain\Properties\Resources.resx">
<Link>Properties\Resources.resx</Link>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="..\NTwain\Triplets\WhatsThis.txt">
<Link>Triplets\WhatsThis.txt</Link>
</None>
<None Include="Sign.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

Binary file not shown.

Binary file not shown.

View File

@ -1,52 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0C5A6FB1-0282-4D61-8354-68DEB1515001}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NTwain</RootNamespace>
<AssemblyName>NTwain</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET4</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<RunCodeAnalysis>false</RunCodeAnalysis>
<DocumentationFile>
</DocumentationFile>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NET4</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\NTwain.xml</DocumentationFile>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>NTwain</PackageId>
<Description>Library containing the TWAIN API for dotnet.</Description>
<TargetFrameworks>net35;net40</TargetFrameworks>
<PackageProjectUrl>https://github.com/soukoku/ntwain</PackageProjectUrl>
<PackageTags>twain scan</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIconUrl>https://github.com/soukoku/ntwain/blob/master/Scanner-Icon.png?raw=true</PackageIconUrl>
<RepositoryUrl>https://github.com/soukoku/ntwain</RepositoryUrl>
<RepositoryType>GIT</RepositoryType>
<NeutralLanguage>en-US</NeutralLanguage>
<!--<Copyright>Eugene Wang 2012</Copyright>-->
<Authors>Eugene Wang</Authors>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Sign.snk</AssemblyOriginatorKeyFile>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<FileVersion>3.0.0.0</FileVersion>
<Version>3.7.0</Version>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
@ -55,130 +40,25 @@
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net35'">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="CapWrapper.cs" />
<Compile Include="CapabilityReader.cs" />
<Compile Include="Data\TypeExtensions.cs" />
<Compile Include="Data\TwainTypesExtended.cs" />
<Compile Include="DeviceEventArgs.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="ICapabilities.cs" />
<Compile Include="IDataSource.cs" />
<Compile Include="ILog.cs" />
<Compile Include="Internals\TraceLog.cs" />
<Compile Include="Internals\Extensions.cs" />
<Compile Include="DataTransferredEventArgs.cs" />
<Compile Include="IMemoryManager.cs" />
<Compile Include="Internals\ICommittable.cs" />
<Compile Include="Internals\ImageTools.cs" />
<Compile Include="Internals\InternalMessageLoopHook.cs" />
<Compile Include="Internals\ITwainSessionInternal.cs" />
<Compile Include="Internals\LinuxMemoryManager.cs" />
<Compile Include="Interop\BITMAP.cs" />
<Compile Include="Interop\MESSAGE.cs" />
<Compile Include="Internals\TransferLogic.cs" />
<Compile Include="Internals\WindowsHook.cs" />
<Compile Include="Internals\WrappedManualResetEvent.cs" />
<Compile Include="Interop\NativeMethods.cs" />
<Compile Include="Interop\TIFF.cs" />
<Compile Include="IPlatformInfo.cs" />
<Compile Include="ITripletControl.cs" />
<Compile Include="ITwainSession.cs" />
<Compile Include="Internals\WinMemoryManager.cs" />
<Compile Include="Interop\UnsafeNativeMethods.cs" />
<Compile Include="Internals\IWinMessageFilter.cs" />
<Compile Include="ICapWrapper.cs" />
<Compile Include="MessageLoopHooks.cs" />
<Compile Include="PlatformInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\VersionInfo.cs" />
<Compile Include="Internals\TentativeStateCommitable.cs" />
<Compile Include="ProtocolVersions.cs" />
<Compile Include="State.cs" />
<Compile Include="TransferErrorEventArgs.cs" />
<Compile Include="TransferReadyEventArgs.cs" />
<Compile Include="Triplets\DGControl\DGControl.Callback2.cs" />
<Compile Include="Triplets\DGControl\DGControl.CapabilityCustom.cs" />
<Compile Include="Triplets\DGImage\DGImage.Filter.cs" />
<Compile Include="Triplets\DGCustom.cs" />
<Compile Include="Triplets\TripletBase.cs" />
<Compile Include="Triplets\Dsm.Linux.cs" />
<Compile Include="Triplets\Dsm.WinOld.cs" />
<Compile Include="Triplets\Dsm.WinNew.cs" />
<Compile Include="TwainSessionInternal.cs" />
<Compile Include="Capabilities.cs" />
<Compile Include="TwainSession.cs" />
<Compile Include="DataSource.cs" />
<Compile Include="TwainStateException.cs" />
<Compile Include="Data\TwainTypes.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Triplets\DGAudio\DGAudio.AudioFileXfer.cs" />
<Compile Include="Triplets\DGAudio\DGAudio.AudioInfo.cs" />
<Compile Include="Triplets\DGAudio\DGAudio.AudioNativeXfer.cs" />
<Compile Include="Triplets\DGAudio\DGAudio.cs" />
<Compile Include="Triplets\DGControl\DGControl.Callback.cs" />
<Compile Include="Triplets\DGControl\DGControl.Capability.cs" />
<Compile Include="Triplets\DGControl\DGControl.cs" />
<Compile Include="Triplets\DGControl\DGControl.CustomDSData.cs" />
<Compile Include="Triplets\DGControl\DGControl.DeviceEvent.cs" />
<Compile Include="Triplets\DGControl\DGControl.EntryPoint.cs" />
<Compile Include="Triplets\DGControl\DGControl.Event.cs" />
<Compile Include="Triplets\DGControl\DGControl.FileSystem.cs" />
<Compile Include="Triplets\DGControl\DGControl.Identity.cs" />
<Compile Include="Triplets\DGControl\DGControl.Parent.cs" />
<Compile Include="Triplets\DGControl\DGControl.PassThru.cs" />
<Compile Include="Triplets\DGControl\DGControl.PendingXfers.cs" />
<Compile Include="Triplets\DGControl\DGControl.SetupFileXfer.cs" />
<Compile Include="Triplets\DGControl\DGControl.SetupMemXfer.cs" />
<Compile Include="Triplets\DGControl\DGControl.Status.cs" />
<Compile Include="Triplets\DGControl\DGControl.StatusUtf8.cs" />
<Compile Include="Triplets\DGControl\DGControl.UserInterface.cs" />
<Compile Include="Triplets\DGControl\DGControl.XferGroup.cs" />
<Compile Include="Triplets\DGImage\DGImage.CieColor.cs" />
<Compile Include="Triplets\DGImage\DGImage.cs" />
<Compile Include="Triplets\DGImage\DGImage.ExtImageInfo.cs" />
<Compile Include="Triplets\DGImage\DGImage.GrayResponse.cs" />
<Compile Include="Triplets\DGImage\DGImage.IccProfile.cs" />
<Compile Include="Triplets\DGImage\DGImage.ImageFileXfer.cs" />
<Compile Include="Triplets\DGImage\DGImage.ImageInfo.cs" />
<Compile Include="Triplets\DGImage\DGImage.ImageLayout.cs" />
<Compile Include="Triplets\DGImage\DGImage.ImageMemFileXfer.cs" />
<Compile Include="Triplets\DGImage\DGImage.ImageMemXfer.cs" />
<Compile Include="Triplets\DGImage\DGImage.ImageNativeXfer.cs" />
<Compile Include="Triplets\DGImage\DGImage.JpegCompression.cs" />
<Compile Include="Triplets\DGImage\DGImage.Palette8.cs" />
<Compile Include="Triplets\DGImage\DGImage.RgbResponse.cs" />
<Compile Include="Triplets\Dsm.cs" />
<Compile Include="TwainException.cs" />
<Compile Include="Data\TwainValues.cs" />
<Compile Include="SourceEnableMode.cs" />
<Compile Include="Data\ValueExtensions.cs" />
<Compile Include="WpfImageTools.cs" />
</ItemGroup>
<ItemGroup>
<None Include="NTwain.nuspec" />
</ItemGroup>
<ItemGroup>
<None Include="Sign.snk" />
<None Include="Triplets\WhatsThis.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

View File

@ -1,24 +0,0 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>$author$</authors>
<owners>$author$</owners>
<licenseUrl>https://raw.githubusercontent.com/soukoku/ntwain/v3/LICENSE.txt</licenseUrl>
<projectUrl>https://github.com/soukoku/ntwain/tree/v3</projectUrl>
<iconUrl>https://raw.githubusercontent.com/soukoku/ntwain/v3/Scanner-Icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<releaseNotes>This release supports TWAIN 2.3.</releaseNotes>
<copyright>$copyright$</copyright>
<tags>twain scan</tags>
</metadata>
<files>
<file src="bin\$configuration$\$id$.pdb" target="lib\net40-client"/>
<file src="bin\$configuration$\Net35\$id$.dll" target="lib\net35-client"/>
<file src="bin\$configuration$\Net35\$id$.xml" target="lib\net35-client"/>
<file src="bin\$configuration$\Net35\$id$.pdb" target="lib\net35-client"/>
</files>
</package>

View File

@ -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")]

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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 {

View File

@ -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
{
/// <summary>
/// Contains version info of NTwain.
/// </summary>
static class VersionInfo
{
/// <summary>
/// The major release version number.
/// </summary>
public const string Release = "3.0.0.0"; // keep this same in major (breaking) releases
/// <summary>
/// The build release version number.
/// </summary>
public const string Build = "3.6.0"; // change this for each nuget release
}
}