Skip to content

Commit 0a1fe2f

Browse files
DavidBlaaDavidBlaa
authored
Merge pull request #2329 from BEXIS2/rc
Rc release 4.2.1
2 parents 950f7ac + 806b20e commit 0a1fe2f

File tree

57 files changed

+792
-950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+792
-950
lines changed

‎BExIS++.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,8 +1606,8 @@ Global
16061606
{37402CAB-EB81-4D08-8791-8653949C0FEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
16071607
EndGlobalSection
16081608
GlobalSection(ExtensibilityGlobals) = postSolution
1609-
SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
16101609
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
1610+
SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
16111611
EndGlobalSection
16121612
GlobalSection(SubversionScc) = preSolution
16131613
Svn-Managed = True

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cff-version: 1.2.0
22
message: "If you use BEXIS2 in your research, please cite it using the following metadata."
33
title: "BEXIS2"
4-
version: 4.1.0
5-
date-released: 15.08.2025
4+
version: 4.2.1
5+
date-released: 05.01.2026
66
authors:
77
- family-names: "Zander"
88
given-names: "Franziska"

‎Components/App/BExIS.App.Bootstrap/Attributes/BExISAuthorizeAttribute.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ public override void OnAuthorization(AuthorizationContext filterContext)
5050
if (!featurePermissionManager.HasAccessAsync(user.Id, feature.Id).Result)
5151
{
5252
filterContext.SetResponse(HttpStatusCode.Forbidden);
53-
54-
55-
5653
}
5754

5855
// update jwt cookie

‎Components/IO/BExIS.IO.Tests/IOUtilityTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ public void OneTimeTearDown()
8383
[TestCase("13:00 AM", "hh:mm tt", "1/1/0001 11:00:00 PM", false)]
8484
[TestCase("2017", "yyyy", "1/1/2017 12:00:00 AM", true)]
8585
[TestCase("1", "MM", "1/1/0001 12:00:00 AM", true)]
86-
[TestCase("jan", "MMM", "1/1/2025 12:00:00 AM", true)]
86+
[TestCase("jan", "MMM", "1/1/2026 12:00:00 AM", true)]
8787
[TestCase("01", "MM", "1/1/0001 12:00:00 AM", true)]
88-
[TestCase("january", "MMMM", "1/1/2025 12:00:00 AM", true)]
89-
[TestCase("Januar", "MMMM", "1/1/2025 12:00:00 AM", true, "de-de")]
88+
[TestCase("january", "MMMM", "1/1/2026 12:00:00 AM", true)]
89+
[TestCase("Januar", "MMMM", "1/1/2026 12:00:00 AM", true, "de-de")]
9090
[TestCase("24/10/2017", "MM/dd/yyyy", "10/24/2017 12:00:00 AM", false)]
9191
[TestCase("2006-2-2", "yyyy-M-d", "2/2/2006 12:00:00 AM", true)]
9292
[TestCase("2006-02-02", "yyyy-MM-dd", "2/2/2006 12:00:00 AM", true)]
@@ -167,10 +167,10 @@ public void ConvertStringToDateTimeWithpatternTest(string input, string pattern,
167167
[TestCase("13:00 AM", "hh:mm tt", "1/1/0001 11:00:00 PM", false)]
168168
[TestCase("2017", "yyyy", "1/1/2017 12:00:00 AM", true)]
169169
[TestCase("1", "MM", "1/1/0001 12:00:00 AM", true)]
170-
[TestCase("jan", "MMM", "1/1/2025 12:00:00 AM", true)]
170+
[TestCase("jan", "MMM", "1/1/2026 12:00:00 AM", true)]
171171
[TestCase("01", "MM", "1/1/0001 12:00:00 AM", true)]
172-
[TestCase("january", "MMMM", "1/1/2025 12:00:00 AM", true)]
173-
[TestCase("Januar", "MMMM", "1/1/2025 12:00:00 AM", true, "de-de")]
172+
[TestCase("january", "MMMM", "1/1/2026 12:00:00 AM", true)]
173+
[TestCase("Januar", "MMMM", "1/1/2026 12:00:00 AM", true, "de-de")]
174174
[TestCase("24/10/2017", "MM/dd/yyyy", "10/24/2017 12:00:00 AM", false)]
175175
[TestCase("2006-2-2", "yyyy-M-d", "2/2/2006 12:00:00 AM", true)]
176176
[TestCase("2006-02-02", "yyyy-MM-dd", "2/2/2006 12:00:00 AM", true)]

‎Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public void GenerateSeedData()
4040

4141
var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings);
4242

43-
if (!versionManager.Exists("Shell", "4.2.0"))
43+
if (!versionManager.Exists("Shell", "4.2.1"))
4444
{
45-
versionManager.Create("Shell", "4.2.0");
45+
versionManager.Create("Shell", "4.2.1");
4646
}
4747
}
4848
}

‎Components/Utils/BExIS.Utils/Helpers/ManualHelper.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public static string GetUrl(string url)
1010
if (string.IsNullOrEmpty(url)) return docsUrl+"general";
1111

1212
//2. URL is set and no url -> generate link to internal documentation
13-
1413
if (url.Contains("http")) return url;
1514

1615

‎Components/XML/BExIS.Xml.Helpers.UnitTests/ConvertTo_JsonToXmlArray.xml‎

Lines changed: 166 additions & 422 deletions
Large diffs are not rendered by default.

‎Components/XML/BExIS.Xml.Helpers/XmlMetadataWriter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ public XDocument AddAttribute(XDocument metadataXml, BaseUsage attributeUsage, i
778778
{
779779
_tempXDoc = metadataXml;
780780

781-
if (!!XmlUtility.IsSafeXPath(parentXPath))
781+
if (!XmlUtility.IsSafeXPath(parentXPath))
782782
{
783783
throw new ArgumentException("Potentially unsafe xpath expression.");
784784
}

‎Components/XML/BExIS.Xml.Helpers/XmlUtility.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static bool IsSafeXPath(string xpath)
2222
// Only allow XPaths like /a/b/c or /a[1]/b matches, no function calls, no quotes, etc.
2323
// You can adjust the pattern according to the actual requirements.
2424
// This only allows: /node1/node2/...
25-
var safePattern = @"^(/[a-zA-Z_][\w\-]*(\[\d+\])?)*$";
25+
var safePattern = @"^(/?/?[a-zA-Z_][\w\-]*(\[\d+\])?)*$";
2626
return System.Text.RegularExpressions.Regex.IsMatch(xpath, safePattern);
2727
}
2828

‎Console/BExIS.Web.Shell.Svelte/package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)