Skip to content

Commit

Permalink
Drop net461 support in favor of net462 and drop net6.0
Browse files Browse the repository at this point in the history 
* Update to latest libpalaso and L10nSharp
  • Loading branch information
@jasonleenaylor
jasonleenaylor committed Nov 12, 2024
1 parent 15f8823 commit 7b61f26
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 177 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net461</TargetFrameworks>
<TargetFrameworks>net462</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<Description>End-user collaboration library via 3-way xml merging and hg dvcs under the hood.</Description>
<Company>SIL International</Company>
Expand Down
2 changes: 1 addition & 1 deletion src/Chorus/Chorus.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="12.0.0-*" />
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />
<PackageReference Include="Vulcan.Uczniowie.HelpProvider" Version="1.0.16" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Chorus/ChorusSystem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ public static void SetUpLocalization(string desiredUiLangId,
var versionObj = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
// We don't need to reload strings for every "revision" (that might be every time we build).
var version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build;
LocalizationManager.Create(TranslationMemory.XLiff, desiredUiLangId, "Chorus",
LocalizationManager.Create(desiredUiLangId, "Chorus",
Application.ProductName, version, directoryOfInstalledXlfFiles,
directoryOfUserModifiedXlfFiles,
Icon.FromHandle(Properties.Resources.chorus32x32.GetHicon()), // should call DestroyIcon, but when?
"[email protected]", "Chorus");
"[email protected]", new [] {"Chorus"});
}

[Obsolete("Only one kind of TranslationMemory is supported: XLF; there is no need for the kind parameter.")]
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusHubApp/ChorusHubApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="12.0.0-*" />
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />
<PackageReference Include="Vulcan.Uczniowie.HelpProvider" Version="1.0.16" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ChorusMerge.Tests/ChorusMerge.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="SIL.TestUtilities" Version="12.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusMerge/ChorusMerge.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<AssemblyTitle>ChorusMerge</AssemblyTitle>
<PackageId>SIL.Chorus.ChorusMerge</PackageId>
<OutputType>Exe</OutputType>
<TargetFrameworks>net461;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RepositoryUrl>https://github.com/sillsdev/chorus.git</RepositoryUrl>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="SIL.Core" Version="12.0.0-*" />
<PackageReference Include="SIL.Core" Version="15.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.TestUtilities" Version="12.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-*" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/LibChorus/LibChorus.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<RootNamespace>Chorus</RootNamespace>
<AssemblyTitle>LibChorus</AssemblyTitle>
<PackageId>SIL.Chorus.LibChorus</PackageId>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<RepositoryUrl>https://github.com/sillsdev/chorus.git</RepositoryUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="4.9.4" />
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="icu.net" Version="2.9.0" />
<PackageReference Include="icu.net" Version="3.0.0-*" />
<PackageReference Include="Icu4c.Win.Min" Version="59.1.7" IncludeAssets="build" />
<PackageReference Include="L10NSharp" Version="6.0.0-*" />
<PackageReference Include="L10NSharp" Version="8.0.0-*" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NDesk.DBus" Version="0.15.0" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.*" IncludeAssets="build" />
<PackageReference Include="SIL.Core" Version="12.0.0-*" />
<PackageReference Include="SIL.Lift" Version="12.0.0-*" />
<PackageReference Include="SIL.Core" Version="15.0.0-*" />
<PackageReference Include="SIL.Lift" Version="15.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions src/LibChorusTests/LibChorus.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>LibChorus.Tests</RootNamespace>
<AssemblyTitle>LibChorus.Tests</AssemblyTitle>
<Description>Unit tests for LibChorus.dll</Description>
<TargetFrameworks>net461;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -17,9 +17,9 @@
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
<PackageReference Include="SIL.Core" Version="12.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="12.0.0-*" />
<PackageReference Include="SIL.WritingSystems.Tests" Version="12.0.0-*" />
<PackageReference Include="SIL.Core" Version="15.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-*" />
<PackageReference Include="SIL.WritingSystems.Tests" Version="15.0.0-*" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
</ItemGroup>

Expand Down
11 changes: 11 additions & 0 deletions src/LibChorusTests/MiscTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using L10NSharp;
using LibChorus.TestUtilities;
using NUnit.Framework;

Expand All @@ -18,4 +19,14 @@ public void AllSettingsUseCrossPlatformProvider()
}
}
}

[SetUpFixture]
public class SetupFixture
{
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
LocalizationManager.StrictInitializationMode = false;
}
}
}
160 changes: 1 addition & 159 deletions src/LibChorusTests/merge/xml/lift/MultiTextMergingTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using NUnit.Framework;


