diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fd38515..a9445f32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,12 +35,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Changed - [SIL.LCModel] `FileUtils.IsFileUriOrPath` checks for the presence of "file:" rather than the absence of known non-file URI schemes +- Changed to target .Net Framework 4.6.2 instead of 4.6.1 +- Update libPalaso dependency from version 14.2.0-* to 17.0.0-* +- Update Newtonsoft.Json dependency from version 13.0.2 to 13.0.3 +- Update icu.net dependency from version 3.0.0-* to 3.0.1 ### Deprecated - [SIL.LCModel] `SyncMsg` seems to be a relic of TE, which was discontinued years ago - [SIL.LCModel.Core] `new CaseFunctions(string)` in favor of the new `new CaseFunctions(CoreWritingSystemDefinition)` +### Removed + +- Support for .Net Framework 4.6.1 + ## [10.1.0] - 2021-10-01 ### Changed diff --git a/README.md b/README.md index 5a472a9d..6419b977 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Open the solution in Rider and run them all there. Right-click the solution and - then run (adjust the version number `3.11.1` accordingly): ```bash - (. environ && cd artifacts/Debug/net461/ && mono --debug ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe *Tests.dll ) + (. environ && cd artifacts/Debug/net462/ && mono --debug ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe *Tests.dll ) ``` ### Windows @@ -85,7 +85,7 @@ To run the tests for a single test dll: **Note:** Running the tests after building the solution from inside VS resulted in a `BadImageFormatException`. Running the tests after building from the cmd prompt worked. -3. Go to the `liblcm\artifacts\Debug\net461` directory. +3. Go to the `liblcm\artifacts\Debug\net462` directory. 4. Execute: `..\..\..\packages\NUnit.ConsoleRunner.3.9.0\tools\nunit3-console.exe SIL.LCModel.Tests.dll` (Or specify one of the other `SIL.LCModel*Tests.dll`) diff --git a/src/CSTools/Tools/Tools.csproj b/src/CSTools/Tools/Tools.csproj index ec3cc4ed..b6aa3758 100644 --- a/src/CSTools/Tools/Tools.csproj +++ b/src/CSTools/Tools/Tools.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0 + net462;netstandard2.0 SIL.LCModel.Tools SIL.LCModel.Tools SIL LCModel Lexer/Parser Tools diff --git a/src/CSTools/lg/lg.csproj b/src/CSTools/lg/lg.csproj index f3a07832..9060bfb0 100644 --- a/src/CSTools/lg/lg.csproj +++ b/src/CSTools/lg/lg.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0 + net462;netstandard2.0 SIL.LCModel.Tools Lexer Generator ../../../artifacts diff --git a/src/CSTools/pg/pg.csproj b/src/CSTools/pg/pg.csproj index 40b97b35..fea41f74 100644 --- a/src/CSTools/pg/pg.csproj +++ b/src/CSTools/pg/pg.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0 + net462;netstandard2.0 SIL.LCModel.Tools Parser Generator ../../../artifacts diff --git a/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.csproj b/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.csproj index b18aec90..f4cab121 100644 --- a/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.csproj +++ b/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.csproj @@ -1,8 +1,8 @@ - + SIL.LCModel.Build.Tasks - net461;netstandard2.0 + net462;netstandard2.0 The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. SIL.LCModel.Build.Tasks provides msbuild tasks for generating C# classes for the FieldWorks model: IdlImp and LcmGenerate. tools/$(TargetFramework) @@ -19,9 +19,9 @@ SIL.LCModel.Build.Tasks provides msbuild tasks for generating C# classes for the - + - + diff --git a/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.props b/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.props index 8c39f4a9..a417b142 100644 --- a/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.props +++ b/src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.props @@ -1,6 +1,6 @@ - $(MSBuildThisFileDirectory)../tools/net461/ + $(MSBuildThisFileDirectory)../tools/net462/ diff --git a/src/SIL.LCModel.Core/Phonology/PhonLex.bat b/src/SIL.LCModel.Core/Phonology/PhonLex.bat index fe6070c0..17318bdd 100644 --- a/src/SIL.LCModel.Core/Phonology/PhonLex.bat +++ b/src/SIL.LCModel.Core/Phonology/PhonLex.bat @@ -1 +1 @@ -..\..\..\artifacts\Debug\net461\lg phonenv.lexer +..\..\..\artifacts\Debug\net462\lg phonenv.lexer diff --git a/src/SIL.LCModel.Core/Phonology/PhonPrs.bat b/src/SIL.LCModel.Core/Phonology/PhonPrs.bat index 83513f7e..8199785a 100644 --- a/src/SIL.LCModel.Core/Phonology/PhonPrs.bat +++ b/src/SIL.LCModel.Core/Phonology/PhonPrs.bat @@ -1,5 +1,5 @@ rem ..\..\..\artifacts\Debug\pg -D phonenv.parser -..\..\..\artifacts\Debug\net461\pg phonenv.parser +..\..\..\artifacts\Debug\net462\pg phonenv.parser if exist hab.tmp del hab.tmp > nul ren phonenv.parser.cs hab.tmp gawk -f phonprs.awk < hab.tmp > hab.cs diff --git a/src/SIL.LCModel.Core/SIL.LCModel.Core.csproj b/src/SIL.LCModel.Core/SIL.LCModel.Core.csproj index 063448c4..5043a6fd 100644 --- a/src/SIL.LCModel.Core/SIL.LCModel.Core.csproj +++ b/src/SIL.LCModel.Core/SIL.LCModel.Core.csproj @@ -1,7 +1,7 @@ - + - netstandard2.0;net461;net8.0 + netstandard2.0;net462;net8.0 SIL.LCModel.Core The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. SIL.LCModel.Core provides a base library with core functionality. @@ -10,15 +10,15 @@ SIL.LCModel.Core provides a base library with core functionality. - + - + - + diff --git a/src/SIL.LCModel.FixData/SIL.LCModel.FixData.csproj b/src/SIL.LCModel.FixData/SIL.LCModel.FixData.csproj index 2e04e080..4acb6b16 100644 --- a/src/SIL.LCModel.FixData/SIL.LCModel.FixData.csproj +++ b/src/SIL.LCModel.FixData/SIL.LCModel.FixData.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0 + net462;netstandard2.0 SIL.LCModel.FixData The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. SIL.LCModel.FixData provides functionality to fix errors in a FieldWorks data XML file. diff --git a/src/SIL.LCModel.Utils/SIL.LCModel.Utils.csproj b/src/SIL.LCModel.Utils/SIL.LCModel.Utils.csproj index 59686716..3e9ae38e 100644 --- a/src/SIL.LCModel.Utils/SIL.LCModel.Utils.csproj +++ b/src/SIL.LCModel.Utils/SIL.LCModel.Utils.csproj @@ -1,7 +1,7 @@ - net461;netstandard2.0 + net462;netstandard2.0 SIL.LCModel.Utils The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. SIL.LCModel.Utils provides utility classes. @@ -10,10 +10,10 @@ SIL.LCModel.Utils provides utility classes. - + - + diff --git a/src/SIL.LCModel/SIL.LCModel.csproj b/src/SIL.LCModel/SIL.LCModel.csproj index 931f0a61..a1a1487f 100644 --- a/src/SIL.LCModel/SIL.LCModel.csproj +++ b/src/SIL.LCModel/SIL.LCModel.csproj @@ -1,7 +1,7 @@ - + - net461;netstandard2.0 + net462;netstandard2.0 SIL.LCModel The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. SIL.LCModel is the main library. @@ -22,9 +22,9 @@ - + - + @@ -107,6 +107,10 @@ + + + + diff --git a/tests/SIL.LCModel.Core.Tests/SIL.LCModel.Core.Tests.csproj b/tests/SIL.LCModel.Core.Tests/SIL.LCModel.Core.Tests.csproj index 28e6a0d7..4e801483 100644 --- a/tests/SIL.LCModel.Core.Tests/SIL.LCModel.Core.Tests.csproj +++ b/tests/SIL.LCModel.Core.Tests/SIL.LCModel.Core.Tests.csproj @@ -1,7 +1,7 @@ - net461;net8.0 + net462;net8.0 SIL.LCModel.Core The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. This package provides unit tests for SIL.LCModel.Core. @@ -17,7 +17,7 @@ This package provides unit tests for SIL.LCModel.Core. - + diff --git a/tests/SIL.LCModel.FixData.Tests/SIL.LCModel.FixData.Tests.csproj b/tests/SIL.LCModel.FixData.Tests/SIL.LCModel.FixData.Tests.csproj index 4b490cf7..7f3d357d 100644 --- a/tests/SIL.LCModel.FixData.Tests/SIL.LCModel.FixData.Tests.csproj +++ b/tests/SIL.LCModel.FixData.Tests/SIL.LCModel.FixData.Tests.csproj @@ -1,7 +1,7 @@ - net461;net8.0 + net462;net8.0 SIL.LCModel.FixData false disable diff --git a/tests/SIL.LCModel.Tests/SIL.LCModel.Tests.csproj b/tests/SIL.LCModel.Tests/SIL.LCModel.Tests.csproj index db1bfbe1..8c2fdc07 100644 --- a/tests/SIL.LCModel.Tests/SIL.LCModel.Tests.csproj +++ b/tests/SIL.LCModel.Tests/SIL.LCModel.Tests.csproj @@ -1,7 +1,7 @@ - net461;net8.0 + net462;net8.0 SIL.LCModel The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. This package provides unit tests for SIL.LCModel. @@ -24,6 +24,10 @@ This package provides unit tests for SIL.LCModel. + + + + diff --git a/tests/SIL.LCModel.Tests/TestDirectoryFinder.cs b/tests/SIL.LCModel.Tests/TestDirectoryFinder.cs index 574e4bec..888e7692 100644 --- a/tests/SIL.LCModel.Tests/TestDirectoryFinder.cs +++ b/tests/SIL.LCModel.Tests/TestDirectoryFinder.cs @@ -25,7 +25,7 @@ public static string RootDirectory { // we'll assume the executing assembly is /artifacts/Debug/SIL.LCModel.Tests.dll, string dir = CodeDirectory; - dir = Path.GetDirectoryName(dir); // strip the parent directory name (framework: netstandard2.0;net461) + dir = Path.GetDirectoryName(dir); // strip the parent directory name (framework: netstandard2.0;net462) dir = Path.GetDirectoryName(dir); // strip the parent directory name (Debug) dir = Path.GetDirectoryName(dir); // strip the parent directory again (artifacts) return dir; diff --git a/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj b/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj index ae102158..4d49c838 100644 --- a/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj +++ b/tests/SIL.LCModel.Utils.Tests/SIL.LCModel.Utils.Tests.csproj @@ -1,7 +1,7 @@ - net461;net8.0 + net462;net8.0 SIL.LCModel.Utils The liblcm library is the core FieldWorks model for linguistic analyses of languages. Tools in this library provide the ability to store and interact with language and culture data, including anthropological, text corpus, and linguistics data. This package provides unit tests for SIL.LCModel.Utils and test utility classes diff --git a/tests/TestHelper/TestHelper.csproj b/tests/TestHelper/TestHelper.csproj index 9cb56ffc..e035cb11 100644 --- a/tests/TestHelper/TestHelper.csproj +++ b/tests/TestHelper/TestHelper.csproj @@ -1,7 +1,7 @@ - net461;net8.0 + net462;net8.0 Icu.Tests TestHelper false