Skip to content

Commit

Permalink
Update libpalaso depdencies
Browse files Browse the repository at this point in the history
* This brings in a new version of L10nSharp with API changes
  • Loading branch information
jasonleenaylor committed Nov 26, 2024
1 parent 72cff44 commit 2914d62
Show file tree
Hide file tree
Showing 18 changed files with 125 additions and 220 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/ci+cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,31 @@ jobs:
- name: Build
run: dotnet build --no-restore -c Release

- name: Install python2 for test execution
run: sudo apt-get install python2
if: matrix.os == 'ubuntu-latest'
- name: install python2 for test execution
run: sudo apt-get install python2
if: matrix.os == 'ubuntu-latest'

- name: Test Chorus
run: dotnet test src/Chorus.Tests/Chorus.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
- name: test chorus
run: dotnet test src/chorus.tests/chorus.tests.csproj -f ${{ matrix.framework }} --no-build -c release --filter testcategory!=skiponbuildserver -- nunit.testoutputxml=testresults
if: matrix.framework == 'net462'

- name: Test Chorus Hub
run: dotnet test src/ChorusHubTests/ChorusHubTests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
- name: test chorus hub
run: dotnet test src/chorushubtests/chorushubtests.csproj -f ${{ matrix.framework }} --no-build -c release --filter testcategory!=skiponbuildserver -- nunit.testoutputxml=testresults
if: matrix.framework == 'net462'

- name: Test ChorusMerge
run: dotnet test src/ChorusMerge.Tests/ChorusMerge.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
- name: test chorusmerge
run: dotnet test src/chorusmerge.tests/chorusmerge.tests.csproj -f ${{ matrix.framework }} --no-build -c release --filter testcategory!=skiponbuildserver -- nunit.testoutputxml=testresults

- name: Test LibChorus
run: dotnet test src/LibChorusTests/LibChorus.Tests.csproj -f ${{ matrix.framework }} --no-build -c Release --filter TestCategory!=SkipOnBuildServer -- NUnit.TestOutputXml=TestResults
- name: test libchorus
run: dotnet test src/libchorustests/libchorus.tests.csproj -f ${{ matrix.framework }} --no-build -c release --filter testcategory!=skiponbuildserver -- nunit.testoutputxml=testresults

# TODO: Give each test result its own name based on OS and framework and change the test-results.yml workflow accordingly, so that they don't overwrite each other
- name: Upload Test Results
# todo: give each test result its own name based on os and framework and change the test-results.yml workflow accordingly, so that they don't overwrite each other
- name: upload test results
if: always()
uses: actions/upload-artifact@v4
with:
name: Test Results (${{ matrix.framework }} on ${{matrix.os}})
path: "**/TestResults/*.xml"
name: test results (${{ matrix.framework }} on ${{matrix.os}})
path: "**/testresults/*.xml"

build-installers:
name: "Build Windows installers"
Expand Down
18 changes: 18 additions & 0 deletions src/Chorus.Tests/ChorusFixtureSetup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using L10NSharp;
using NUnit.Framework;

namespace Chorus.Tests
{
internal class ChorusFixtureSetup
{
[SetUpFixture]
public class SetupFixture
{
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
LocalizationManager.StrictInitializationMode = false;
}
}
}
}
1 change: 0 additions & 1 deletion src/Chorus.Tests/clone/ClonerTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
Expand Down
4 changes: 2 additions & 2 deletions src/Chorus/Chorus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ItemGroup>
<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.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<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
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
4 changes: 2 additions & 2 deletions src/ChorusHub/ChorusHub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<ItemGroup>
<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.BuildTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.BuildTasks" Version="3.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ChorusHubApp/ChorusHubApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ItemGroup>
<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.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="15.0.0-*" />
<PackageReference Include="Vulcan.Uczniowie.HelpProvider" Version="1.0.16" />
</ItemGroup>

Expand Down
15 changes: 15 additions & 0 deletions src/ChorusHubTests/ChorusHubFixtureSetup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using L10NSharp;
using NUnit.Framework;

namespace ChorusHubTests
{
[SetUpFixture]
public class ChorusHubFixtureSetup
{
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
LocalizationManager.StrictInitializationMode = false;
}
}
}
2 changes: 1 addition & 1 deletion src/ChorusMerge.Tests/ChorusMerge.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2"/>
<PackageReference Include="SIL.TestUtilities" Version="12.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-*" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 15 additions & 0 deletions src/ChorusMerge.Tests/ChorusMergeFixtureSetup.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using L10NSharp;
using NUnit.Framework;

namespace ChorusMerge.Tests
{
[SetUpFixture]
public class ChorusMergeFixtureSetup
{
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
LocalizationManager.StrictInitializationMode = false;
}
}
}
5 changes: 2 additions & 3 deletions src/ChorusMerge/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Chorus.FileTypeHandlers;
using Chorus.merge;
using Chorus.merge.xml.generic;
using SIL.PlatformUtilities;
using L10NSharp;

