Skip to content

Commit 7bb6b20

Browse files
mark-silmark-sil
authored
Update framework to net462 and libPalaso to version 17 (#345)
Note: Needed to move to net462 because libPalaso is net462. Without moving to net462 these 3 tests were failing: InitIcuDataDir_CustomIcuVersion() InitIcuDataDir_FallbackDefaultIcuVersion() InitIcuDataDir_NoIcuLibrary()
1 parent 67d2479 commit 7bb6b20

File tree

19 files changed

+48
-32
lines changed

19 files changed

+48
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
3535
### Changed
3636

3737
- [SIL.LCModel] `FileUtils.IsFileUriOrPath` checks for the presence of "file:" rather than the absence of known non-file URI schemes
38+
- Changed to target .Net Framework 4.6.2 instead of 4.6.1
39+
- Update libPalaso dependency from version 14.2.0-* to 17.0.0-*
40+
- Update Newtonsoft.Json dependency from version 13.0.2 to 13.0.3
41+
- Update icu.net dependency from version 3.0.0-* to 3.0.1
3842

3943
### Deprecated
4044

4145
- [SIL.LCModel] `SyncMsg` seems to be a relic of TE, which was discontinued years ago
4246
- [SIL.LCModel.Core] `new CaseFunctions(string)` in favor of the new `new CaseFunctions(CoreWritingSystemDefinition)`
4347

48+
### Removed
49+
50+
- Support for .Net Framework 4.6.1
51+
4452
## [10.1.0] - 2021-10-01
4553

4654
### Changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Open the solution in Rider and run them all there. Right-click the solution and
6767
- then run (adjust the version number `3.11.1` accordingly):
6868

6969
```bash
70-
(. environ && cd artifacts/Debug/net461/ && mono --debug ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe *Tests.dll )
70+
(. environ && cd artifacts/Debug/net462/ && mono --debug ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe *Tests.dll )
7171
```
7272

7373
### Windows
@@ -85,7 +85,7 @@ To run the tests for a single test dll:
8585

8686
**Note:** Running the tests after building the solution from inside VS resulted in a `BadImageFormatException`.
8787
Running the tests after building from the cmd prompt worked.
88-
3. Go to the `liblcm\artifacts\Debug\net461` directory.
88+
3. Go to the `liblcm\artifacts\Debug\net462` directory.
8989
4. Execute: `..\..\..\packages\NUnit.ConsoleRunner.3.9.0\tools\nunit3-console.exe SIL.LCModel.Tests.dll`
9090

9191
(Or specify one of the other `SIL.LCModel*Tests.dll`)

‎src/CSTools/Tools/Tools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
55
<RootNamespace>SIL.LCModel.Tools</RootNamespace>
66
<AssemblyName>SIL.LCModel.Tools</AssemblyName>
77
<Description>SIL LCModel Lexer/Parser Tools</Description>

‎src/CSTools/lg/lg.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
55
<RootNamespace>SIL.LCModel.Tools</RootNamespace>
66
<Description>Lexer Generator</Description>
77
<PackageOutputPath>../../../artifacts</PackageOutputPath>

‎src/CSTools/pg/pg.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
55
<RootNamespace>SIL.LCModel.Tools</RootNamespace>
66
<Description>Parser Generator</Description>
77
<PackageOutputPath>../../../artifacts</PackageOutputPath>

‎src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>SIL.LCModel.Build.Tasks</RootNamespace>
5-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
66
<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.
77
SIL.LCModel.Build.Tasks provides msbuild tasks for generating C# classes for the FieldWorks model: IdlImp and LcmGenerate.</Description>
88
<BuildOutputTargetFolder>tools/$(TargetFramework)</BuildOutputTargetFolder>
@@ -19,9 +19,9 @@ SIL.LCModel.Build.Tasks provides msbuild tasks for generating C# classes for the
1919
</ItemGroup>
2020

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

2727
<Target Name="CollectRuntimeOutputs" BeforeTargets="_GetPackageFiles">

‎src/SIL.LCModel.Build.Tasks/SIL.LCModel.Build.Tasks.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<SilLCModelBuildTasksPath Condition="$(SilLCModelBuildTasksPath) == '' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../tools/net461/</SilLCModelBuildTasksPath>
3+
<SilLCModelBuildTasksPath Condition="$(SilLCModelBuildTasksPath) == '' And '$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)../tools/net462/</SilLCModelBuildTasksPath>
44
</PropertyGroup>
55

66
<UsingTask TaskName="IdlImp" AssemblyFile="$(SilLCModelBuildTasksPath)SIL.LCModel.Build.Tasks.dll" />

‎src/SIL.LCModel.Core/Phonology/PhonLex.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
..\..\..\artifacts\Debug\net461\lg phonenv.lexer
1+
..\..\..\artifacts\Debug\net462\lg phonenv.lexer

‎src/SIL.LCModel.Core/Phonology/PhonPrs.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rem ..\..\..\artifacts\Debug\pg -D phonenv.parser
2-
..\..\..\artifacts\Debug\net461\pg phonenv.parser
2+
..\..\..\artifacts\Debug\net462\pg phonenv.parser
33
if exist hab.tmp del hab.tmp > nul
44
ren phonenv.parser.cs hab.tmp
55
gawk -f phonprs.awk < hab.tmp > hab.cs

‎src/SIL.LCModel.Core/SIL.LCModel.Core.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

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

1111
<ItemGroup>
1212
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10" PrivateAssets="All" />
13-
<PackageReference Include="icu.net" Version="3.0.0-*" />
13+
<PackageReference Include="icu.net" Version="3.0.1" />
1414
<PackageReference Include="Icu4c.Win.Fw.Bin" Version="70.1.152" IncludeAssets="build" />
1515
<PackageReference Include="Icu4c.Win.Fw.Lib" Version="70.1.152" IncludeAssets="build" PrivateAssets="runtime" />
1616
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.4" />
1717
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
19-
<PackageReference Include="SIL.Lexicon" Version="14.2.0-*" />
19+
<PackageReference Include="SIL.Lexicon" Version="17.0.0-*" />
2020
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
21-
<PackageReference Include="SIL.WritingSystems" Version="14.2.0-*" />
21+
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
2222
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
2323
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
2424
<PackageReference Include="vswhere" Version="2.8.4" PrivateAssets="all" />

0 commit comments

Comments
 (0)