Merge branch 'v2_develop' into v2_3574_self-contained-single-file

.github/workflows/dotnet-core.yml

@@ -18,7 +18,8 @@ jobs:
       # Turn on fail-fast once we have the tests running on all platforms
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ windows-latest ]
+        #os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     timeout-minutes: 10
     steps:
@@ -38,31 +39,33 @@ jobs:
     - name: Build Debug
       run: dotnet build --configuration Debug --no-restore
 
-    - name: Install sed on macOS
+    - name: Install sed on macOS and update xunit.runner.json
       if: runner.os == 'macOS'
       run: |
           brew install gnu-sed
           PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
-          sed --version
+          sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
+
+    - name: Update xunit.runner.json (Windows/Ubuntu)
+      if: runner.os != 'macOS'
+      run: |
+          sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
 
       # See https://github.com/microsoft/vstest/issues/2952 for why the --blame stuff below is needed.
-      # Without it, the test runner crashes on ubuntu (but not Windows)/
+      # Without it, the test runner crashes on ubuntu (but not Windows or mac)
     - name: Test
       run: |
-        PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
-        sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
         dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --diag:logs/logs.txt --blame --blame-crash --blame-hang --blame-hang-timeout 60s --blame-crash-collect-always 
-       
+     
         # mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
 
     - name: Upload Test Logs
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: test-logs
+        name: test-logs-for-blame-debugging
         path: |
           logs/    
-          uploads/
           UnitTests/TestResults/
   
     # Note: this step is currently not writing to the gist for some reason

UnitTests/Views/DateFieldTests.cs

@@ -175,6 +175,12 @@ public class DateFieldTests
     [Fact]
     public void Using_All_Culture_StandardizeDateFormat ()
     {
+        // BUGBUG: This is a workaround for the issue with the date separator in macOS. See https://github.com/gui-cs/Terminal.Gui/issues/3592
+        if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX))
+        {
+            return;
+        }
+
         CultureInfo cultureBackup = CultureInfo.CurrentCulture;
 
         DateTime date = DateTime.Parse ("1/1/1971");
@@ -189,11 +195,6 @@ public class DateFieldTests
                 separator = separator.Replace ("\u200f", "");
             }
 
-            // BUGBUG: This is a workaround for the issue with the date separator in macOS. See https://github.com/gui-cs/Terminal.Gui/issues/3592
-            if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX))
-            {
-                separator = " ";
-            }
 
             string format = culture.DateTimeFormat.ShortDatePattern;
             var df = new DateField (date);