Merge branch 'main' of https://github.com/microsoft/BCApps into featu…

…res/549296

.github/AL-Go-Settings.json

@@ -5,7 +5,7 @@
   "runs-on": "windows-latest",
   "cacheImageName": "",
   "UsePsSession": false,
-  "artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/26.0.24443.0/base",
+  "artifact": "https://bcinsider-fvh2ekdjecfjd6gk.b02.azurefd.net/sandbox/26.0.24595.0/base",
   "country": "base",
   "useProjectDependencies": true,
   "repoVersion": "26.0",

.github/workflows/MSDO.yml

@@ -27,6 +27,6 @@ jobs:
           tools: credscan
 
       - name: Upload results to Security tab
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           sarif_file: ${{ steps.credscan.outputs.sarifFile }}

.github/workflows/PowerShell.yaml

@@ -33,7 +33,7 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           sarif_file: results.sarif
 

.github/workflows/scorecard-analysis.yml

@@ -29,6 +29,6 @@ jobs:
           results_format: sarif
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v2.16.4
+        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v2.16.4
         with:
           sarif_file: results.sarif

build/Packages.json

@@ -1,10 +1,10 @@
 {
   "Microsoft.Dynamics.BusinessCentral.Translations": {
-    "Version": "26.0.20240916.5",
+    "Version": "26.0.20240919.5",
     "Source": "NuGet.org"
   },
   "AppBaselines-BCArtifacts": {
-    "Version": "25.1.24274.0",
+    "Version": "25.1.24594.0",
     "Source": "BCArtifacts",
     "_comment": "Used to fetch app baselines from BC artifacts"
   }

src/System Application/App/Edit in Excel/src/EditinExcelImpl.Codeunit.al

@@ -28,6 +28,7 @@ codeunit 1482 "Edit in Excel Impl."
         ExcelFileNameTxt: Text;
         XmlByteEncodingTok: Label '_x00%1_%2', Locked = true;
         XmlByteEncoding2Tok: Label '%1_x00%2_%3', Locked = true;
+        XmlByteEncoding3Tok: Label '%1_%2_%3', Locked = true;
 
     procedure EditPageInExcel(PageCaption: Text[240]; PageId: Integer; EditinExcelFilters: Codeunit "Edit in Excel Filters"; FileName: Text)
     var
@@ -100,7 +101,7 @@ codeunit 1482 "Edit in Excel Impl."
             VarFieldRef := VarKeyRef.FieldIndex(KeyFieldNumber);
 
             if not AddedFields.Contains(VarFieldRef.Number) then begin // Make sure we don't add the same field twice
-                // Add missing key fields at the beginning
+                                                                       // Add missing key fields at the beginning
                 EditinExcelWorkbook.InsertColumn(0, VarFieldRef.Caption, ExternalizeODataObjectName(VarFieldRef.Name));
                 AddedFields.Add(VarFieldRef.Number);
             end;
@@ -204,6 +205,7 @@ codeunit 1482 "Edit in Excel Impl."
         StartStr: Text;
         EndStr: Text;
         ByteValue: DotNet Byte;
+        IsByteValueUnderscore: Dictionary of [Integer, Boolean];
     begin
         ConvertedName := Name;
 
@@ -224,17 +226,33 @@ codeunit 1482 "Edit in Excel Impl."
         CurrentPosition := 1;
 
         while CurrentPosition <= StrLen(ConvertedName) do begin
-            if ConvertedName[CurrentPosition] in ['''', '+'] then begin
-                ByteValue := Convert.ToByte(ConvertedName[CurrentPosition]);
-                StartStr := CopyStr(ConvertedName, 1, CurrentPosition - 1);
-                EndStr := CopyStr(ConvertedName, CurrentPosition + 1);
-                ConvertedName := StrSubstNo(XmlByteEncoding2Tok, StartStr, Convert.ToString(ByteValue, 16), EndStr);
+            // Notice in the following line that – (en dash) is not a normal dash (em dash).
+            // We need to handle this here because at least the norwegian translation uses en dash.
+            if ConvertedName[CurrentPosition] in ['''', '+', '–'] then begin
+                if ConvertedName[CurrentPosition] in ['–'] then begin
+                    StartStr := CopyStr(ConvertedName, 1, CurrentPosition - 1);
+                    EndStr := CopyStr(ConvertedName, CurrentPosition + 1);
+                    ConvertedName := StrSubstNo(XmlByteEncoding3Tok, StartStr, 'x2013', EndStr);
+                    // length of _x00nn_ minus one that will be added later
+                end else begin
+                    ByteValue := Convert.ToByte(ConvertedName[CurrentPosition]);
+                    StartStr := CopyStr(ConvertedName, 1, CurrentPosition - 1);
+                    EndStr := CopyStr(ConvertedName, CurrentPosition + 1);
+                    ConvertedName := StrSubstNo(XmlByteEncoding2Tok, StartStr, Convert.ToString(ByteValue, 16), EndStr);
+                end;
                 // length of _x00nn_ minus one that will be added later
                 CurrentPosition += 6;
+
+                IsByteValueUnderscore.Add(CurrentPosition, true);
             end else
                 if ConvertedName[CurrentPosition] in [' ', '\', '/', '"', '.', '(', ')', '-', ':'] then
                     if CurrentPosition > 1 then begin
-                        if ConvertedName[CurrentPosition - 1] = '_' then begin
+                        // The only cases where we allow 2 underscores in succession is when
+                        // we have substituted a symbol with its byte value and when we have an actual underscore
+                        // prefixed with a symbol that should be replaced with underscore.
+                        // This code below removes duplicate underscores but
+                        // needs to not remove underscores that was added via a byte value.
+                        if (ConvertedName[CurrentPosition - 1] = '_') and not IsByteValueUnderscore.ContainsKey(CurrentPosition - 1) then begin
                             ConvertedName := DelStr(ConvertedName, CurrentPosition, 1);
                             CurrentPosition -= 1;
                         end else

src/System Application/Test/Edit in Excel/src/EditInExcelTest.Codeunit.al

@@ -100,16 +100,55 @@ codeunit 132525 "Edit in Excel Test"
         PlusFieldName: Text;
         RegularFieldName: Text;
         FieldNameStartingWDigit: Text;
+        EnDashFieldName: Text;
+        EnDashFieldName2: Text;
+        EnDashFieldName3: Text;
+        EnDashFieldName4: Text;
+        ForwardSlashesFieldName: Text;
+        ManyForwardSlashesFieldName: Text;
+        ForwardSlashesEmDashesAndUnderscoresFieldName: Text;
     begin
         Init();
         FieldNameStartingWDigit := EditinExcelTestLibrary.ExternalizeODataObjectName('3field');
         RegularFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('field');
         ApostropheFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('new vendor''s name');
         PlusFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('c+c field');
+
+        // Both spaces will be converted to underscore and the `en dash` will be converted to _x2013_
+        EnDashFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('lager – reklassfication field');
+
+        // The special symbol `en dash` will be converted to _x2013_ and the first prefixed space will be a converted
+        // to an underscore.
+        EnDashFieldName2 := EditinExcelTestLibrary.ExternalizeODataObjectName('lager –reklassfication field');
+
+        // The special symbol `en dash` will be converted to _x2013_.
+        EnDashFieldName3 := EditinExcelTestLibrary.ExternalizeODataObjectName('lager–reklassfication field');
+
+        // The two forward slashes will be converted to underscores and the `en dash` will be converted to _x2013_.
+        EnDashFieldName4 := EditinExcelTestLibrary.ExternalizeODataObjectName('lager/–/reklassfication field');
+
+        // Two forward slashes will have the first replaced with an underscore and the second removed.
+        ForwardSlashesFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('lager//reklassfication field');
+
+        // When we have a lot of forward slashes it only replaces the first one with an underscore and the rest are truncated.
+        ManyForwardSlashesFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('lager////////reklassfication field');
+
+        // The first forward slash will be converted to an underscore, the next underscore does not hit any special case so just
+        // stays as an underscore, the next forward slash is removed because it follows the rule of not allowing two underscores
+        // when converting from a special symbol to underscore(unless that special character is translated to a byte value).
+        ForwardSlashesEmDashesAndUnderscoresFieldName := EditinExcelTestLibrary.ExternalizeODataObjectName('lager/_/-reklassfication field');
+
         LibraryAssert.AreEqual('field', RegularFieldName, 'Conversion alters name that does not begin with a string');
         LibraryAssert.AreEqual('_x0033_field', FieldNameStartingWDigit, 'Did not convert the name with number correctly');
         LibraryAssert.AreEqual('new_vendor_x0027_s_name', ApostropheFieldName, 'Did not convert the name with an apostrophe correctly');
         LibraryAssert.AreEqual('c_x002b_c_field', PlusFieldName, 'Did not convert the name with a plus correctly');
+        LibraryAssert.AreEqual('lager__x2013__reklassfication_field', EnDashFieldName, 'Did not convert the name with an `en dash` with two surrounding spaces correctly');
+        LibraryAssert.AreEqual('lager__x2013_reklassfication_field', EnDashFieldName2, 'Did not convert the name with a space before an `en dash` correctly');
+        LibraryAssert.AreEqual('lager_x2013_reklassfication_field', EnDashFieldName3, 'Did not convert the name with an `en dash` correctly');
+        LibraryAssert.AreEqual('lager__x2013__reklassfication_field', EnDashFieldName4, 'Did not convert the name with forward slashes around `en dash` correctly');
+        LibraryAssert.AreEqual('lager_reklassfication_field', ForwardSlashesFieldName, 'Did not convert the name with 2 forward slashes correctly');
+        LibraryAssert.AreEqual('lager_reklassfication_field', ManyForwardSlashesFieldName, 'Did not convert the name with many forward slashes correctly');
+        LibraryAssert.AreEqual('lager__reklassfication_field', ForwardSlashesEmDashesAndUnderscoresFieldName, 'Did not convert the name with forward slashes, em dash and underscores correctly');
     end;
 
     [Test]