lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-12-19 10:58:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lib version bumps and change net7 to net8.

Browse Source
This commit is contained in:
Eugene Wang
2024-07-12 08:19:55 -04:00
parent 474b066bd0
commit cea9a990b9
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,6 +5,7 @@
*.suo *.suo
*.user *.user
*.sln.docstates *.sln.docstates
.idea/
# Build results # Build results

1
NTwain.sln
View File

@@ -5,6 +5,7 @@ VisualStudioVersion = 17.1.32414.318
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_common", "_common", "{4CE0B9ED-2CD1-440F-B4EC-35ECA6D61EFE}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_common", "_common", "{4CE0B9ED-2CD1-440F-B4EC-35ECA6D61EFE}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
Build.cmd = Build.cmd Build.cmd = Build.cmd
src\Directory.Build.props = src\Directory.Build.props src\Directory.Build.props = src\Directory.Build.props
LICENSE.txt = LICENSE.txt LICENSE.txt = LICENSE.txt

2
samples/WinConsole32/WinConsole32.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>

4
samples/WinForm32/WinForm32.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
@@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Magick.NET-Q8-x86" Version="13.0.1" /> <PackageReference Include="Magick.NET-Q8-x86" Version="13.9.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
samples/WinForm64/WinForm64.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
@@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Magick.NET-Q8-x64" Version="13.0.1" /> <PackageReference Include="Magick.NET-Q8-x64" Version="13.9.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
src/Directory.Build.props
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<!--change these in each release--> <!--change these in each release-->
<VersionPrefix>4.0.0.0</VersionPrefix> <VersionPrefix>4.0.0.0</VersionPrefix>
<VersionSuffix>alpha.3</VersionSuffix> <VersionSuffix>alpha.4</VersionSuffix>
<!--keep it the same until major # changes--> <!--keep it the same until major # changes-->
<AssemblyVersion>4.0.0.0</AssemblyVersion> <AssemblyVersion>4.0.0.0</AssemblyVersion>
@@ -16,7 +16,7 @@
<RepositoryUrl>https://github.com/soukoku/ntwain</RepositoryUrl> <RepositoryUrl>https://github.com/soukoku/ntwain</RepositoryUrl>
<RepositoryType>GIT</RepositoryType> <RepositoryType>GIT</RepositoryType>
<NeutralLanguage>en-US</NeutralLanguage> <NeutralLanguage>en-US</NeutralLanguage>
<Copyright>Eugene Wang 2012-2023</Copyright> <Copyright>Eugene Wang 2012-2024</Copyright>
<Authors>Eugene Wang</Authors> <Authors>Eugene Wang</Authors>
<LangVersion>11</LangVersion> <LangVersion>11</LangVersion>
@@ -37,6 +37,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" /> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/NTwain/NTwain.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<PackageId>NTwain</PackageId> <PackageId>NTwain</PackageId>
<Description>Library containing the TWAIN API for dotnet.</Description> <Description>Library containing the TWAIN API for dotnet.</Description>
<TargetFrameworks>net6.0;net6.0-windows;net7.0;net7.0-windows;net462;</TargetFrameworks> <TargetFrameworks>net6.0;net6.0-windows;net8.0;net8.0-windows;net462;</TargetFrameworks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
@@ -19,7 +19,7 @@
<PackageReference Include="System.Memory" Version="4.5.5" /> <PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net462'"> <ItemGroup Condition=" '$(TargetFramework)' != 'net462'">
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Configuration)'!='Release'"> <ItemGroup Condition="'$(Configuration)'!='Release'">
<None Remove="runtimes\win-x64\native\TWAINDSM.dll" /> <None Remove="runtimes\win-x64\native\TWAINDSM.dll" />