Skip to content

Commit 53fc579

Browse files
committed
Merge branch 'releases/v0.15'
2 parents 60b66fb + 7c8c3cc commit 53fc579

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
tag: ${{github.ref}}
2323
repo_token: ${{secrets.GITHUB_TOKEN}}
2424
file_glob: 'true'
25-
file: nuget/*.nupkg
25+
file: ./*.nupkg
2626

2727
- name: Push to NuGet
28-
run: dotnet nuget push nuget/*.nupkg
28+
run: dotnet nuget push *.nupkg
2929
--api-key ${{secrets.NUGET_API_KEY}}
3030
--source https://api.nuget.org/v3/index.json
3131
--skip-duplicate

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 0.15
4+
5+
* [#77](https://github.com/Tarmil/FSharp.SystemTextJson/issues/77): Fix compile-time error when publishing a trimmed .NET 5 application. Thanks @pchalamet!
6+
37
## 0.14
48

59
* [#71](https://github.com/Tarmil/FSharp.SystemTextJson/issues/71): Allow overriding specific types in `JsonFSharpConverter` with new argument `overrides`. These override even types that have `JsonFSharpConverterAttribute` when `allowOverride = true`.

0 commit comments

Comments
 (0)