// Allow redirecting Console.Error for unit tests (Avoid spurious build failures)
[assembly: InternalsVisibleTo("ChorusMerge.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001005f4452c387d979e3cba05fd73bb9aebe8f8830874663d66a7869f614a8f5e8def658d5c5920fae609d28aa005d5a9af5bd758ca8f19ad0347b7aa76e1f723f8994792136f5ceff9fb6f719d4337f65da2e1d66a85cc5e28e4656a1a30c2ff513440393177625c725d3fb156dc3c11610ea5936b9404ab9d51f7eb71ac0aa27bd")]
Expand Down Expand Up @@ -35,6 +33,7 @@ public static int Main(string[] args)
{
try
{
LocalizationManager.StrictInitializationMode = false;
string ourFilePath = args[0];
string commonFilePath = args[1];
string theirFilePath = args[2];
Expand Down
30 changes: 15 additions & 15 deletions src/Installer/ChorusHub.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
<!-- -->
<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of Chorus Hub is already installed. Setup will now exit." Schedule="afterInstallValidate"/>

<PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED"/>
<Condition Message="Before [ProductName] can install, you need to install Microsoft's free .NET Framework 4.6.1 or later.">
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED]]>
<PropertyRef Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED"/>
<Condition Message="Before [ProductName] can install, you need to install Microsoft's free .NET Framework 4.6.2 or later.">
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED]]>
</Condition>

