Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated most libraries to latest versions #193

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Updated most libraries to latest versions #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6fb40fe
Updated to latest version of several libraries
tombogle Aug 15, 2024
1a203b0
More library updates. Got Archiving stuff to work with new API.
tombogle Oct 25, 2024
d7c6139
Merge branch 'master' into update-libraries and fixed long-time issue…
tombogle Oct 28, 2024
5b52185
Changed to used latest beta SIL.BuildTasks proj file and moved import…
tombogle Oct 28, 2024
74307cf
Moved RestoreLocalPackages to happen before the UsingTask lines to en…
tombogle Oct 29, 2024
9b4cb85
Another attempt to get Split task to work on TC
tombogle Oct 29, 2024
72ad362
Fixed typo in NUnit 3 console runner ToolPath
tombogle Oct 29, 2024
a395976
Added IncludeSourceRevisionInInformationalVersion to Tests so Version…
tombogle Oct 29, 2024
3da1022
Updated to latest beta versions of SIL libraries. Replaced DotNetZip …
tombogle Dec 9, 2024
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
2 changes: 1 addition & 1 deletion DistFiles/SayMore.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
<note>ID: CommonToMultipleViews.FileList.CannotRenameFileGenericErrorMsg</note>
</trans-unit>
<trans-unit id="CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg">
<source xml:lang="en">{0} could not rename the meta data file to '{1}' because there is already a file with that name.</source>
<source xml:lang="en">{0} could not rename the metadata file to '{1}' because there is already a file with that name.</source>
<target xml:lang="es-ES" state="translated">{0} no pudo cambiar el nombre del archivo de metadatos porque ya existe un archivo nombrado: '{1}'.</target>
<note>ID: CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg</note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion DistFiles/SayMore.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<target xml:lang="fr" state="translated">Désolé, SayMore ne pouvait pas renommer ce fichier parce que quelque chose d'autre (peut-être une autre partie de SayMore) fait la lecture. Veuillez réessayer plus tard.</target>
</trans-unit>
<trans-unit id="CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg">
<source xml:lang="en">{0} could not rename the meta data file to '{1}' because there is already a file with that name.</source>
<source xml:lang="en">{0} could not rename the metadata file to '{1}' because there is already a file with that name.</source>
<note>ID: CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg</note>
<target xml:lang="fr" state="translated">{0} ne peut pas renommer le fichier de métadonnées pour '{1}' car il existe déjà un fichier de ce nom.</target>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion DistFiles/SayMore.pt.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<target xml:lang="pt-BR" state="translated">Desculpe, não foi possível renomear este arquivo; ele ainda está aberto (talvez em outra parte do SayMore). Por favor, tente novamente mais tarde.</target>
</trans-unit>
<trans-unit id="CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg">
<source xml:lang="en">{0} could not rename the meta data file to '{1}' because there is already a file with that name.</source>
<source xml:lang="en">{0} could not rename the metadata file to '{1}' because there is already a file with that name.</source>
<note>ID: CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg</note>
<target xml:lang="pt-BR" state="translated">{0} não pôde renomear o arquivo de metadados para "{1}". Já existe um arquivo com este nome.</target>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion DistFiles/SayMore.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<target xml:lang="ru" state="translated">К сожалению SayMore не может переименовать файл, потому что другая программа (или другая часть SayMore) читает его. Пожалуйста, попробуйте еще раз позже.</target>
</trans-unit>
<trans-unit id="CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg">
<source xml:lang="en">{0} could not rename the meta data file to '{1}' because there is already a file with that name.</source>
<source xml:lang="en">{0} could not rename the metadata file to '{1}' because there is already a file with that name.</source>
<note>ID: CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg</note>
<target xml:lang="ru" state="translated">{0} не может переименовать метаданных файла «{1}», потому что файл с таким именем уже существует.</target>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion DistFiles/SayMore.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
<target xml:lang="tr" state="translated">Üzgünüz, SayMore bu dosyayı yeniden adlandıramadı çünkü başka bir şey (belki SayMore'un başka bir parçası) dosyayı okuyor. Lütfen daha sonra tekrar deneyiniz.</target>
</trans-unit>
<trans-unit id="CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg">
<source xml:lang="en">{0} could not rename the meta data file to '{1}' because there is already a file with that name.</source>
<source xml:lang="en">{0} could not rename the metadata file to '{1}' because there is already a file with that name.</source>
<note>ID: CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg</note>
<target xml:lang="tr" state="translated">{0} meta veri dosyasını '{1}' olarak yeniden adlandıramadı, çünkü zaten bu ada sahip bir dosya var.</target>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion DistFiles/SayMore.zh-CN.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
<target xml:lang="zh-CN" state="translated">对不起，文件被占用，不能重命名，请稍后再试。</target>
</trans-unit>
<trans-unit id="CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg">
<source xml:lang="en">{0} could not rename the meta data file to '{1}' because there is already a file with that name.</source>
<source xml:lang="en">{0} could not rename the metadata file to '{1}' because there is already a file with that name.</source>
<note>ID: CommonToMultipleViews.FileList.CannotRenameMetadataFileErrorMsg</note>
<target xml:lang="zh-CN" state="translated">这个文件名已经存在，{0} 不能重命名为 '{1}' </target>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion DistFiles/aboutBox.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="aboutBox.css" />
</head>
<body>
<h1 style="margin-top:8px">Copyright © 2011-2023 <a href="https://www.sil.org/">SIL International</a></h1>
<h1 style="margin-top:8px">Copyright © 2011-2024 <a href="https://www.sil.org/">SIL Global</a></h1>

<h1>License</h1>
<p>Open source (<a href="https://sil.mit-license.org/">MIT</a>).</p>
Expand Down
2 changes: 1 addition & 1 deletion SampleData/EdoloSample/Sessions/ETR009/ETR009.session
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<location type="string">Huya</location>
<setting type="string">Sitting on their front porch</setting>
<situation type="string">Walking with Ilawi, we passed the plant they use to make poison for fishing, and I asked him if he'd tell me about how to do it. We went to his house, where Awi joined us, and the two of them took turns telling parts of the "whole story".</situation>
<date type="string">6/6/2010</date>
<date type="string">2010-06-06</date>
<notes type="string">hello</notes>
<status type="string">Incoming</status>
</Session>
7 changes: 7 additions & 0 deletions SayMore.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,34 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=aiff/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Analytics/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Arbil/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Archivable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=attrib/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=autofac/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=bldr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=contribs/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=curr/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dropbox/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=ELAR/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ethnologue/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=fsutil/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Inputter/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Insite/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mets/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=NTSC/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=OLAC/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Olac/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Palaso/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Parsable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Prearchiving/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Recordist/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=reentrant/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IMDI/@EntryIndexedValue">IMDI</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Segmenter/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Segoe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=standarderror/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=subclassed/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Threadsafe/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=toolstrip/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Uncolonized/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unrounded/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Wikimedia/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
30 changes: 16 additions & 14 deletions build/SayMore.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,26 @@
<RootDir Condition="'$(teamcity_version)' == ''">$(MSBuildProjectDirectory)\..</RootDir>
<RootDir Condition="'$(teamcity_version)' != ''">$(teamcity_build_checkoutDir)</RootDir>
<BUILD_NUMBER Condition="'$(BUILD_NUMBER)'==''">3.5.0</BUILD_NUMBER>
<BuildTasksDll>$(RootDir)/packages/SIL.BuildTasks.2.5.0/tools/SIL.BuildTasks.dll</BuildTasksDll>
<BuildTasksDll Condition="Exists('$(RootDir)/packages/SIL.BuildTasks.3.0.0/tools/SIL.BuildTasks.dll')">$(RootDir)/packages/SIL.BuildTasks.3.0.0/tools/SIL.BuildTasks.dll</BuildTasksDll>
<BuildTasksDll Condition="!Exists('$(RootDir)/packages/SIL.BuildTasks.3.0.0/tools/SIL.BuildTasks.dll')">$(RootDir)/packages/SIL.BuildTasks/tools/SIL.BuildTasks.dll</BuildTasksDll>
<SILReleaseTasksProps>$(RootDir)/packages/SIL.ReleaseTasks/build/SIL.ReleaseTasks.props</SILReleaseTasksProps>
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
<RestartBuild Condition="!Exists('$(BuildTasksDll)') Or !Exists('$(SILReleaseTasksProps)')">true</RestartBuild>
<RestartBuild Condition="Exists('$(BuildTasksDll)') And Exists('$(SILReleaseTasksProps)')">false</RestartBuild>
</PropertyGroup>

<Import Project="../.nuget/NuGet.targets" />

<Target Name="RestoreLocalPackages" DependsOnTargets="CheckPrerequisites">
<Message Text="BuildTasksDll=$(BuildTasksDll)"/>
<Message Text="RestartBuild=$(RestartBuild)"/>
<Message Text="Configuration=$(Configuration)"/>
<Exec Command='$(NuGetCommand) install SIL.BuildTasks -excludeVersion -PreRelease -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)."' />
<Exec Command='$(NuGetCommand) install SIL.ReleaseTasks -excludeVersion -PreRelease -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)"' />
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="BuildInternal"
Properties="Configuration=$(Configuration)" Condition="$(RestartBuild)" />
</Target>

<UsingTask TaskName="StampAssemblies" AssemblyFile="$(BuildTasksDll)" Condition="Exists('$(BuildTasksDll)')" />
<UsingTask TaskName="UpdateBuildTypeFile" AssemblyFile="$(BuildTasksDll)" Condition="Exists('$(BuildTasksDll)')" />
<UsingTask TaskName="MakeWixForDirTree" AssemblyFile="$(BuildTasksDll)" Condition="Exists('$(BuildTasksDll)')" />
Expand All @@ -34,19 +47,8 @@
<Message Text="Version: $(Version)" Importance="high"/>
</Target>

<Import Project="../.nuget/NuGet.targets" />
<Import Project="$(SILReleaseTasksProps)" Condition="Exists('$(SILReleaseTasksProps)')" />

<Target Name="RestoreLocalPackages" DependsOnTargets="CheckPrerequisites">
<Message Text="BuildTasksDll=$(BuildTasksDll)"/>
<Message Text="RestartBuild=$(RestartBuild)"/>
<Message Text="Configuration=$(Configuration)"/>
<Exec Command='$(NuGetCommand) install SIL.BuildTasks -version 2.1.0 -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)."' />
<Exec Command='$(NuGetCommand) install SIL.ReleaseTasks -excludeVersion -PreRelease -source "$(PackageSources)" -solutionDirectory "$(SolutionDir)"' />
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="BuildInternal"
Properties="Configuration=$(Configuration)" Condition="$(RestartBuild)" />
</Target>

<Target Name="SetAssemblyVersion" DependsOnTargets="VersionNumbers">
<ItemGroup>
<AssemblyInfoFiles Include="$(RootDir)/src/**/assemblyinfo.cs"/>
Expand Down Expand Up @@ -82,7 +84,7 @@
</ItemGroup>
<NUnit3 Condition="'$(teamcity_version)' == ''"
Assemblies="@(TestAssemblies)"
ToolPath="$(RootDir)/packages/NUnit.ConsoleRunner.3.16.3/tools"
ToolPath="$(RootDir)/packages/NUnit.ConsoleRunner.3.18.1/tools"
ExcludeCategory="$(excludedCategories)"
WorkingDirectory="$(RootDir)/output/$(Configuration)"
Force32Bit="$(useNUnit-x86)"
Expand All @@ -92,7 +94,7 @@
TeamCity="false"/>
<NUnit3 Condition="'$(teamcity_version)' != ''"
Assemblies="@(TestAssemblies)"
ToolPath="$(RootDir)/packages/NUnit.ConsoleRunner.3.16.3/tools"
ToolPath="$(RootDir)/packages/NUnit.ConsoleRunner.3.18.1/tools"
ExcludeCategory="SkipOnTeamCity,$(excludedCategories)"
WorkingDirectory="$(RootDir)/output/$(Configuration)"
Force32Bit="$(useNUnit-x86)"
Expand Down
6 changes: 3 additions & 3 deletions src/Installer/Installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
<Component Id="DialogAdapters.dll" Guid="{F09B94F6-1CEB-42D1-B9EF-87D9837085F6}">
<File Id="DialogAdapters.dll" Name="DialogAdapters.dll" KeyPath="yes" Source="..\..\output\release\DialogAdapters.dll" />
</Component>
<Component Id="DotNetZip.dll" Guid="{BBF5268C-41D6-4E32-AD05-1C847E0C1915}">
<File Id="DotNetZip.dll" Name="DotNetZip.dll" KeyPath="yes" Source="..\..\output\release\DotNetZip.dll" />
<Component Id="System.IO.Compression.ZipFile.dll" Guid="{59C3F5C2-F8BA-4875-808C-09FED5D5F01E}">
<File Id="System.IO.Compression.ZipFile.dll" Name="System.IO.Compression.ZipFile.dll" KeyPath="yes" Source="..\..\output\release\System.IO.Compression.ZipFile.dll" />
</Component>
<Component Id="Enchant.Net.dll" Guid="{505D07A1-5D29-405A-9B1F-2066F7CC0AB5}">
<File Id="Enchant.Net.dll" Name="Enchant.Net.dll" KeyPath="yes" Source="..\..\output\release\Enchant.Net.dll" />
Expand Down Expand Up @@ -636,7 +636,7 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
<ComponentRef Id="Coroutine.NET.dll"/>
<ComponentRef Id="DesktopAnalytics.dll"/>
<ComponentRef Id="DialogAdapters.dll"/>
<ComponentRef Id="DotNetZip.dll"/>
<ComponentRef Id="System.IO.Compression.ZipFile.dll"/>
<ComponentRef Id="Enchant.Net.dll"/>
<ComponentRef Id="ibusdotnet.dll"/>
<ComponentRef Id="icu.net.dll"/>
Expand Down
2 changes: 0 additions & 2 deletions src/SayMore/MediaUtils/Audio/AudioFileHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
using System;
using System.IO;
using System.Runtime.CompilerServices;
using L10NSharp;
using NAudio.Wave;
using NAudio.Wave.SampleProviders;
using SIL.Reporting;

namespace SayMore.Media.Audio
Expand Down
1 change: 0 additions & 1 deletion src/SayMore/MediaUtils/MPlayer/MPlayerDebuggingOutputWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Windows.Forms;
using SIL.Reporting;
using SIL.Windows.Forms;
using SIL.Windows.Forms.PortableSettingsProvider;
using SayMore.Properties;

Expand Down
Loading