Skip to content
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`)
Expand Down
2 changes: 1 addition & 1 deletion src/CSTools/Tools/Tools.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Tools</RootNamespace>
<AssemblyName>SIL.LCModel.Tools</AssemblyName>
<Description>SIL LCModel Lexer/Parser Tools</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/CSTools/lg/lg.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Tools</RootNamespace>
<Description>Lexer Generator</Description>
<PackageOutputPath>../../../artifacts</PackageOutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/CSTools/pg/pg.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Tools</RootNamespace>
<Description>Parser Generator</Description>
<PackageOutputPath>../../../artifacts</PackageOutputPath>
Expand Down
8 changes: 4 additions & 4 deletions src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>SIL.LCModel.Build.Tasks</RootNamespace>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<Description>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.</Description>
<BuildOutputTargetFolder>tools/$(TargetFramework)</BuildOutputTargetFolder>
Expand All @@ -19,9 +19,9 @@ SIL.LCModel.Build.Tasks provides msbuild tasks for generating C# classes for the
</ItemGroup>

<Target Name="CopyTargetsAndProps" AfterTargets="Build">
<MakeDir Directories="$(OutputPath)/lib/net461" />
<MakeDir Directories="$(OutputPath)/lib/net462" />
<!-- Create empty files -->
<WriteLinesToFile File="$(OutputPath)/lib/net461/_._" />
<WriteLinesToFile File="$(OutputPath)/lib/net462/_._" />
</Target>

<Target Name="CollectRuntimeOutputs" BeforeTargets="_GetPackageFiles">
Expand Down
2 changes: 1 addition & 1 deletion src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SilLCModelBuildTasksPath Condition="$(SilLCModelBuildTasksPath) == '' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../tools/net461/</SilLCModelBuildTasksPath>
<SilLCModelBuildTasksPath Condition="$(SilLCModelBuildTasksPath) == '' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../tools/net462/</SilLCModelBuildTasksPath>
</PropertyGroup>

<UsingTask TaskName="IdlImp" AssemblyFile="$(SilLCModelBuildTasksPath)SIL.LCModel.Build.Tasks.dll" />
Expand Down
2 changes: 1 addition & 1 deletion src/SIL.LCModel.Core/Phonology/PhonLex.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
..\..\..\artifacts\Debug\net461\lg phonenv.lexer
..\..\..\artifacts\Debug\net462\lg phonenv.lexer
2 changes: 1 addition & 1 deletion src/SIL.LCModel.Core/Phonology/PhonPrs.bat
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/SIL.LCModel.Core/SIL.LCModel.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462;net8.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Core</RootNamespace>
<Description>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.</Description>
Expand All @@ -10,15 +10,15 @@ SIL.LCModel.Core provides a base library with core functionality.</Description>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10" PrivateAssets="All" />
<PackageReference Include="icu.net" Version="3.0.0-*" />
<PackageReference Include="icu.net" Version="3.0.1" />
<PackageReference Include="Icu4c.Win.Fw.Bin" Version="70.1.152" IncludeAssets="build" />
<PackageReference Include="Icu4c.Win.Fw.Lib" Version="70.1.152" IncludeAssets="build" PrivateAssets="runtime" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Lexicon" Version="14.2.0-*" />
<PackageReference Include="SIL.Lexicon" Version="17.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.WritingSystems" Version="14.2.0-*" />
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="vswhere" Version="2.8.4" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/SIL.LCModel.FixData/SIL.LCModel.FixData.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.FixData</RootNamespace>
<Description>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.</Description>
Expand Down
6 changes: 3 additions & 3 deletions src/SIL.LCModel.Utils/SIL.LCModel.Utils.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Utils</RootNamespace>
<Description>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.</Description>
Expand All @@ -10,10 +10,10 @@ SIL.LCModel.Utils provides utility classes.</Description>
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Core" Version="14.2.0-*" />
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.0" />
<PackageReference Include="System.Management" Version="6.0.0" />
Expand Down
12 changes: 8 additions & 4 deletions src/SIL.LCModel/SIL.LCModel.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RootNamespace>SIL.LCModel</RootNamespace>
<Description>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.</Description>
Expand All @@ -22,9 +22,9 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="protobuf-net" Version="2.4.6" />
<PackageReference Include="SharpZipLib" Version="1.4.0" />
<PackageReference Include="SIL.Lexicon" Version="14.2.0-*" />
<PackageReference Include="SIL.Lexicon" Version="17.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.WritingSystems" Version="14.2.0-*" />
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
<PackageReference Include="structuremap.patched" Version="4.7.3" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
<PackageReference Include="Nullable" Version="1.3.1">
Expand Down Expand Up @@ -107,6 +107,10 @@
<Clean Include="@(GeneratedFiles)" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Web" />
</ItemGroup>

<Target Name="GenerateModel" Inputs="MasterLCModel.xml" Outputs="@(GeneratedFiles)" BeforeTargets="BeforeCompile">
<!-- Call the LcmGenerate task from SIL.LCModel.Build.Tasks in a separate msbuild process,
so it doesn't lock the SIL.LCModel.Build.Tasks.dll in VS. -->
Expand Down
4 changes: 2 additions & 2 deletions tests/SIL.LCModel.Core.Tests/SIL.LCModel.Core.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Core</RootNamespace>
<Description>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.</Description>
Expand All @@ -17,7 +17,7 @@ This package provides unit tests for SIL.LCModel.Core.</Description>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.TestUtilities" Version="14.2.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.FixData</RootNamespace>
<IsPackable>false</IsPackable>
<Nullable>disable</Nullable>
Expand Down
6 changes: 5 additions & 1 deletion tests/SIL.LCModel.Tests/SIL.LCModel.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>SIL.LCModel</RootNamespace>
<Description>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.</Description>
Expand All @@ -24,6 +24,10 @@ This package provides unit tests for SIL.LCModel.</Description>
<ProjectReference Include="..\SIL.LCModel.Core.Tests\SIL.LCModel.Core.Tests.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Web" />
</ItemGroup>

<Target Name="CollectRuntimeOutputs" BeforeTargets="_GetPackageFiles">
<ItemGroup>
<None Include="$(OutputPath)\**\$(PackageId).dll.config" Pack="true" PackagePath="lib" />
Expand Down
2 changes: 1 addition & 1 deletion tests/SIL.LCModel.Tests/TestDirectoryFinder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static string RootDirectory
{
// we'll assume the executing assembly is <root>/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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>SIL.LCModel.Utils</RootNamespace>
<Description>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</Description>
Expand Down
2 changes: 1 addition & 1 deletion tests/TestHelper/TestHelper.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net461;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>Icu.Tests</RootNamespace>
<Description>TestHelper</Description>
<IsPackable>false</IsPackable>
Expand Down
Loading