From f6e67360fad42c600f1b4b2bf60cb6fe291dc184 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 6 Jun 2024 13:46:15 +0700 Subject: [PATCH 01/15] Added Framework 4.8 to all projects And fixed all warnings other than those warning about Framework 4.6.1. --- Directory.Build.props | 2 +- SIL.Core/ObjectModel/ObservableHashSet.cs | 2 +- SIL.Core/ObjectModel/ObservableISet.cs | 52 +++++++++---------- SIL.Core/ObjectModel/ObservableSortedSet.cs | 2 +- .../Extensions/ToolStripExtensions.cs | 1 + .../ImageToolbox/AcquireImageControl.cs | 2 +- .../LocalizationIncompleteViewModel.cs | 2 + .../IcuUCharCategoryExtensions.cs | 2 + 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 68822ccce..276c6cadb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461 + net461;net48 Debug;Release SIL International SIL International diff --git a/SIL.Core/ObjectModel/ObservableHashSet.cs b/SIL.Core/ObjectModel/ObservableHashSet.cs index ed0e577d4..e852f1766 100644 --- a/SIL.Core/ObjectModel/ObservableHashSet.cs +++ b/SIL.Core/ObjectModel/ObservableHashSet.cs @@ -18,6 +18,6 @@ public ObservableHashSet(IEnumerable items, IEqualityComparer comparer) : protected override IEqualityComparer Comparer => Items.Comparer; - protected HashSet Items => (HashSet) _set; + protected HashSet Items => (HashSet) Set; } } diff --git a/SIL.Core/ObjectModel/ObservableISet.cs b/SIL.Core/ObjectModel/ObservableISet.cs index 4de70a9fd..7e7d835bd 100644 --- a/SIL.Core/ObjectModel/ObservableISet.cs +++ b/SIL.Core/ObjectModel/ObservableISet.cs @@ -20,21 +20,21 @@ event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged protected virtual event PropertyChangedEventHandler PropertyChanged; private readonly SimpleMonitor _reentrancyMonitor = new SimpleMonitor(); - protected readonly ISet _set; + protected readonly ISet Set; public ObservableISet(ISet set) { - _set = set; + Set = set; } IEnumerator IEnumerable.GetEnumerator() { - return _set.GetEnumerator(); + return Set.GetEnumerator(); } IEnumerator IEnumerable.GetEnumerator() { - return _set.GetEnumerator(); + return Set.GetEnumerator(); } void ICollection.Add(T item) @@ -47,8 +47,8 @@ void ICollection.Add(T item) public virtual void UnionWith(IEnumerable other) { CheckReentrancy(); - T[] addedItems = other.Where(x => !_set.Contains(x)).ToArray(); - _set.UnionWith(addedItems); + T[] addedItems = other.Where(x => !Set.Contains(x)).ToArray(); + Set.UnionWith(addedItems); if (addedItems.Length > 0) { OnPropertyChanged(new PropertyChangedEventArgs("Count")); @@ -59,8 +59,8 @@ public virtual void UnionWith(IEnumerable other) public virtual void IntersectWith(IEnumerable other) { CheckReentrancy(); - T[] removedItems = _set.Where(x => !other.Contains(x)).ToArray(); - _set.ExceptWith(removedItems); + T[] removedItems = Set.Where(x => !other.Contains(x)).ToArray(); + Set.ExceptWith(removedItems); if (removedItems.Length > 0) { OnPropertyChanged(new PropertyChangedEventArgs("Count")); @@ -71,8 +71,8 @@ public virtual void IntersectWith(IEnumerable other) public virtual void ExceptWith(IEnumerable other) { CheckReentrancy(); - T[] removedItems = other.Where(x => _set.Contains(x)).ToArray(); - _set.ExceptWith(removedItems); + T[] removedItems = other.Where(x => Set.Contains(x)).ToArray(); + Set.ExceptWith(removedItems); if (removedItems.Length > 0) { OnPropertyChanged(new PropertyChangedEventArgs("Count")); @@ -87,14 +87,14 @@ public virtual void SymmetricExceptWith(IEnumerable other) var removedItems = new List(); foreach (T item in other.Distinct(Comparer)) { - if (_set.Contains(item)) + if (Set.Contains(item)) removedItems.Add(item); else addedItems.Add(item); } - _set.UnionWith(addedItems); - _set.ExceptWith(removedItems); + Set.UnionWith(addedItems); + Set.ExceptWith(removedItems); if (addedItems.Count > 0 || removedItems.Count > 0) OnPropertyChanged(new PropertyChangedEventArgs("Count")); @@ -106,38 +106,38 @@ public virtual void SymmetricExceptWith(IEnumerable other) public bool IsSubsetOf(IEnumerable other) { - return _set.IsSubsetOf(other); + return Set.IsSubsetOf(other); } public bool IsSupersetOf(IEnumerable other) { - return _set.IsSupersetOf(other); + return Set.IsSupersetOf(other); } public bool IsProperSupersetOf(IEnumerable other) { - return _set.IsProperSupersetOf(other); + return Set.IsProperSupersetOf(other); } public bool IsProperSubsetOf(IEnumerable other) { - return _set.IsProperSubsetOf(other); + return Set.IsProperSubsetOf(other); } public bool Overlaps(IEnumerable other) { - return _set.Overlaps(other); + return Set.Overlaps(other); } public bool SetEquals(IEnumerable other) { - return _set.SetEquals(other); + return Set.SetEquals(other); } public virtual bool Add(T item) { CheckReentrancy(); - if (_set.Add(item)) + if (Set.Add(item)) { OnPropertyChanged(new PropertyChangedEventArgs("Count")); OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item)); @@ -149,8 +149,8 @@ public virtual bool Add(T item) public virtual void Clear() { CheckReentrancy(); - int origCount = _set.Count; - _set.Clear(); + int origCount = Set.Count; + Set.Clear(); if (origCount > 0) { OnPropertyChanged(new PropertyChangedEventArgs("Count")); @@ -160,18 +160,18 @@ public virtual void Clear() public bool Contains(T item) { - return _set.Contains(item); + return Set.Contains(item); } public void CopyTo(T[] array, int arrayIndex) { - _set.CopyTo(array, arrayIndex); + Set.CopyTo(array, arrayIndex); } public virtual bool Remove(T item) { CheckReentrancy(); - if (_set.Remove(item)) + if (Set.Remove(item)) { OnPropertyChanged(new PropertyChangedEventArgs("Count")); OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item)); @@ -182,7 +182,7 @@ public virtual bool Remove(T item) public int Count { - get { return _set.Count; } + get { return Set.Count; } } bool ICollection.IsReadOnly diff --git a/SIL.Core/ObjectModel/ObservableSortedSet.cs b/SIL.Core/ObjectModel/ObservableSortedSet.cs index eef43d781..e1670485a 100644 --- a/SIL.Core/ObjectModel/ObservableSortedSet.cs +++ b/SIL.Core/ObjectModel/ObservableSortedSet.cs @@ -12,6 +12,6 @@ public ObservableSortedSet(IEnumerable items) : base(new SortedSet(items)) protected override IEqualityComparer Comparer => EqualityComparer.Default; - protected SortedSet Items => (SortedSet) _set; + protected SortedSet Items => (SortedSet) Set; } } diff --git a/SIL.Windows.Forms/Extensions/ToolStripExtensions.cs b/SIL.Windows.Forms/Extensions/ToolStripExtensions.cs index 59126f998..4dc11915f 100644 --- a/SIL.Windows.Forms/Extensions/ToolStripExtensions.cs +++ b/SIL.Windows.Forms/Extensions/ToolStripExtensions.cs @@ -92,6 +92,7 @@ public static void SizeTextRectangleToText(this ToolStripItemTextRenderEventArgs /// the WinForms DLL will be able to have access to SIL.WritingSystems, and then this method /// could be moved into L10nSharp.Windows.Forms. [PublicAPI] + [CLSCompliant(false)] public static void InitializeWithAvailableUILocales(this ToolStripDropDownItem menu, Func localeSelectedAction = null, ILocalizationManager lm = null, LocalizationIncompleteViewModel localizationIncompleteViewModel = null, diff --git a/SIL.Windows.Forms/ImageToolbox/AcquireImageControl.cs b/SIL.Windows.Forms/ImageToolbox/AcquireImageControl.cs index 921aa6fdb..09309cba2 100644 --- a/SIL.Windows.Forms/ImageToolbox/AcquireImageControl.cs +++ b/SIL.Windows.Forms/ImageToolbox/AcquireImageControl.cs @@ -349,7 +349,7 @@ private void GetFromDevice(ImageAcquisitionService.DeviceKind deviceKind) /// public void SetInitialSearchString(string searchTerm) { - _galleryControl.SetIntialSearchTerm(searchTerm); + _galleryControl.SetInitialSearchTerm(searchTerm); } /// diff --git a/SIL.Windows.Forms/LocalizationIncompleteDlg/LocalizationIncompleteViewModel.cs b/SIL.Windows.Forms/LocalizationIncompleteDlg/LocalizationIncompleteViewModel.cs index cf2d3cfa4..55e299d39 100644 --- a/SIL.Windows.Forms/LocalizationIncompleteDlg/LocalizationIncompleteViewModel.cs +++ b/SIL.Windows.Forms/LocalizationIncompleteDlg/LocalizationIncompleteViewModel.cs @@ -10,6 +10,7 @@ namespace SIL.Windows.Forms.LocalizationIncompleteDlg /// public class LocalizationIncompleteViewModel { + [CLSCompliant(false)] public ILocalizationManager PrimaryLocalizationManager { get; } public string EmailAddressForLocalizationRequests => @@ -48,6 +49,7 @@ public class LocalizationIncompleteViewModel /// An action to handle issuing a localization /// request (typically by passing the to /// DesktopAnalytics.Track + [CLSCompliant(false)] public LocalizationIncompleteViewModel(ILocalizationManager appLm, string crowdinProjectName, Action issueRequestForLocalization) { diff --git a/SIL.WritingSystems/IcuUCharCategoryExtensions.cs b/SIL.WritingSystems/IcuUCharCategoryExtensions.cs index b999ac35b..e908d7501 100644 --- a/SIL.WritingSystems/IcuUCharCategoryExtensions.cs +++ b/SIL.WritingSystems/IcuUCharCategoryExtensions.cs @@ -1,3 +1,4 @@ +using System; using System.Globalization; using Icu; @@ -5,6 +6,7 @@ namespace SIL.WritingSystems { public static class IcuUCharCategoryExtensions { + [CLSCompliant(false)] public static UnicodeCategory ToUnicodeCategory(this Character.UCharCategory category) { switch (category) From 648b834768bbeb02e3b6065fbc47fe55e57c690b Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 6 Jun 2024 14:57:15 +0700 Subject: [PATCH 02/15] temp --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 276c6cadb..d48700da0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461;net48 + net48 Debug;Release SIL International SIL International From 025bfd0ed9cc7e7ff58cb6d5db425ea728721c97 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 6 Jun 2024 14:57:26 +0700 Subject: [PATCH 03/15] revert --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index d48700da0..276c6cadb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net48 + net461;net48 Debug;Release SIL International SIL International From 9fc0ddd33551dd7428cbbeabd16ea0ff06424be3 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 4 Jul 2024 16:06:58 +0700 Subject: [PATCH 04/15] temp --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 276c6cadb..68822ccce 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461;net48 + net461 Debug;Release SIL International SIL International From 63eb19e9ab43eba962fa19f2f6c6b052c78c6359 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 25 Jul 2024 13:41:00 +0700 Subject: [PATCH 05/15] Referencing explicit version of System.Memory Should fix test failures on server --- SIL.Windows.Forms/SIL.Windows.Forms.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj index cb3249148..2d4345e4e 100644 --- a/SIL.Windows.Forms/SIL.Windows.Forms.csproj +++ b/SIL.Windows.Forms/SIL.Windows.Forms.csproj @@ -18,6 +18,7 @@ + From 6d91dfe731ce0fd5a9d3c2c207767550ecff0f26 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 25 Jul 2024 13:56:44 +0700 Subject: [PATCH 06/15] Explicit reference for System.Runtime.CompilerServices.Unsafe --- SIL.Windows.Forms/SIL.Windows.Forms.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj index 2d4345e4e..2c80d61dc 100644 --- a/SIL.Windows.Forms/SIL.Windows.Forms.csproj +++ b/SIL.Windows.Forms/SIL.Windows.Forms.csproj @@ -18,11 +18,11 @@ - + From 3aabed74aa54da465f027c7250964d06a5d5badf Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 25 Jul 2024 14:09:58 +0700 Subject: [PATCH 07/15] revert back to net48 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 68822ccce..276c6cadb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461 + net461;net48 Debug;Release SIL International SIL International From 8cf2f8747696d418f1b918bd3a6b45de52d57165 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 26 Jul 2024 10:48:34 +0700 Subject: [PATCH 08/15] Made one test less brittle It was requiring an error thrown by .NET code to have a very specific message, where, with later versions, a different error is thrown. The newer message is still related to the original, dealing with the path, and the updated test captures the core intent without being so picky. --- SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs b/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs index ff294e983..f14166905 100644 --- a/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs +++ b/SIL.Archiving.Tests/IMDIArchivingDlgViewModelTests.cs @@ -111,7 +111,7 @@ public void IsPathWritable_WindowsInvalidPath_False() var writable = _model.IsPathWritable(dir); Assert.False(writable); Assert.AreEqual(1, m_messages.Count); - Assert.AreEqual("The path is not of a legal form.", m_messages[0].MsgText); + Assert.IsTrue(m_messages[0].MsgText.Contains("path"), "Error should mention the path in its explanation."); Assert.AreEqual(ArchivingDlgViewModel.MessageType.Warning, m_messages[0].MsgType); } @@ -122,7 +122,7 @@ public void IsPathWritable_IllegalCharacterInPath_False() var writable = _model.IsPathWritable(dir); Assert.False(writable); Assert.AreEqual(1, m_messages.Count); - Assert.AreEqual("Illegal characters in path.", m_messages[0].MsgText); + Assert.IsTrue(m_messages[0].MsgText.Contains("path"), "Error should mention the path in its explanation."); Assert.AreEqual(ArchivingDlgViewModel.MessageType.Warning, m_messages[0].MsgType); } From b7c02d054744f70e66fca1980739dd1b5959f0f4 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 26 Jul 2024 11:13:06 +0700 Subject: [PATCH 09/15] Explicitly stripping dots from path end for comparison .NET behavior changed with 4.6.2. See here for more details: https://learn.microsoft.com/th-th/dotnet/framework/migration-guide/mitigation-path-normalization 4.6.1 DirectoryInfo apparently strips ... (and maybe similar tokens, too), particularly for its FullName property, which is being used here. This changed in 4.6.2. Assuming that the test indicates a desire for support, the simplest thing to do is to strip dots for comparison. I also experimented with "Switch.System.IO.UseLegacyPathHandling=true" in the app.config, but this had no discernible impact and generally seems ill-advised. --- SIL.Core/IO/DirectoryHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SIL.Core/IO/DirectoryHelper.cs b/SIL.Core/IO/DirectoryHelper.cs index 19a30df3b..4a9992f4c 100644 --- a/SIL.Core/IO/DirectoryHelper.cs +++ b/SIL.Core/IO/DirectoryHelper.cs @@ -82,7 +82,7 @@ public static bool AreEquivalent(DirectoryInfo dirInfo1, DirectoryInfo dirInfo2) : StringComparison.InvariantCulture; var backslash = new[] { - '\\', '/' + '\\', '/', '.' }; // added this step because mono does not implicitly convert from char to char[] return string.Compare(dirInfo1.FullName.TrimEnd(backslash), dirInfo2.FullName.TrimEnd(backslash), comparison) == 0; From 091fba6c6104255586d83c7fdd9d706b45c42d31 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 26 Jul 2024 12:10:30 +0700 Subject: [PATCH 10/15] Using framework constant --- SIL.Core.Desktop/SIL.Core.Desktop.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SIL.Core.Desktop/SIL.Core.Desktop.csproj b/SIL.Core.Desktop/SIL.Core.Desktop.csproj index 2f66699ee..01fb19467 100644 --- a/SIL.Core.Desktop/SIL.Core.Desktop.csproj +++ b/SIL.Core.Desktop/SIL.Core.Desktop.csproj @@ -11,7 +11,7 @@ - + @@ -20,7 +20,7 @@ - + From 3f28ea3b131ccb582c136c2144a02b866b751874 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 1 Aug 2024 11:59:53 +0700 Subject: [PATCH 11/15] Hopeful revert of GHA (split to another PR) --- ExtractCopyright.Tests/ExtractCopyright.Tests.csproj | 2 +- SIL.Archiving.Tests/SIL.Archiving.Tests.csproj | 2 +- SIL.Archiving/SIL.Archiving.csproj | 2 -- SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj | 2 +- SIL.Core.Tests/SIL.Core.Tests.csproj | 2 +- SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj | 2 +- .../SIL.DictionaryServices.Tests.csproj | 2 +- SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj | 2 +- SIL.Lift.Tests/SIL.Lift.Tests.csproj | 2 +- SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj | 2 +- SIL.Media.Tests/SIL.Media.Tests.csproj | 2 +- SIL.Media/SIL.Media.csproj | 2 -- SIL.Scripture.Tests/SIL.Scripture.Tests.csproj | 2 +- SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj | 2 +- .../SIL.Windows.Forms.Keyboarding.Tests.csproj | 2 +- .../SIL.Windows.Forms.Scripture.Tests.csproj | 2 +- SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj | 2 +- .../SIL.Windows.Forms.WritingSystems.Tests.csproj | 2 +- SIL.Windows.Forms/SIL.Windows.Forms.csproj | 1 - SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj | 2 +- SIL.WritingSystems/SIL.WritingSystems.csproj | 2 -- 21 files changed, 17 insertions(+), 24 deletions(-) diff --git a/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj b/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj index 3acf03217..0c632460d 100644 --- a/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj +++ b/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj b/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj index 918907f46..c7c9f7861 100644 --- a/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj +++ b/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/SIL.Archiving/SIL.Archiving.csproj b/SIL.Archiving/SIL.Archiving.csproj index 5bcf82d5b..14048bbed 100644 --- a/SIL.Archiving/SIL.Archiving.csproj +++ b/SIL.Archiving/SIL.Archiving.csproj @@ -26,8 +26,6 @@ - - diff --git a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj index f29c5cfb6..e6c611a6d 100644 --- a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj +++ b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.Core.Tests/SIL.Core.Tests.csproj b/SIL.Core.Tests/SIL.Core.Tests.csproj index 04becc466..7308c75d2 100644 --- a/SIL.Core.Tests/SIL.Core.Tests.csproj +++ b/SIL.Core.Tests/SIL.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj b/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj index be14c797f..21b726eb3 100644 --- a/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj +++ b/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj b/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj index 11967c049..fdcfdccf9 100644 --- a/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj +++ b/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj b/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj index 1a8105b1d..2f7bcb5e4 100644 --- a/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj +++ b/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Lift.Tests/SIL.Lift.Tests.csproj b/SIL.Lift.Tests/SIL.Lift.Tests.csproj index 23d1db719..7e1115f38 100644 --- a/SIL.Lift.Tests/SIL.Lift.Tests.csproj +++ b/SIL.Lift.Tests/SIL.Lift.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj b/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj index 5cda4581c..ba13f8e6b 100644 --- a/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj +++ b/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Media.Tests/SIL.Media.Tests.csproj b/SIL.Media.Tests/SIL.Media.Tests.csproj index 32411b10c..1159cdd11 100644 --- a/SIL.Media.Tests/SIL.Media.Tests.csproj +++ b/SIL.Media.Tests/SIL.Media.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/SIL.Media/SIL.Media.csproj b/SIL.Media/SIL.Media.csproj index 7e3df89cb..1f7874bc8 100644 --- a/SIL.Media/SIL.Media.csproj +++ b/SIL.Media/SIL.Media.csproj @@ -21,8 +21,6 @@ - - diff --git a/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj b/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj index 927604ab3..7c7489846 100644 --- a/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj +++ b/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj b/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj index 92016a952..51ba14823 100644 --- a/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj +++ b/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj b/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj index a4fa46ae3..4f6f3ead6 100644 --- a/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj +++ b/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj b/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj index 51ba88ea6..9c7c58802 100644 --- a/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj +++ b/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj b/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj index 7d3c9e493..86952b2d8 100644 --- a/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj +++ b/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj @@ -27,7 +27,7 @@ - + diff --git a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj index b40da9856..1a43b5f77 100644 --- a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj +++ b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj index 2c80d61dc..cb3249148 100644 --- a/SIL.Windows.Forms/SIL.Windows.Forms.csproj +++ b/SIL.Windows.Forms/SIL.Windows.Forms.csproj @@ -22,7 +22,6 @@ - diff --git a/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj b/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj index b30da6476..96c2bad3b 100644 --- a/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj +++ b/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/SIL.WritingSystems/SIL.WritingSystems.csproj b/SIL.WritingSystems/SIL.WritingSystems.csproj index 65d4698fd..d3291a524 100644 --- a/SIL.WritingSystems/SIL.WritingSystems.csproj +++ b/SIL.WritingSystems/SIL.WritingSystems.csproj @@ -15,8 +15,6 @@ - - From 6975339a68b4cba648318101df40fa7a6bd9b26a Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 2 Aug 2024 15:24:28 +0700 Subject: [PATCH 12/15] Fix rebase --- ExtractCopyright.Tests/ExtractCopyright.Tests.csproj | 2 +- SIL.Archiving.Tests/SIL.Archiving.Tests.csproj | 2 +- SIL.Archiving/SIL.Archiving.csproj | 2 ++ SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj | 2 +- SIL.Core.Tests/SIL.Core.Tests.csproj | 2 +- SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj | 2 +- .../SIL.DictionaryServices.Tests.csproj | 2 +- SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj | 2 +- SIL.Lift.Tests/SIL.Lift.Tests.csproj | 2 +- SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj | 2 +- SIL.Media.Tests/SIL.Media.Tests.csproj | 2 +- SIL.Media/SIL.Media.csproj | 2 ++ SIL.Scripture.Tests/SIL.Scripture.Tests.csproj | 2 +- SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj | 2 +- .../SIL.Windows.Forms.Keyboarding.Tests.csproj | 2 +- .../SIL.Windows.Forms.Scripture.Tests.csproj | 2 +- SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj | 2 +- .../SIL.Windows.Forms.WritingSystems.Tests.csproj | 2 +- SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj | 2 +- SIL.WritingSystems/SIL.WritingSystems.csproj | 2 ++ 20 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj b/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj index 0c632460d..3acf03217 100644 --- a/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj +++ b/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj b/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj index c7c9f7861..918907f46 100644 --- a/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj +++ b/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/SIL.Archiving/SIL.Archiving.csproj b/SIL.Archiving/SIL.Archiving.csproj index 14048bbed..5bcf82d5b 100644 --- a/SIL.Archiving/SIL.Archiving.csproj +++ b/SIL.Archiving/SIL.Archiving.csproj @@ -26,6 +26,8 @@ + + diff --git a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj index e6c611a6d..f29c5cfb6 100644 --- a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj +++ b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.Core.Tests/SIL.Core.Tests.csproj b/SIL.Core.Tests/SIL.Core.Tests.csproj index 7308c75d2..04becc466 100644 --- a/SIL.Core.Tests/SIL.Core.Tests.csproj +++ b/SIL.Core.Tests/SIL.Core.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj b/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj index 21b726eb3..be14c797f 100644 --- a/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj +++ b/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj b/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj index fdcfdccf9..11967c049 100644 --- a/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj +++ b/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj b/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj index 2f7bcb5e4..1a8105b1d 100644 --- a/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj +++ b/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Lift.Tests/SIL.Lift.Tests.csproj b/SIL.Lift.Tests/SIL.Lift.Tests.csproj index 7e1115f38..23d1db719 100644 --- a/SIL.Lift.Tests/SIL.Lift.Tests.csproj +++ b/SIL.Lift.Tests/SIL.Lift.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj b/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj index ba13f8e6b..5cda4581c 100644 --- a/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj +++ b/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Media.Tests/SIL.Media.Tests.csproj b/SIL.Media.Tests/SIL.Media.Tests.csproj index 1159cdd11..32411b10c 100644 --- a/SIL.Media.Tests/SIL.Media.Tests.csproj +++ b/SIL.Media.Tests/SIL.Media.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/SIL.Media/SIL.Media.csproj b/SIL.Media/SIL.Media.csproj index 1f7874bc8..7e3df89cb 100644 --- a/SIL.Media/SIL.Media.csproj +++ b/SIL.Media/SIL.Media.csproj @@ -21,6 +21,8 @@ + + diff --git a/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj b/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj index 7c7489846..927604ab3 100644 --- a/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj +++ b/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj b/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj index 51ba14823..92016a952 100644 --- a/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj +++ b/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj b/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj index 4f6f3ead6..a4fa46ae3 100644 --- a/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj +++ b/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj b/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj index 9c7c58802..51ba88ea6 100644 --- a/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj +++ b/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj b/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj index 86952b2d8..7d3c9e493 100644 --- a/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj +++ b/SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj @@ -27,7 +27,7 @@ - + diff --git a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj index 1a43b5f77..b40da9856 100644 --- a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj +++ b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj b/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj index 96c2bad3b..b30da6476 100644 --- a/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj +++ b/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/SIL.WritingSystems/SIL.WritingSystems.csproj b/SIL.WritingSystems/SIL.WritingSystems.csproj index d3291a524..65d4698fd 100644 --- a/SIL.WritingSystems/SIL.WritingSystems.csproj +++ b/SIL.WritingSystems/SIL.WritingSystems.csproj @@ -15,6 +15,8 @@ + + From 45113cbad5efa8de6dc305c67250c808d4f4a68f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 2 Aug 2024 16:15:45 +0700 Subject: [PATCH 13/15] Upping the timeout --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 127dd1e35..4c6d55181 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: jobs: build: - timeout-minutes: 30 + timeout-minutes: 60 runs-on: windows-latest steps: From 97396359fc9d1bb5ba5cb97711acdd4f15b8aded Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 2 Aug 2024 16:29:34 +0700 Subject: [PATCH 14/15] Ignoring a number of the long-running tests A couple are still being executed on the server --- SIL.WritingSystems.Tests/SldrTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SIL.WritingSystems.Tests/SldrTests.cs b/SIL.WritingSystems.Tests/SldrTests.cs index db8cd7cc6..cff4632a7 100644 --- a/SIL.WritingSystems.Tests/SldrTests.cs +++ b/SIL.WritingSystems.Tests/SldrTests.cs @@ -155,6 +155,7 @@ public void GetLdmlFile_LanguageTagWithSuppressedScript_DownloadsFile() #region SLDR cache [Test] + [Category("SkipOnTeamCity")] public void GetLdmlFile_CacheFileWithUid_StatusFileFromSldrCache() { using var environment = new TestEnvironment(); @@ -182,6 +183,7 @@ public void GetLdmlFile_CacheFileWithUid_StatusFileFromSldrCache() } [Test] + [Category("SkipOnTeamCity")] public void GetLdmlFile_CacheFileWithUidUnknown_StatusFileFromSldrCache() { using var environment = new TestEnvironment(); @@ -249,6 +251,7 @@ public void GetLdmlFile_SldrCacheDestinationPath_ReturnsCacheFile() } [Test] + [Category("SkipOnTeamCity")] public void GetLdmlFile_SldrStagingEnvironmentVariable_UsesStagingUrl() { var originalStagingValue = Environment.GetEnvironmentVariable(Sldr.SldrStaging); @@ -283,6 +286,7 @@ public void GetLdmlFile_NotModified_DoesntDownloadNewFile() [Test] [Category("LongRunning")] // ~2 minutes [Category("ByHand")] // The following test tests a smaller sample each checkin; this can be used when a larger sample needs to be tested. + [Category("SkipOnTeamCity")] public void GetLdmlFile_GetsValidLDML([Values("false", "true")] string isStaging, [Values("ar", "az", "bn", "de", "en", "es", "en-GB", "fa", "fr", "hi", "hu", "id", "km", "ko", "ml", "ms", "my", "ne", "pt", "ru", "rw", "sw", "ta", "te", "th", "tr", "ur", "vi", "zh", "zh-CN")] string ietfLanguageTag) @@ -291,6 +295,7 @@ public void GetLdmlFile_GetsValidLDML([Values("false", "true")] string isStaging } [Test] + [Category("SkipOnTeamCity")] public void GetLdmlFile_GetsValidLDML([Values("ar", "en", "fr", "ko", "sw")] string ietfLanguageTag) { DownloadAndVerifyLDML("false", ietfLanguageTag); From 673060750de52201b11030e0a8e193340ae3ff1d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 23 Aug 2024 10:48:55 +0700 Subject: [PATCH 15/15] Added Framework 4.8 for projects overriding TargetFrameworks --- SIL.Core.Desktop/SIL.Core.Desktop.csproj | 2 +- SIL.Core/PlatformUtilities/Platform.cs | 2 +- SIL.Core/SIL.Core.csproj | 2 +- SIL.DblBundle/SIL.DblBundle.csproj | 2 +- SIL.DictionaryServices/SIL.DictionaryServices.csproj | 2 +- SIL.Lexicon/SIL.Lexicon.csproj | 2 +- SIL.Lift/SIL.Lift.csproj | 2 +- SIL.Linux.Logging/SIL.Linux.Logging.csproj | 2 +- SIL.Scripture/SIL.Scripture.csproj | 2 +- SIL.TestUtilities/SIL.TestUtilities.csproj | 2 +- SIL.WritingSystems/SIL.WritingSystems.csproj | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/SIL.Core.Desktop/SIL.Core.Desktop.csproj b/SIL.Core.Desktop/SIL.Core.Desktop.csproj index 01fb19467..493500070 100644 --- a/SIL.Core.Desktop/SIL.Core.Desktop.csproj +++ b/SIL.Core.Desktop/SIL.Core.Desktop.csproj @@ -6,7 +6,7 @@ SIL prompt 4 - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 diff --git a/SIL.Core/PlatformUtilities/Platform.cs b/SIL.Core/PlatformUtilities/Platform.cs index f01f95fb1..191d229cc 100644 --- a/SIL.Core/PlatformUtilities/Platform.cs +++ b/SIL.Core/PlatformUtilities/Platform.cs @@ -39,7 +39,7 @@ public static bool IsMono public static bool IsPreWindows10 => IsWindows && OperatingSystemDescription != "Windows 10"; -#if NETSTANDARD2_0 +#if NETSTANDARD2_0 || NET471_OR_GREATER public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux); public static bool IsMac => RuntimeInformation.IsOSPlatform(OSPlatform.OSX); public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows); diff --git a/SIL.Core/SIL.Core.csproj b/SIL.Core/SIL.Core.csproj index c9895e467..3531e3b58 100644 --- a/SIL.Core/SIL.Core.csproj +++ b/SIL.Core/SIL.Core.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 SIL.Core provides general utilities for language software. It is the base library for all Palaso libraries. diff --git a/SIL.DblBundle/SIL.DblBundle.csproj b/SIL.DblBundle/SIL.DblBundle.csproj index 2eaac0386..e2395fc01 100644 --- a/SIL.DblBundle/SIL.DblBundle.csproj +++ b/SIL.DblBundle/SIL.DblBundle.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 SIL.DblBundle SIL.DblBundle SIL.DblBundle provides classes for building a Digital Bible Library (DBL) bundle. diff --git a/SIL.DictionaryServices/SIL.DictionaryServices.csproj b/SIL.DictionaryServices/SIL.DictionaryServices.csproj index a950dc26a..b42f7ee53 100644 --- a/SIL.DictionaryServices/SIL.DictionaryServices.csproj +++ b/SIL.DictionaryServices/SIL.DictionaryServices.csproj @@ -4,7 +4,7 @@ SIL.DictionaryServices SIL.DictionaryServices SIL.DictionaryServices contains classes for defining a simple lexical model that can be used across applications. - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 diff --git a/SIL.Lexicon/SIL.Lexicon.csproj b/SIL.Lexicon/SIL.Lexicon.csproj index ab5ffecff..afcbb3394 100644 --- a/SIL.Lexicon/SIL.Lexicon.csproj +++ b/SIL.Lexicon/SIL.Lexicon.csproj @@ -4,7 +4,7 @@ SIL.Lexicon SIL.Lexicon SIL.Lexicon contains various lexicon utility classes that can be used across applications. Currently, this assembly contains classes for persisting lexicon settings that can be shared by different lexicon applications. - net461;netstandard2.0 + $(TargetFrameworks);netstandard2.0 diff --git a/SIL.Lift/SIL.Lift.csproj b/SIL.Lift/SIL.Lift.csproj index 19f7297a1..acde7ba79 100644 --- a/SIL.Lift/SIL.Lift.csproj +++ b/SIL.Lift/SIL.Lift.csproj @@ -3,7 +3,7 @@ SIL.Lift SIL.Lift SIL.Lift contains classes for reading and writing Lexicon Interchange FormaT (LIFT) data. This assembly currently supports LIFT 0.13. - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 diff --git a/SIL.Linux.Logging/SIL.Linux.Logging.csproj b/SIL.Linux.Logging/SIL.Linux.Logging.csproj index 0366f157c..d76076110 100644 --- a/SIL.Linux.Logging/SIL.Linux.Logging.csproj +++ b/SIL.Linux.Logging/SIL.Linux.Logging.csproj @@ -4,7 +4,7 @@ SIL.Linux.Logging SIL.Linux.Logging SIL.Linux.Logging provides a library to log to the syslog service. - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 diff --git a/SIL.Scripture/SIL.Scripture.csproj b/SIL.Scripture/SIL.Scripture.csproj index fee3aaff1..aff3dc4e0 100644 --- a/SIL.Scripture/SIL.Scripture.csproj +++ b/SIL.Scripture/SIL.Scripture.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 SIL.Scripture SIL.Scripture SIL.Scripture provides classes for working with Scripture data such as references and versifications. diff --git a/SIL.TestUtilities/SIL.TestUtilities.csproj b/SIL.TestUtilities/SIL.TestUtilities.csproj index 0dfd5702d..c5067785f 100644 --- a/SIL.TestUtilities/SIL.TestUtilities.csproj +++ b/SIL.TestUtilities/SIL.TestUtilities.csproj @@ -4,7 +4,7 @@ SIL.TestUtilities SIL.TestUtilities SIL.TestUtilities contains convenience classes for developing unit tests. - net461;netstandard2.0 + $(TargetFrameworks);netstandard2.0 diff --git a/SIL.WritingSystems/SIL.WritingSystems.csproj b/SIL.WritingSystems/SIL.WritingSystems.csproj index 65d4698fd..9b688c402 100644 --- a/SIL.WritingSystems/SIL.WritingSystems.csproj +++ b/SIL.WritingSystems/SIL.WritingSystems.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net461 + $(TargetFrameworks);netstandard2.0 SIL.WritingSystems contains classes for managing and persisting writing systems using the Locale Data Markup Language (LDML) format. This library also contains classes for processing IETF (BCP-47) language tags and accessing the SIL Locale Data Repository (SLDR). @@ -20,7 +20,7 @@ - +