Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the main package #123

Merged
merged 8 commits into from
May 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
PACKAGE_VERSION_BASE: 1.8.21.1
PACKAGE_VERSION_BASE: 1.8.21.2
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
PACKAGE_VERSION_BASE: 1.8.21.1
PACKAGE_VERSION_BASE: 1.8.21.2
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
PACKAGE_VERSION_BASE: 1.8.21.1
PACKAGE_VERSION_BASE: 1.8.21.2
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
PACKAGE_VERSION_BASE: 1.8.21.1
PACKAGE_VERSION_BASE: 1.8.21.2
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
PACKAGE_VERSION_BASE: 1.8.21.1
PACKAGE_VERSION_BASE: 1.8.21.2
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_NOLOGO: 1
NUGET_PACKAGES: ${{ github.workspace }}/.github/nuget-packages
PACKAGE_VERSION_BASE: 1.8.21.1
PACKAGE_VERSION_BASE: 1.8.21.2
steps:
- uses: actions/checkout@v4
- name: 'Download artifact: ubuntu-20.04.x86-64'
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.8.21.1] - 2024-05-26
## [1.8.21.2] - 2024-05-27
### Fixed
- The main package **tdlib.native** now depends on the following platform packages:
- **tdlib.native.linux-x64** (Ubuntu 22.04),
- **tdlib.native.osx-arm64** (macOS AArch64),
- **tdlib.native.osx-x64** (macOS x86-64),
- **tdlib.native.win-x64** (Windows x86-64).

## [1.8.21.1] - 2024-05-26 [YANKED]
**Note** that this version has been unlisted from nuget.org because the main package **tdlib.native** was prepared incorrectly: its dependencies on the platform packages weren't set.

### Changed
- **(Breaking change!)** The main package is now built on Ubuntu 22.04 and requires OpenSSL v3. The package for Ubuntu 20.04 (the previous default) is now available separately as `tdlib.native.ubuntu-20.04-x64`.

Expand Down Expand Up @@ -85,4 +95,5 @@ Initial release supporting TDLib v1.2.0.
[1.8.12]: https://github.com/ForNeVeR/tdlib.native/compare/v1.8.9...v1.8.12
[1.8.21]: https://github.com/ForNeVeR/tdlib.native/compare/v1.8.12...v1.8.21
[1.8.21.1]: https://github.com/ForNeVeR/tdlib.native/compare/v1.8.21...v1.8.21.1
[Unreleased]: https://github.com/ForNeVeR/tdlib.native/compare/v1.8.21.1...HEAD
[1.8.21.2]: https://github.com/ForNeVeR/tdlib.native/compare/v1.8.21.1...v1.8.21.2
[Unreleased]: https://github.com/ForNeVeR/tdlib.native/compare/v1.8.21.2...HEAD
2 changes: 1 addition & 1 deletion MAINTAINERSHIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Publish a New Version
---------------------

1. Choose a new version. To avoid confusion, all the packages should follow the versioning of the upstream Telegram library, and should have the same version among them. Increment the fourth version number is a re-packaging of the same TDLib is performed.
2. Update the Git submodule containing the TDLib sources.
2. Update the Git submodule containing the TDLib sources, if this is a release with the new TDLib version.
3. Optionally, also update the submodule containing the tdsharp sources.
4. Prepare a corresponding entry in the `CHANGELOG.md`.
5. Update the license, if required.
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Getting Started

| Platform | Package |
|-----------------------------|--------------------------------------------------------------------------------------|
| Linux x86-64 (Ubuntu 20.04) | [![NuGet][badge.tdlib.native.linux-x64]][nuget.tdlib.native.linux-x64] |
| Linux x86-64 (Ubuntu 22.04) | [![NuGet][badge.tdlib.native.ubuntu-20.04-x64]][nuget.tdlib.native.ubuntu-20.04-x64] |
| macOS x86-64 | [![NuGet][badge.tdlib.native.osx-x64]][nuget.tdlib.native.osx-x64] |
| macOS AArch64 | [![NuGet][badge.tdlib.native.osx-arm64]][nuget.tdlib.native.osx-arm64] |
| Linux x86-64 (Ubuntu 20.04) | [![NuGet][badge.tdlib.native.ubuntu-20.04-x64]][nuget.tdlib.native.ubuntu-20.04-x64] |
| Linux x86-64 (Ubuntu 22.04) | [![NuGet][badge.tdlib.native.linux-x64]][nuget.tdlib.native.linux-x64] |
| Windows x86-64 | [![NuGet][badge.tdlib.native.win-x64]][nuget.tdlib.native.win-x64] |
| macOS AArch64 | [![NuGet][badge.tdlib.native.osx-arm64]][nuget.tdlib.native.osx-arm64] |
| macOS x86-64 | [![NuGet][badge.tdlib.native.osx-x64]][nuget.tdlib.native.osx-x64] |
| **All** | [![NuGet][badge.tdlib.native]][nuget.tdlib.native] |

