Skip to content

Commit

Permalink
Update version to 3.0.0 (#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
vbaderks authored Dec 31, 2022
1 parent c0c348b commit bfbe9aa
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 18 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
# Change Log
# Changelog

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.0.0 - 2022-12-31]

### Added

- Support for Charls v2.4.0. CharLS v2.4.0 is now the minimum required version.
- Support for .NET 7.0.
- Support for the native ARM64 CharLS DLL on Windows.
- Added support to retrieve the JpegLSError value from a thrown exception.
- Added support to write and read JPEG Application Data segments.
- Added support to validate SPIFF headers.

## [2.0.0 - 2022-6-5]

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ A sample application is included in the GitHub repository that demonstrates how

### Building Windows DLLs and code signing all components

Building the NuGet package with signed Windows DLLs can only be done on the Window platform with Visual Studio 2019 or with Build tools for Visual Studio 2019.
Building the NuGet package with signed Windows DLLs can only be done on the Window platform with Visual Studio 2022 or with Build tools for Visual Studio 2022.
To support code signing with a code signing certificate, stored on a smart card, a Windows command file is available: `create-signed-nuget-package.cmd`.
Instructions:

Expand Down
3 changes: 2 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

| Version | Supported |
| ------- | ------------------ |
| 1.2.0 | :white_check_mark: |
| 3.0.0 | :white_check_mark: |
| 2.0.0 | :x: |
| 1.1.0 | :x: |
| 1.0.0 | :x: |

Expand Down
14 changes: 14 additions & 0 deletions samples/Convert/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# CharLS.Native .NET Convert Sample

This sample demonstrates how to convert common image formats that .NET can read by default (.bmp, .png, .jpg, etc.) to the JPEG-LS format.

## How to use

Usage: Convert "input-image-filename"

The sample will create at the same location an output file called "input-image-filename".jls

## Remarks

- This sample uses the NuGet package System.Drawing.Common. This NuGet package is only supported on Windows.
A good simple cross-platform alternative is unfortunately not available.
21 changes: 12 additions & 9 deletions src/CharLS.Native.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>2.0.0</Version>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
<Version>3.0.0</Version>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<FileVersion>3.0.0.0</FileVersion>
<Copyright>Copyright 2022 Team CharLS</Copyright>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down Expand Up @@ -39,7 +39,7 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<_CertificateThumbprint>$(CertificateThumbprint)</_CertificateThumbprint>
<_CertificateThumbprint Condition="'$(_CertificateThumbprint)' == ''">ec5c63c27f439b88457aae74893074733e5d35c0</_CertificateThumbprint>
<_CertificateThumbprint Condition="'$(_CertificateThumbprint)' == ''">9feab4ced15f46daab7bec04a1e811ee0b948034</_CertificateThumbprint>
<_TimestampUrl>$(TimestampUrl)</_TimestampUrl>
<_TimestampUrl Condition="'$(_TimestampUrl)' == ''">http://time.certum.pl/</_TimestampUrl>
</PropertyGroup>
Expand Down Expand Up @@ -99,17 +99,20 @@

<Target Name="SignWindowsDlls" BeforeTargets="GenerateNuspec" Condition="'$(MSBuildRuntimeType)'=='Full'">
<!-- Use TargetFrameworkVersion=v4.5 to sign with SHA256 -->
<Message Text="Signing CharLS.Native.dll" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)\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" />

<Message Text="Signing CharLS.Native.dll (.NET 7.0)" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)net7.0\CharLS.Native.dll" TargetFrameworkVersion="v4.5" />

<Message Text="Signing charls-2-x64.dll" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)\charls-2-x64.dll" TargetFrameworkVersion="v4.5" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)charls-2-x64.dll" TargetFrameworkVersion="v4.5" />

<Message Text="Signing charls-2-x86.dll" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)\charls-2-x86.dll" TargetFrameworkVersion="v4.5" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)charls-2-x86.dll" TargetFrameworkVersion="v4.5" />

<Message Text="Signing charls-2-arm64.dll" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)\charls-2-arm64.dll" TargetFrameworkVersion="v4.5" />
<SignFile CertificateThumbprint="$(_CertificateThumbprint)" TimestampUrl="$(_TimestampUrl)" SigningTarget="$(OutputPath)charls-2-arm64.dll" TargetFrameworkVersion="v4.5" />
</Target>

<Target Name="SignPackage" AfterTargets="Pack" Condition="'$(MSBuildRuntimeType)'=='Full'">
Expand Down
6 changes: 3 additions & 3 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ JPEG-LS (ISO-14495-1) is a lossless/near-lossless compression standard for conti

## Features

* Support for .NET 6.0.
* Support for .NET 7.0 and .NET 6.0.
* Support for the .NET platforms: Windows, Linux and macOS.

## How to use
Expand All @@ -21,8 +21,8 @@ dotnet add package CharLS.Native

### Windows specific installation steps

The NuGet package comes with prebuilt CharLS DLLs for x86 and X64 targets.
The Microsoft Visual C++ Redistributable for Visual Studio 2015-2022 (v14.32 or newer) needs to be installed on the target system.
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.

### Linux specific installation steps

Expand Down
6 changes: 3 additions & 3 deletions src/nuget-release-notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2.0.0
- Dropped support for .NET 5.0 (out of support)
- Latest version of CharLS Windows DLLs v2.2.4 (c6af80b).
3.0.0
- Added support for .NET 7.0
- Latest version of CharLS Windows DLLs v2.4.0 (c781c3).

0 comments on commit bfbe9aa

Please sign in to comment.