From 10f2b7867d9cdf460fb8f23446287ff1ccf219e7 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Thu, 4 Aug 2022 19:24:15 +0200 Subject: [PATCH] Fix logging in `MakeWixForDirTree` task Fixes #55. --- CHANGELOG.md | 19 +++++++++++++++++++ .../MakeWixForDirTree/MakeWixForDirTree.cs | 4 ++-- SIL.BuildTasks/SIL.BuildTasks.csproj | 4 ++-- SIL.ReleaseTasks/SIL.ReleaseTasks.csproj | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccf5b5bd..8d6e9f20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,10 +19,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - [SIL.ReleaseTasks] Added filter option for project-specific entries (#48) +- [SIL.BuildTasks] Additionally build for .NetStandard 2.0 ### Fixed - [SIL.ReleaseTasks] Exclude links from CHANGELOG.md file when extracting release notes (#46) +- [SIL.BuildTasks] Fixed logging in `MakeWixForDirTree` task (#55) ## [2.5.0] - 2021-02-24 @@ -150,3 +152,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - First release as NuGet package + +[Unreleased]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.5.0...master + +[2.5.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.4.0...v2.5.0 +[2.4.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.3.0...v2.4.0 +[2.3.4]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.3.3...v2.3.4 +[2.3.3]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.3.2...v2.3.3 +[2.3.2]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.3.1...v2.3.2 +[2.3.1]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.3.0...v2.3.1 +[2.3.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.2.0...v2.3.0 +[2.2.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.1.0...v2.2.0 +[2.1.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.0.1...v2.1.0 +[2.0.1]: https://github.com/sillsdev/SIL.BuildTasks/compare/v2.0.0...v2.0.1 +[2.0.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/v1.0.2...v2.0.0 +[1.0.2]: https://github.com/sillsdev/SIL.BuildTasks/compare/v1.0.1...v1.0.2 +[1.0.1]: https://github.com/sillsdev/SIL.BuildTasks/compare/v1.0.0...v1.0.1 +[1.0.0]: https://github.com/sillsdev/SIL.BuildTasks/compare/...v1.0.0 diff --git a/SIL.BuildTasks/MakeWixForDirTree/MakeWixForDirTree.cs b/SIL.BuildTasks/MakeWixForDirTree/MakeWixForDirTree.cs index 63b12b38..a8305c86 100644 --- a/SIL.BuildTasks/MakeWixForDirTree/MakeWixForDirTree.cs +++ b/SIL.BuildTasks/MakeWixForDirTree/MakeWixForDirTree.cs @@ -433,7 +433,7 @@ public void LogMessage(MessageImportance importance, string message) { try { - Log.LogMessage(importance.ToString(), message); + Log.LogMessage(importance, message); } catch (InvalidOperationException) { @@ -445,7 +445,7 @@ private void LogMessage(MessageImportance importance, string message, params obj { try { - Log.LogMessage(importance.ToString(), message, args); + Log.LogMessage(importance, message, args); } catch (InvalidOperationException) { diff --git a/SIL.BuildTasks/SIL.BuildTasks.csproj b/SIL.BuildTasks/SIL.BuildTasks.csproj index 1d5772f9..7689b91f 100644 --- a/SIL.BuildTasks/SIL.BuildTasks.csproj +++ b/SIL.BuildTasks/SIL.BuildTasks.csproj @@ -1,13 +1,13 @@  - net461 + net461;netstandard2.0 SIL.BuildTasks Debug;Release SIL.BuildTasks defines several msbuild tasks used in building our other projects. SIL.BuildTasks SIL Palaso Library - Copyright © 2018-2021 SIL International + Copyright © 2018-2022 SIL International prompt 4 SIL International diff --git a/SIL.ReleaseTasks/SIL.ReleaseTasks.csproj b/SIL.ReleaseTasks/SIL.ReleaseTasks.csproj index 5b66bdea..99f25b1f 100644 --- a/SIL.ReleaseTasks/SIL.ReleaseTasks.csproj +++ b/SIL.ReleaseTasks/SIL.ReleaseTasks.csproj @@ -7,7 +7,7 @@ SIL.ReleaseTasks SIL Palaso Library - Copyright © 2018-2021 SIL International + Copyright © 2018-2022 SIL International prompt 4 SIL International