**tdlib.native** package depends on latest versions of each other platform (i.e. all except the obsolete **Ubuntu 20.04**), so the resulting application will work on any supported platform.
Expand Down Expand Up @@ -57,7 +57,7 @@ Documentation
[badge.tdlib.native.ubuntu-20.04-x64]: https://img.shields.io/nuget/v/tdlib.native.ubuntu-20.04-x64?label=tdlib.native.ubuntu-20.04-x64
[badge.tdlib.native.osx-arm64]: https://img.shields.io/nuget/v/tdlib.native.osx-arm64?label=tdlib.native.osx-arm64
[badge.tdlib.native.osx-x64]: https://img.shields.io/nuget/v/tdlib.native.osx-x64?label=tdlib.native.osx-x64
[badge.tdlib.native.win-x64]: https://img.shields.io/nuget/v/tdlib.native.windows-x64?label=tdlib.native.win-x64
[badge.tdlib.native.win-x64]: https://img.shields.io/nuget/v/tdlib.native.win-x64?label=tdlib.native.win-x64
[badge.tdlib.native]: https://img.shields.io/nuget/v/tdlib.native?label=tdlib.native
[cpp.redist]: https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-160
[docs.changelog]: ./CHANGELOG.md
Expand Down
2 changes: 1 addition & 1 deletion github-actions.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ let testEnv =
"DOTNET_NOLOGO", "1"
"DOTNET_CLI_TELEMETRY_OPTOUT", "1"
"NUGET_PACKAGES", "${{ github.workspace }}/.github/nuget-packages"
"PACKAGE_VERSION_BASE", "1.8.21.1"
"PACKAGE_VERSION_BASE", "1.8.21.2"
] |> Seq.map(fun (k, v) -> setEnv k v)

type Workflows =
Expand Down
27 changes: 27 additions & 0 deletions tdlib.native.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>tdlib.native</id>
<version>$version$</version>
<authors>tdlib.native</authors>
<license type="expression">$licenseExpression$</license>
<licenseUrl>https://licenses.nuget.org/$licenseExpression$</licenseUrl>
<readme>README.md</readme>
<projectUrl>$projectUrl$</projectUrl>
<description>$description$</description>
<releaseNotes>$releaseNotes$</releaseNotes>
<copyright>$copyright$</copyright>
<tags>$tags$</tags>
<dependencies>
<dependency id="tdlib.native.linux-x64" version="$version$" />
<dependency id="tdlib.native.osx-arm64" version="$version$" />
<dependency id="tdlib.native.osx-x64" version="$version$" />
<dependency id="tdlib.native.win-x64" version="$version$" />
</dependencies>
</metadata>
<files>
<file src="README.md" />
<file src="CHANGELOG.md" />
<file src="LICENSE_1_0.txt" />
</files>
</package>
23 changes: 16 additions & 7 deletions tdlib.native.proj
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@
<PropertyGroup>
<PackageId>tdlib.native</PackageId>
<Description>
NuGet packaging for tdlib: Telegram client library. Mata-package pulling x64 dependencies for Windows, Ubuntu 20.04 and macOS, and AArch64 dependency for macOS.
NuGet packaging for tdlib: Telegram client library. Meta-package pulling x64 dependencies for Windows, Ubuntu 22.04 and macOS, and AArch64 dependency for macOS.
</Description>
<NuspecFile>tdlib.native.nuspec</NuspecFile>
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetPackageProperties</GenerateNuspecDependsOn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="tdlib.native.linux-x64" Version="$(Version)" />
<PackageReference Include="tdlib.native.osx-arm64" Version="$(Version)" />
<PackageReference Include="tdlib.native.osx-x64" Version="$(Version)" />
<PackageReference Include="tdlib.native.win-x64" Version="$(Version)" />
</ItemGroup>
<Target Name="SetPackageProperties" DependsOnTargets="SetPackageReleaseNotes" BeforeTargets="Pack">
<CreateProperty Value="
version=$(Version);
licenseExpression=$(PackageLicenseExpression);
projectUrl=$(PackageProjectUrl);
description=$(Description);
releaseNotes=$(PackageReleaseNotes);
copyright=$(Copyright);
tags=$(PackageTags);
">
<Output TaskParameter="Value" PropertyName="NuspecProperties" />
</CreateProperty>
</Target>
</Project>
Loading