Skip to content

Hotfix/9.2.11 #465

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

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

Hotfix/9.2.11 #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b8b050
Bump version to 9.2.11
jasonleenaylor Sep 11, 2025
900109f
Fix LT-22249: Don't modify existing analysis on flextext import (#442)
jasonleenaylor Aug 21, 2025
db3ab36
Fix LT-22267: Slow response in interlinear combos (#445)
jtmaxwell3 Aug 20, 2025
5a1e101
LT-22185: XHTML: Fix style when there are multiple ws (#454)
mark-sil Sep 3, 2025
e44fc32
Pin System.Buffers dependency to nuget package serving 4.0.3
jasonleenaylor Sep 22, 2025
50bdcd9
Fix the assembly stamping of the base build after moving to gha
jasonleenaylor Sep 29, 2025
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
12 changes: 6 additions & 6 deletions Build/Src/FwBuildTasks/Substitute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions Build/mkall.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions Build/nuget-common/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading
Loading