Update version to 3.1.0 (#48)

CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.0 - 2023-4-14]
+
+### Added
+
+- Support for .NET Framework 4.8.
+
+### Fixed
+
+- Fixed [#45](https://github.com/team-charls/charls-native-dotnet/issues/45), Callbacks AtCommentHandler and AtApplicationDataHandler fail in x86 mode on Windows.
+
 ## [3.0.1 - 2023-1-2]
 
 ### Changed

README.md

@@ -1,4 +1,3 @@
-
 <img src="doc/jpeg_ls_logo.png" alt="JPEG-LS Logo" width="100"/>
 
 # CharLS.Native .NET
@@ -7,14 +6,14 @@
 [![Build Status](https://dev.azure.com/team-charls/charls-native-dotnet/_apis/build/status/team-charls.charls-native-dotnet?branchName=main)](https://dev.azure.com/team-charls/charls-native-dotnet/_build/latest?definitionId=4&branchName=main)
 [![NuGet](https://img.shields.io/nuget/v/CharLS.Native.svg)](https://www.nuget.org/packages/CharLS.Native)
 
-CharLS.Native .NET is an adapter assembly that provides access to the native CharLS JPEG-LS C++ implementation for .NET based applications.
+CharLS.Native .NET is an adapter assembly that provides access to the native CharLS JPEG-LS C++ implementation for .NET based applications.  
 JPEG-LS (ISO-14495-1) is a lossless/near-lossless compression standard for continuous-tone images.
 
 ## Features
 
-* .NET 6.0 and .NET 7.0 class library.
+* .NET Framework 4.8, .NET 6.0 and .NET 7.0 class library.
 * Support for the .NET platforms: Windows, Linux and macOS.
-* Includes prebuilt native CharLS Windows DLLs (x86 and x64).
+* Includes prebuilt native CharLS Windows DLLs (x86, x64 and ARM64).
 
 ## How to use
 
@@ -28,8 +27,8 @@ dotnet add package CharLS.Native
 
 ### Windows specific installation steps
 
-The NuGet package comes with prebuilt CharLS DLLs for the x86 and X64 targets.
-The Microsoft Visual C++ 2015-2022 Redistributable (v14.34 or newer) needs to be installed on the target system.
+The NuGet package comes with prebuilt CharLS DLLs for the x86, x64 and ARM64 targets.
+The Microsoft Visual C++ 2015-2022 Redistributable (v14.35 or newer) needs to be installed on the target system.
 
 ### Linux specific installation steps
 
@@ -60,7 +59,7 @@ A sample application is included in the GitHub repository that demonstrates how
 ```
 
 * Use CMake to build the native C++ shared library, see the CharLS project how to do that. When building with Visual Studio, this step can be skipped.
-* Use the .NET 7.0 CLI or Visual Studio 2022 (v17.4 or newer) to build the solution file CharLSNativeDotNet.sln. For example: `dotnet build && dotnet test && dotnet publish` to build the nuget package.
+* Use the .NET 7.0 CLI or Visual Studio 2022 (v17.5 or newer) to build the solution file CharLSNativeDotNet.sln. For example: `dotnet build && dotnet test && dotnet publish` to build the nuget package.
 
 ### Building Windows DLLs and code signing all components
 

SECURITY.md

@@ -4,7 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 3.0.1   | :white_check_mark: |
+| 3.1.0   | :white_check_mark: |
+| 3.0.1   | :x:                |
 | 3.0.0   | :x:                |
 | 2.0.0   | :x:                |
 | 1.2.0   | :x:                |

samples/Convert/Program.cs

@@ -129,7 +129,7 @@ void Save(string path, ReadOnlySpan<byte> encodedData)
 #if NET6_0_OR_GREATER
     output.Write(encodedData);
 #else
-    output.Write(encodedData.ToArray(), 0, encodedData.ToArray().Length);
+    output.Write(encodedData.ToArray(), 0, encodedData.Length);
 #endif
 }
 

src/CharLS.Native.csproj

@@ -6,10 +6,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.1</Version>
+    <Version>3.1.0</Version>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
-    <FileVersion>3.0.1.0</FileVersion>
-    <Copyright>Copyright 2022 Team CharLS</Copyright>
+    <FileVersion>3.1.0.0</FileVersion>
+    <Copyright>Copyright 2023 Team CharLS</Copyright>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
@@ -104,6 +104,9 @@
 
   <Target Name="SignWindowsDlls" BeforeTargets="GenerateNuspec" Condition="'$(MSBuildRuntimeType)'=='Full'">
     <!-- Use TargetFrameworkVersion=v4.5 to sign with SHA256 -->
+    <Message Text="Signing CharLS.Native.dll (.NET Framework 4.8)" />
+    <SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)net48\CharLS.Native.dll" TargetFrameworkVersion="v4.5" />
+
     <Message Text="Signing CharLS.Native.dll (.NET 6.0)" />
     <SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)net6.0\CharLS.Native.dll" TargetFrameworkVersion="v4.5" />
 

src/README.md

@@ -6,7 +6,7 @@ JPEG-LS (ISO-14495-1) is a lossless/near-lossless compression standard for conti
 
 ## Features
 
-* Support for .NET 7.0 and .NET 6.0.
+* Support for .NET 7.0, .NET 6.0 and .NET Framework 4.8.
 * Support for the .NET platforms: Windows, Linux and macOS.
 
 ## How to use
@@ -22,7 +22,7 @@ dotnet add package CharLS.Native
 ### Windows specific installation steps
 
 The NuGet package comes with prebuilt CharLS DLLs for x86, x64 and ARM64 targets.
-The Microsoft Visual C++ Redistributable for Visual Studio 2015-2022 (v14.34 or newer) needs to be installed on the target system.
+The Microsoft Visual C++ Redistributable for Visual Studio 2015-2022 (v14.35 or newer) needs to be installed on the target system.
 
 ### Linux specific installation steps
 

src/nuget-release-notes.txt

@@ -1,2 +1,3 @@
-3.0.1
- - Latest version of CharLS Windows DLLs v2.4.1.
+3.1.0
+ - Added support for .NET Framework 4.8
+ - Fix defect in callback handlers in x86 mode (issue #45)