Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop

Author: tig

ReactiveExample/ReactiveExample.csproj

@@ -11,8 +11,8 @@
     <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ReactiveUI.Fody" Version="18.4.26" />
-    <PackageReference Include="ReactiveUI" Version="18.4.26" />
+    <PackageReference Include="ReactiveUI.Fody" Version="18.4.44" />
+    <PackageReference Include="ReactiveUI" Version="18.4.44" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.2.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>

Terminal.Gui/Core/ConsoleDriver.cs

@@ -1494,7 +1494,7 @@ public static (int exitCode, string result) Process (string cmd, string argument
 					process.StandardInput.Close ();
 				}
 
-				if (!process.WaitForExit (5000)) {
+				if (!process.WaitForExit (10000)) {
 					var timeoutError = $@"Process timed out. Command line: {process.StartInfo.FileName} {process.StartInfo.Arguments}.";
 					throw new TimeoutException (timeoutError);
 				}

Terminal.Gui/Terminal.Gui.csproj

@@ -10,10 +10,10 @@
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 1.0 for all projects. -->
     <!-- Do not modify these. Do NOT commit after manually running `dotnet-gitversion /updateprojectfiles` -->
-    <AssemblyVersion>1.10.1.0</AssemblyVersion>
-    <FileVersion>1.10.1.0</FileVersion>
-    <Version>1.10.1</Version>
-    <InformationalVersion>1.10.1+6.Branch.main.Sha.f7ee66ddbf8dbcfb0d96af7d63789879091670ec</InformationalVersion>
+    <AssemblyVersion>1.11.0.0</AssemblyVersion>
+    <FileVersion>1.11.0.0</FileVersion>
+    <Version>1.11</Version>
+    <InformationalVersion>1.11</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />

UnitTests/Drivers/ClipboardTests.cs

@@ -102,8 +102,8 @@ public void Contents_Fake_Gets_Sets_When_IsSupportedFalse ()
 		[Fact, AutoInitShutdown (useFakeClipboard: false)]
 		public void IsSupported_Get ()
 		{
-			if (Clipboard.IsSupported) 				Assert.True (Clipboard.IsSupported);
-else 				Assert.False (Clipboard.IsSupported);
+			if (Clipboard.IsSupported) Assert.True (Clipboard.IsSupported);
+			else Assert.False (Clipboard.IsSupported);
 		}
 
 		[Fact, AutoInitShutdown (useFakeClipboard: false)]
@@ -129,15 +129,15 @@ public void TryGetClipboardData_Gets_From_OS_Clipboard ()
 		public void TrySetClipboardData_Sets_The_OS_Clipboard ()
 		{
 			var clipText = "The TrySetClipboardData_Sets_The_OS_Clipboard unit test pasted this to the OS clipboard.";
-			if (Clipboard.IsSupported) 				Assert.True (Clipboard.TrySetClipboardData (clipText));
-else 				Assert.False (Clipboard.TrySetClipboardData (clipText));
+			if (Clipboard.IsSupported) Assert.True (Clipboard.TrySetClipboardData (clipText));
+			else Assert.False (Clipboard.TrySetClipboardData (clipText));
 
 			Application.Iteration += () => Application.RequestStop ();
 
 			Application.Run ();
 
-			if (Clipboard.IsSupported) 				Assert.Equal (clipText, Clipboard.Contents);
-else 				Assert.NotEqual (clipText, Clipboard.Contents);
+			if (Clipboard.IsSupported) Assert.Equal (clipText, Clipboard.Contents);
+			else Assert.NotEqual (clipText, Clipboard.Contents);
 		}
 
 
@@ -209,7 +209,9 @@ public void Contents_Copies_From_OS_Clipboard ()
 
 			Application.Run ();
 
-			if (!failed) 				Assert.Equal (clipText, getClipText);
+			if (!failed) {
+				Assert.Equal (clipText, getClipText);
+			}
 		}
 
 		[Fact, AutoInitShutdown (useFakeClipboard: false)]
@@ -265,7 +267,7 @@ public void Contents_Pastes_To_OS_Clipboard ()
 
 			Application.Run ();
 
-			if (!failed) 				Assert.Equal (clipText, clipReadText.TrimEnd ());
+			if (!failed) Assert.Equal (clipText, clipReadText.TrimEnd ());
 
 		}
 

UnitTests/UnitTests.csproj

@@ -21,8 +21,8 @@
     <DefineConstants>TRACE;DEBUG_IDISPOSABLE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="ReportGenerator" Version="5.1.19" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="ReportGenerator" Version="5.1.20" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
@@ -56,5 +56,6 @@
     <IncludeTestAssembly>
       False
     </IncludeTestAssembly>
+    <RunSettingsFilePath>C:\Users\charlie\s\gui-cs\Terminal.Gui\UnitTests\bin\Debug\net7.0\fine-code-coverage\coverage-tool-output\UnitTests-fcc-mscodecoverage-generated.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 </Project>