From 0ea83792c6795e35e4be02b96337d5a2c61c9f31 Mon Sep 17 00:00:00 2001 From: Victor Derks Date: Fri, 14 Apr 2023 15:15:59 +0200 Subject: [PATCH] Update version to 3.1.0 (#48) --- CHANGELOG.md | 10 ++++++++++ README.md | 13 ++++++------- SECURITY.md | 3 ++- samples/Convert/Program.cs | 2 +- src/CharLS.Native.csproj | 9 ++++++--- src/README.md | 4 ++-- src/nuget-release-notes.txt | 5 +++-- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6135827..69a47c7 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/README.md b/README.md index 5ccaee8..fa29a12 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - JPEG-LS Logo # 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 diff --git a/SECURITY.md b/SECURITY.md index 27794a9..3163bce 100644 --- a/SECURITY.md +++ b/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: | diff --git a/samples/Convert/Program.cs b/samples/Convert/Program.cs index 9386a17..6a294d1 100644 --- a/samples/Convert/Program.cs +++ b/samples/Convert/Program.cs @@ -129,7 +129,7 @@ void Save(string path, ReadOnlySpan 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 } diff --git a/src/CharLS.Native.csproj b/src/CharLS.Native.csproj index 1b55170..24f0cb9 100644 --- a/src/CharLS.Native.csproj +++ b/src/CharLS.Native.csproj @@ -6,10 +6,10 @@ - 3.0.1 + 3.1.0 3.0.0.0 - 3.0.1.0 - Copyright 2022 Team CharLS + 3.1.0.0 + Copyright 2023 Team CharLS true true @@ -104,6 +104,9 @@ + + + diff --git a/src/README.md b/src/README.md index 71d6c66..0ce94ef 100644 --- a/src/README.md +++ b/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 diff --git a/src/nuget-release-notes.txt b/src/nuget-release-notes.txt index d27b83c..fca3619 100644 --- a/src/nuget-release-notes.txt +++ b/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)