diff --git a/CHANGELOG.md b/CHANGELOG.md index e32c11c3..55724509 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Use UTF-8 in conflict details view - [SIL.Chorus.LibChorus] Add ChorusStorage (the bundle cache) as an Excluded folder - [SIL.Chorus.LibChorus] Changed HgResumeTransport LastKnownCommonBases to use Json serialization instead of BinaryFormatter -- Update SIL.Chorus.Mercurial dependency to version 6.5.1 which uses Python 3 +- Update SIL.Chorus.Mercurial dependency to version 7.0.1 which uses Python 3 - Update libPalaso dependency from version 15.0.0-* to 18.0.0-* - Update Newtonsoft.Json dependency from version 13.0.2 to 13.0.4 - Update Microsoft.NET.Test.Sdk dependency from version 17.3.1 to 17.14.1 @@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [SIL.Chorus.LibChorus] Fix null-key insertion when XML record identifier attribute is absent in XmlMergeService - [SIL.Chorus.LibChorus] Fix crash in password encryption/decryption on non-Windows platforms and on Windows data-protection failure - [SIL.Chorus.LibChorus] Fix IndexOutOfRangeException parsing ChorusHub query parameters without '=', and preserve values containing '=' +- [SIL.Chorus.ChorusMergeModule] Update list of installed files for Mercurial 7, removing 7 old files and adding 1 new one ## [5.1.0] - 2023-03-07 diff --git a/src/Installer/GeneratedMercurial.wxs b/src/Installer/GeneratedMercurial.wxs index 96f42315..321af7a5 100644 --- a/src/Installer/GeneratedMercurial.wxs +++ b/src/Installer/GeneratedMercurial.wxs @@ -2,18 +2,18 @@ - - - - - + + + + + @@ -50,10 +50,6 @@ - - - - @@ -171,10 +167,6 @@ - - - - @@ -223,10 +215,6 @@ - - - - @@ -235,14 +223,6 @@ - - - - - - - - @@ -275,10 +255,6 @@ - - - - @@ -402,9 +378,9 @@ - + @@ -414,7 +390,6 @@ - @@ -442,7 +417,6 @@ - @@ -455,11 +429,8 @@ - - - @@ -468,7 +439,6 @@ - diff --git a/src/LibChorus/LibChorus.csproj b/src/LibChorus/LibChorus.csproj index eecba058..27ca2908 100644 --- a/src/LibChorus/LibChorus.csproj +++ b/src/LibChorus/LibChorus.csproj @@ -17,7 +17,7 @@ - +