<!--because of bug, this needs to be 1 (now set with "'InstallScope="perMachine"' in Package element, above.
Expand Down Expand Up @@ -55,7 +55,7 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->

<!-- Main assemblies -->
<Component Id="ChorusHub.exe" Guid="C1EEF458-E382-11DE-8A39-0800200C9A66">
<File Id="ChorusHub.exe" Name="ChorusHub.exe" Source="..\..\output\Release\net461\ChorusHub.exe" KeyPath="yes" />
<File Id="ChorusHub.exe" Name="ChorusHub.exe" Source="..\..\output\Release\net462\ChorusHub.exe" KeyPath="yes" />
<!-- http://codeblog.vurdalakov.net/2013/06/wix-how-to-install-and-start-windows-service.html -->
<ServiceInstall Id="ChorusHub" Type="ownProcess" Name="ChorusHub" DisplayName="Chorus Hub Sharing Service"
Description="ChorusHub Sharing Service" Start="auto" Account="LocalSystem" ErrorControl="normal">
Expand All @@ -73,46 +73,46 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
</RegistryKey>
</Component>
<Component Id="LibChorus.dll" Guid="C1EECD54-E382-11DE-8A39-0800200C9A66">
<File Id="LibChorus.dll" Name="LibChorus.dll" KeyPath="yes" Source="..\..\output\Release\net461\LibChorus.dll" />
<File Id="LibChorus.dll" Name="LibChorus.dll" KeyPath="yes" Source="..\..\output\Release\net462\LibChorus.dll" />
</Component>

<!-- used by chorus -->
<Component Id="Autofac.dll" Guid="C1EECD55-E382-11DE-8A39-0800200C9A66">
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net461\Autofac.dll" />
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net462\Autofac.dll" />
</Component>
<Component Id="chorushelp.chm" Guid="C1EECD56-E382-11DE-8A39-0800200C9A66">
<File Id="chorushelp.chm" Name="Chorus_Help.chm" KeyPath="yes" Source="..\..\DistFiles\Help\Chorus_Help.chm"/>
</Component>
<!-- used by chorus help -->
<Component Id="Vulcan.Uczniowie.HelpProvider.dll" Guid="C1EEF450-E382-11DE-8A39-0800200C9A66">
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net461\Vulcan.Uczniowie.HelpProvider.dll" />
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net462\Vulcan.Uczniowie.HelpProvider.dll" />
</Component>

<Component Id="SIL.Core.dll" Guid="C1EEF451-E382-11DE-8A39-0800200C9A66">
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Core.dll" />
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.dll" />
</Component>

<Component Id="SIL.Core.Desktop.dll" Guid="923331FA-197B-4844-930C-21FFDBC480BE">
<File Id="SIL.Core.Desktop.dll" Name="SIL.Core.Desktop.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Core.Desktop.dll" />
<File Id="SIL.Core.Desktop.dll" Name="SIL.Core.Desktop.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.Desktop.dll" />
</Component>

<!-- ICU assemblies used by chorus/palaso -->
<Component Id="icu.net.dll" Guid="C1EEF452-E382-11DE-8A39-0800200C9A66">
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net461\icu.net.dll" />
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net462\icu.net.dll" />
</Component>
<Component Id="icudt59.dll" Guid="C1EEF453-E382-11DE-8A39-0800200C9A66">
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icudt59.dll" />
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icudt59.dll" />
</Component>
<Component Id="icuin59.dll" Guid="C1EEF454-E382-11DE-8A39-0800200C9A66">
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuin59.dll" />
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuin59.dll" />
</Component>
<Component Id="icuuc59.dll" Guid="C1EEF455-E382-11DE-8A39-0800200C9A66">
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuuc59.dll" />
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuuc59.dll" />
</Component>

<!-- L10NSharp assembly used by chorus/palaso -->
<Component Id="L10NSharp.dll" Guid="C1EEF456-E382-11DE-8A39-0800200C9A66">
<File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\net461\L10NSharp.dll"/>
<File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\net462\L10NSharp.dll"/>
</Component>
</Directory>
</Directory>
Expand Down Expand Up @@ -149,7 +149,7 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
<MergeRef Id="CRT90Policy"/>
</Feature>

<Icon Id="chorusHubIcon.ico" SourceFile="..\..\output\Release\net461\ChorusHub.exe"/>
<Icon Id="chorusHubIcon.ico" SourceFile="..\..\output\Release\net462\ChorusHub.exe"/>
<!-- what you see in add/remove programs control panel -->
<Property Id="ARPPRODUCTICON" Value="chorusHubIcon.ico"/>
</Product>
Expand Down
24 changes: 12 additions & 12 deletions src/Installer/ChorusMergeModule.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -45,48 +45,48 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
</Directory>

<Component Id="libchorus.dll" Guid="B9BCFD29-E687-4ec1-9407-1918AD14075B">
<File Id="libchorus.dll" Name="libchorus.dll" KeyPath="yes" Source="..\..\output\Release\net461\libchorus.dll" />
<File Id="libchorus.dll" Name="libchorus.dll" KeyPath="yes" Source="..\..\output\Release\net462\libchorus.dll" />
</Component>
<Component Id="chorus.exe" Guid="BAF93900-B12B-4942-BA85-55090CF005D8">
<File Id="chorus.exe" Name="chorus.exe" KeyPath="yes" Source="..\..\output\Release\net461\chorus.exe" />
<File Id="chorus.exe" Name="chorus.exe" KeyPath="yes" Source="..\..\output\Release\net462\chorus.exe" />
</Component>
<Component Id="chorusmerge.exe" Guid="7A088F3F-411D-41f9-BBA3-4304E2865969">
<File Id="chorusmerge.exe" Name="chorusmerge.exe" KeyPath="yes" Source="..\..\output\Release\net461\chorusmerge.exe" />
<File Id="chorusmerge.exe" Name="chorusmerge.exe" KeyPath="yes" Source="..\..\output\Release\net462\chorusmerge.exe" />
</Component>
<Component Id="chorushelp.chm" Guid="C1EDBBE9-E382-11DE-8A39-0800200C9A66">
<File Id="chorushelp.chm" Name="Chorus_Help.chm" KeyPath="yes" Source="..\..\DistFiles\Help\Chorus_Help.chm"/>
</Component>

<!-- used by chorus help -->
<Component Id="Vulcan.Uczniowie.HelpProvider.dll" Guid="{F8BCCD28-AB69-4C3D-B024-6B109ADC75B0}">
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net461\Vulcan.Uczniowie.HelpProvider.dll" />
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net462\Vulcan.Uczniowie.HelpProvider.dll" />
</Component>

<!-- used by chorus -->
<Component Id="Autofac.dll" Guid="C1EE09F6-E382-11DE-8A39-0800200C9A66">
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net461\Autofac.dll" />
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net462\Autofac.dll" />
</Component>
<!-- Palaso assemblies used by chorus -->
<Component Id="icu.net.dll" Guid="C1EE09F7-E382-11DE-8A39-0800200C9A66">
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net461\icu.net.dll" />
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net462\icu.net.dll" />
</Component>
<Component Id="icudt59.dll" Guid="C1EE3118-E382-11DE-8A39-0800200C9A66">
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icudt59.dll" />
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icudt59.dll" />
</Component>
<Component Id="icuin59.dll" Guid="C1EE3117-E382-11DE-8A39-0800200C9A66">
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuin59.dll" />
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuin59.dll" />
</Component>
<Component Id="icuuc59.dll" Guid="C1EE3116-E382-11DE-8A39-0800200C9A66">
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuuc59.dll" />
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuuc59.dll" />
</Component>
<Component Id="SIL.Core.dll" Guid="C1EE09F8-E382-11DE-8A39-0800200C9A66">
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Core.dll" />
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.dll" />
</Component>
<Component Id="SIL.Lift.dll" Guid="C1EE09F9-E382-11DE-8A39-0800200C9A66">
<File Id="SIL.Lift.dll" Name="SIL.Lift.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Lift.dll" />
<File Id="SIL.Lift.dll" Name="SIL.Lift.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Lift.dll" />
</Component>
<Component Id="SIL.Windows.Forms.dll" Guid="c1ee09fa-e382-11de-8a39-0800200c9a66">
<File Id="SIL.Windows.Forms.dll" Name="SIL.Windows.Forms.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Windows.Forms.dll" />
<File Id="SIL.Windows.Forms.dll" Name="SIL.Windows.Forms.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Windows.Forms.dll" />
</Component>
</Directory>
</Directory>
Expand Down
6 changes: 3 additions & 3 deletions src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj
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.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
<PackageReference Include="SIL.TestUtilities" Version="12.0.0-*" />
<PackageReference Include="SIL.Core" Version="15.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.TestUtilities" Version="15.0.0-*" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 2914d62

Please sign in to comment.