Merge pull request #1350 from sillsdev/sil-global

Changed copyrights from SIL International to SIL Global (#1350)
sillsdev · Oct 28, 2024 · 74f9b02 · 74f9b02
2 parents b896e28 + 73daac3
commit 74f9b02
Show file tree

Hide file tree

Showing 248 changed files with 828 additions and 945 deletions.
diff --git a/AddSortKey/AddSortKey.csproj b/AddSortKey/AddSortKey.csproj
@@ -7,10 +7,10 @@
     <AssemblyName>AddSortKey</AssemblyName>
     <Configurations>Debug;Release</Configurations>
     <Description>AddSortKey tool</Description>
-    <Company>SIL International</Company>
-    <Authors>SIL International</Authors>
+    <Company>SIL Global</Company>
+    <Authors>SIL Global</Authors>
     <Product>libpalaso</Product>
-    <Copyright>Copyright © 2010-2020 SIL International</Copyright>
+    <Copyright>Copyright © 2010-2024 SIL Global</Copyright>
     <OutputPath>../output/$(Configuration)</OutputPath>
     <SignAssembly>true</SignAssembly>
     <WarningsAsErrors>NU1605;CS8002</WarningsAsErrors>

diff --git a/ExtractCopyright.Tests/ExtractCopyrightTests.cs b/ExtractCopyright.Tests/ExtractCopyrightTests.cs
@@ -1,11 +1,12 @@
-// Copyright (c) 2017-2018 SIL International
+// Copyright (c) 2017-2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Text;
 using NUnit.Framework;
+using static System.String;
 
 namespace SIL.Tests.ExtractCopyright
 {
@@ -293,7 +294,7 @@ public void ParseControlContentForValuesWorks()
 			Assert.AreEqual("https://github.com/BloomBooks/BloomDesktop", sourceUrl);
 		}
 
-		readonly string[] _changelogLines = new string[] {
+		readonly string[] _changelogLines = {
 			"bloom-desktop-alpha (3.9.0) stable; urgency=medium",
 			"",
 			"  * Up the version number on the master (unstable/alpha) branch to 3.9.",
@@ -336,7 +337,7 @@ public void ParseChangelogContentForValuesWorks()
 
 			// ignore programName if already set, set contactEmail if empty
 			programName = "bloom-desktop";
-			contactEmail = String.Empty;
+			contactEmail = Empty;
 			SIL.ExtractCopyright.CopyrightFile.ParseChangelogContentForValues(_changelogLines, ref programName, ref contactEmail);
 			Assert.AreEqual("bloom-desktop", programName);
 			Assert.AreEqual("Stephen McConnel <[email protected]>", contactEmail);

diff --git a/ExtractCopyright/CopyrightFile.cs b/ExtractCopyright/CopyrightFile.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 using System;
 using System.IO;
@@ -156,7 +156,7 @@ public static CopyrightFile CreateNewCopyrightFile(string programName, string co
 			para.Fields.Add(new DebianField("Source", sourceUrl));
 
 			// REVIEW: can we assume these values?
-			var programCopyright = String.Format("{0} SIL International", DateTime.Now.Year);
+			var programCopyright = String.Format("{0} SIL Global", DateTime.Now.Year);
 			var programLicense = "MIT";
 
 			para = new DebianParagraph();

diff --git a/ExtractCopyright/DebianControl.cs b/ExtractCopyright/DebianControl.cs
@@ -1,11 +1,9 @@
-// Copyright (c) 2017 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace SIL.ExtractCopyright
 {

diff --git a/ExtractCopyright/DebianField.cs b/ExtractCopyright/DebianField.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 using System;
 using System.Collections.Generic;

diff --git a/ExtractCopyright/DebianParagraph.cs b/ExtractCopyright/DebianParagraph.cs
@@ -1,6 +1,5 @@
-// Copyright (c) 2017 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
-using System;
 using System.Collections.Generic;
 
 namespace SIL.ExtractCopyright
@@ -13,16 +12,10 @@ public class DebianParagraph
 	{
 		public List<DebianField> Fields = new List<DebianField>();
 
-		public DebianParagraph()
-		{
-		}
-
 		public override string ToString ()
 		{
-			if (Fields.Count == 0)
-				return string.Format ("[empty DebianParagraph]");
-			else
-				return string.Format("[Fields[0] = {0}: {1}] + {2} more fields", Fields[0].Tag, Fields[0].Value, Fields.Count - 1);
+			return Fields.Count == 0 ? "[empty DebianParagraph]" :
+				$"[Fields[0] = {Fields[0].Tag}: {Fields[0].Value}] + {Fields.Count - 1} more fields";
 		}
 
 		/// <summary>

diff --git a/ExtractCopyright/ExtractCopyright.csproj b/ExtractCopyright/ExtractCopyright.csproj
@@ -2,10 +2,13 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>ExtractCopyright</RootNamespace>
+    <RootNamespace>SIL.ExtractCopyright</RootNamespace>
     <AssemblyName>ExtractCopyright</AssemblyName>
     <Description>ExtractCopyright tool</Description>
     <IsPackable>false</IsPackable>
+    <Authors>SIL Global</Authors>
+    <Company>SIL Global</Company>
+    <Copyright>Copyright © 2010-2024 SIL Global</Copyright>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ExtractCopyright/Program.cs b/ExtractCopyright/Program.cs
@@ -1,7 +1,8 @@
-// Copyright (c) 2017-2020 SIL International
+// Copyright (c) 2017-2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 using System;
 using System.IO;
+using static System.String;
 
 namespace SIL.ExtractCopyright
 {
@@ -41,10 +42,10 @@ static int Main(string[] args)
 			{
 				var current = Directory.GetCurrentDirectory();
 				debianFolder = Path.Combine(current, "debian");
-				while (!string.IsNullOrEmpty(current) && !Directory.Exists(debianFolder))
+				while (!IsNullOrEmpty(current) && !Directory.Exists(debianFolder))
 				{
 					current = Path.GetDirectoryName(current);
-					if (!string.IsNullOrEmpty(current))
+					if (!IsNullOrEmpty(current))
 						debianFolder = Path.Combine(current, "debian");
 				}
 				if (Directory.Exists(debianFolder))
@@ -62,13 +63,12 @@ static int Main(string[] args)
 			}
 
 			// If the user didn't supply the prefix folder, use an empty string.
-			if (prefixFolder == null)
-				prefixFolder = String.Empty;
+			prefixFolder ??= Empty;
 
 			return CopyrightFile.CreateOrUpdateCopyrightFile(debianFolder, prefixFolder);
 		}
 
-		static int ShowUsage(CopyrightFile.ExitValue retval)
+		private static int ShowUsage(CopyrightFile.ExitValue retval)
 		{
 			Console.WriteLine("ExtractCopyright creates or updates the Debian copyright file from the");
 			Console.WriteLine("acknowledgements embedded in the .Net assemblies.  It is highly recommended");

diff --git a/Palaso.sln.DotSettings b/Palaso.sln.DotSettings
@@ -24,6 +24,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Abridgement/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=acknowledgements/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=adaptor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ALSA/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=analytics/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Andika/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Annotatable/@EntryIndexedValue">True</s:Boolean>
@@ -56,6 +57,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ethnologue/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ethnomusicology/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=etic/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=exiftool/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=FFmpeg/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=FFprobe/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=filenames/@EntryIndexedValue">True</s:Boolean>
@@ -88,6 +90,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mets/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=migrator/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=modally/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=nunit/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=OLAC/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=optimizable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Organisation/@EntryIndexedValue">True</s:Boolean>
@@ -100,7 +103,11 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Qaaa/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ransomware/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=reentrant/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=reimplements/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=retval/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Saami/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sandboxed/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=sandboxing/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=SIL_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=SLDR/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=standarderror/@EntryIndexedValue">True</s:Boolean>
@@ -110,6 +117,8 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=taskbar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=triglot/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=versifications/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=vshost/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wasta/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wiktionary/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=xkal/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=xklavier/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/SIL.Archiving.Tests/ArchivingFileSystemTests.cs b/SIL.Archiving.Tests/ArchivingFileSystemTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2020 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;

diff --git a/SIL.Archiving/Generic/ArchivingFileSystem.cs b/SIL.Archiving/Generic/ArchivingFileSystem.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2020 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;
@@ -29,16 +29,12 @@ public static string SilCommonDataFolder
 		}
 
 		/// <summary />
-		public static string SilCommonArchivingDataFolder
-		{
-			get { return CheckFolder(Path.Combine(SilCommonDataFolder, kAccessProtocolFolderName)); }
-		}
+		public static string SilCommonArchivingDataFolder =>
+			CheckFolder(Path.Combine(SilCommonDataFolder, kAccessProtocolFolderName));
 
 		/// <summary />
-		public static string SilCommonIMDIDataFolder
-		{
-			get { return CheckFolder(Path.Combine(SilCommonArchivingDataFolder, "IMDI")); }
-		}
+		public static string SilCommonIMDIDataFolder =>
+			CheckFolder(Path.Combine(SilCommonArchivingDataFolder, "IMDI"));
 
 		/// <summary />
 		public static string CheckFolder(string folderName)

diff --git a/SIL.Archiving/Properties/AssemblyInfo.cs b/SIL.Archiving/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2024 SIL International
+// Copyright (c) 2016-2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;

diff --git a/SIL.Archiving/SIL.Archiving.csproj b/SIL.Archiving/SIL.Archiving.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="DotNetZip" Version="1.16.0" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1">
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

diff --git a/SIL.Core.Desktop.Tests/IO/DirectoryUtilitiesTests.cs b/SIL.Core.Desktop.Tests/IO/DirectoryUtilitiesTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System.IO;

diff --git a/SIL.Core.Desktop.Tests/IO/FileLocatorTests.cs b/SIL.Core.Desktop.Tests/IO/FileLocatorTests.cs
@@ -1,11 +1,8 @@
-// Copyright (c) 2018 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
-using System;
-using System.IO;
 using NUnit.Framework;
 using SIL.IO;
-using SIL.PlatformUtilities;
 using SIL.Reporting;
 
 namespace SIL.Tests.IO
@@ -19,9 +16,9 @@ public void LocateFile_ErrorMessageProvidedAndFileNoteFound_WouldShowErrorReport
 			var locator = new FileLocator(new[] {"bogus"});
 			ErrorReport.IsOkToInteractWithUser = false;
 			Assert.Throws<ErrorReport.ProblemNotificationSentToUserException>(() =>
-																				{
-																  locator.LocateFile("foo.txt", "booo hooo");
-																				});
+				{
+					locator.LocateFile("foo.txt", "booo hooo");
+				});
 		}
 
 		[Test]

diff --git a/SIL.Core.Desktop.Tests/SetupFixture.cs b/SIL.Core.Desktop.Tests/SetupFixture.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 SIL International
+// Copyright (c) 2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using NUnit.Framework;

diff --git a/SIL.Core.Desktop.Tests/UsbDrive/UsbDeviceInfoTests.cs b/SIL.Core.Desktop.Tests/UsbDrive/UsbDeviceInfoTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2016 SIL International
+// Copyright (c) 2009-2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;

diff --git a/SIL.Core.Desktop/IO/DirectoryUtilities.cs b/SIL.Core.Desktop/IO/DirectoryUtilities.cs
@@ -1,11 +1,12 @@
-// Copyright (c) 2017-2018 SIL International
+// Copyright (c) 2017-2024 SIL Global
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;
 using System.IO;
 using System.Linq;
 using System.Security.AccessControl;
 using System.Security.Principal;
+using JetBrains.Annotations;
 using SIL.PlatformUtilities;
 using SIL.Reporting;
 
@@ -26,13 +27,12 @@ public static class DirectoryUtilities
 		/// <returns>Null if the copy was unsuccessful, otherwise the path to the copied directory</returns>
 		public static string CopyDirectoryToTempDirectory(string srcDirectory)
 		{
-			string dstDirectory;
-			return (CopyDirectory(srcDirectory, Path.GetTempPath(), out dstDirectory) ? dstDirectory : null);
+			return CopyDirectory(srcDirectory, Path.GetTempPath(), out var dstDirectory) ? dstDirectory : null;
 		}
 
 
 		/// <summary>
-		/// Makes a copy of the specifed source directory and its contents in the specified
+		/// Makes a copy of the specified source directory and its contents in the specified
 		/// destination directory. The copy has the same directory name as the source, but ends up
 		/// as a sub directory of the specified destination directory. The destination directory must
 		/// already exist. If the copy fails at any point in the process, the user is notified
@@ -119,6 +119,7 @@ private static void ReportFailedCopyAndCleanUp(Exception error, string srcDirect
 		/// <param name="fullDirectoryPath"></param>
 		/// <param name="showErrorMessage"></param>
 		/// <returns>True if able to set access, False otherwise</returns>
+		[PublicAPI]
 		public static bool SetFullControl(string fullDirectoryPath, bool showErrorMessage = true)
 		{
 			if (!Platform.IsWindows)