namespace LiftIO.Tests.Merging
namespace LibChorus.Tests.merge.xml.lift
{
[TestFixture]
public class MultiTextMergingTests
Expand Down Expand Up @@ -84,163 +84,5 @@ public void SkipConvertingElementToTextElementInAnotherFile()
Assert.That(doc.DocumentElement.OuterXml, Does.Not.Contain("<text>myStuff</text>"), "Converted <element> element to <text>, but should not have.");
Assert.That(doc.DocumentElement.OuterXml, Does.Contain("<element name=\"text\">myStuff</element>"), "Element <element> went away, but should have been present.");
}
/*
[Test]
public void MergeMultiTextNodes_OneAddedNewMultiTextElement()
{
string red = @"<lexical-unit/>";
string ancestor = red;
string blue = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
CheckBothWays(red, blue, ancestor, "lexical-unit/form[@lang='one']/text[text()='first']");
}
// private void CheckBothWays(string red, string blue, string ancestor, string xpath)
// {
// XmlNode result= LiftSavvyMergeStrategy.MergeMultiTextPieces(red, blue, ancestor);
// XmlTestHelper.AssertXPathMatchesExactlyOne(result.OuterXml, xpath);
// result= LiftSavvyMergeStrategy.MergeMultiTextPieces(blue, red, ancestor);
// XmlTestHelper.AssertXPathMatchesExactlyOne(result.OuterXml, xpath);
// }
private void CheckBothWays(string red, string blue, string ancestor, params string[] xpaths)
{
CheckOneWay(red, blue, ancestor, xpaths);
CheckOneWay(blue, red, ancestor, xpaths);
}
private void CheckOneWay(string ours, string theirs, string ancestor, params string[] xpaths)
{
XmlNode result = MultiTextMerger.MergeMultiTextPieces(ours, theirs, ancestor);
foreach (string xpath in xpaths)
{
XmlTestHelper.AssertXPathMatchesExactlyOne(result.OuterXml, xpath);
}
}
[Test]
public void MergeMultiTextNodes_EachAddedDifferentAlternatives_GetBoth()
{
string ancestor = @"<lexical-unit>
</lexical-unit>";
string red = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
string blue = @"<lexical-unit>
<form lang='two'>
<text>second</text>
</form>
</lexical-unit>";
CheckBothWays(red, blue, ancestor,
"lexical-unit/form[@lang='one']/text[text()='first']",
"lexical-unit/form[@lang='two']/text[text()='second']");
}
[Test]
public void MergeMultiTextNodes_OneAddedAnAlternatives_GetBoth()
{
string red = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
string ancestor = red;
string blue = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
<form lang='two'>
<text>second</text>
</form>
</lexical-unit>";
CheckBothWays(red, blue, ancestor,
"lexical-unit/form[@lang='one']/text[text()='first']",
"lexical-unit/form[@lang='two']/text[text()='second']");
}
[Test]
public void MergeMultiTextNodes_OnePutSomethingInPreviouslyEmptyForm()
{
string red = @"<lexical-unit>
<form lang='one'/>
</lexical-unit>";
string ancestor = red;
string blue = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
Assert.That(Utilities.AreXmlElementsEqual(red, blue), Is.False);
CheckBothWays(red, blue, ancestor,
"lexical-unit/form[@lang='one']/text[text()='first']");
}
[Test]
public void MergeMultiTextNodes_OnePutSomethingInPreviouslyEmptyFormText()
{
string red = @"<lexical-unit>
<form lang='one'><text/></form>
</lexical-unit>";
string ancestor = red;
string blue = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
CheckBothWays(red, blue, ancestor,
"lexical-unit/form[@lang='one']/text[text()='first']");
}
[Test]
public void WeDeletedAForm_FormRemoved()
{
string red = @"<lexical-unit></lexical-unit>";
string blue = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
string ancestor = blue;
CheckOneWay(blue, red, ancestor, "lexical-unit[ not(form)]");
}
[Test]
public void TheyDeleteAForm_FormRemoved()
{
string red = @"<lexical-unit></lexical-unit>";
string blue = @"<lexical-unit>
<form lang='one'>
<text>first</text>
</form>
</lexical-unit>";
string ancestor = blue;
CheckOneWay(blue, red, ancestor, "lexical-unit[ not(form)]");
}
*/
}
}

0 comments on commit 7b61f26

Please sign in to comment.