Merge hotfix/9.2.11 into master

Author: jasonleenaylor

Build/Src/FwBuildTasks/Substitute.cs

@@ -77,19 +77,19 @@ public override bool Execute()
 				var numberOfDays = Convert.ToInt32(Math.Truncate(DateTime.Now.ToOADate())).ToString();
 				fileContents = regex.Replace(fileContents, numberOfDays);
 
-				// Jenkins builds should set the BUILD_NUMBER in the environment
-				var buildNumber = Environment.GetEnvironmentVariable("BUILD_NUMBER");
+				// GHA builds set the RELEASE_BASE_BUILD_NUMBER in the environment
+				var buildNumber = Environment.GetEnvironmentVariable("RELEASE_BASE_BUILD_NUMBER");
 				if (string.IsNullOrEmpty(buildNumber))
 				{
-					// fall back to number of days if no BUILD_NUMBER is in the environment
+					// fall back to number of days if no RELEASE_BASE_BUILD_NUMBER is in the environment
 					buildNumber = numberOfDays;
 				}
 				regex = new Regex("\\$BUILDNUMBER");
 				fileContents = regex.Replace(fileContents, buildNumber);
 
-				// If BaseBuildish is set, this is a patch build: use BaseBuildish;
-				// otherwise, this is a base build: use BUILD_NUMBER
-				var baseBuildNumber = Environment.GetEnvironmentVariable("BaseBuildish");
+				// If BASE_BUILD_NUMBER is set, this is a patch build: use BASE_BUILD_NUMBER;
+				// otherwise, this is a base build: use buildNumber
+				var baseBuildNumber = Environment.GetEnvironmentVariable("BASE_BUILD_NUMBER");
 				if (string.IsNullOrEmpty(baseBuildNumber))
 				{
 					baseBuildNumber = buildNumber;

Build/mkall.targets

@@ -329,6 +329,7 @@
 		<PalasoFiles Include="SIL.Windows.Forms.Archiving.dll"/>
 		<PalasoFiles Include="SIL.Windows.Forms.Archiving.dll.config" Condition="'$(OS)'=='Unix'"/>
 		<PalasoFiles Include="SIL.Windows.Forms.WritingSystems.dll"/>
+		<PalasoFiles Include="System.Buffers.dll"/>
 		<PalasoFiles Include="System.Drawing.Common.dll"/>
 		<PalasoFiles Include="System.Drawing.Common.pdb"/>
 		<PalasoFiles Include="System.Memory.dll"/>
@@ -519,6 +520,7 @@
 			<SILNugetPackages Include="SIL.WritingSystems"><Version>$(PalasoNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
 			<SILNugetPackages Include="SIL.WritingSystems.Tests"><Version>$(PalasoNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
 			<SILNugetPackages Include="System.Drawing.Common"><Version>9.0.0</Version><Path>lib/net462/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
+			<SILNugetPackages Include="System.Buffers"><Version>4.5.1</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
 			<SILNugetPackages Include="System.Memory"><Version>4.5.4</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
 			<SILNugetPackages Include="System.Resources.Extensions"><Version>4.6.0</Version><Path>lib/netstandard2.0/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
 			<SILNugetPackages Include="L10NSharp"><Version>7.0.0</Version><Path>lib/net461/*.*</Path></SILNugetPackages>

Build/nuget-common/packages.config

@@ -78,6 +78,7 @@
   <package id="SIL.WritingSystems" version="15.0.0-beta0117"  targetFramework="net461" />
   <package id="Spart" version="1.0.0" targetFramework="net461" />
   <package id="structuremap.patched" version="4.7.3" exclude="Build,Analyzers" />
+  <package id="System.Buffers" version="4.5.1" />
   <package id="System.Drawing.Common" version="9.0.0" />
   <package id="System.Memory" version="4.5.4" />
   <package id="System.Net.Http" version="4.3.4" />