Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Release v1.11 (#2639)

Browse Source 
* Fixed global.json to use 7.0

* Adjusted clipboard unit test timeout on Windows
This commit is contained in:
Tig
2023-05-19 10:24:28 +02:00
committed by GitHub
parent 8f199cd765
commit 8287acbe89
5 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactiveExample/ReactiveExample.csproj
View File

@@ -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>

2
Terminal.Gui/Core/ConsoleDriver.cs
View File

@@ -1494,7 +1494,7 @@ namespace Terminal.Gui {
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);
}

8
Terminal.Gui/Terminal.Gui.csproj
View File

@@ -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" />

18
UnitTests/Drivers/ClipboardTests.cs
View File

@@ -102,8 +102,8 @@ namespace Terminal.Gui.DriverTests {
[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 @@ else Assert.False (Clipboard.IsSupported);
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 @@ else Assert.NotEqual (clipText, Clipboard.Contents);
Application.Run ();
if (!failed) Assert.Equal (clipText, getClipText);
if (!failed) {
Assert.Equal (clipText, getClipText);
}
}
[Fact, AutoInitShutdown (useFakeClipboard: false)]
@@ -265,7 +267,7 @@ else Assert.NotEqual (clipText, Clipboard.Contents);
Application.Run ();
if (!failed) Assert.Equal (clipText, clipReadText.TrimEnd ());
if (!failed) Assert.Equal (clipText, clipReadText.TrimEnd ());
}

5
UnitTests/UnitTests.csproj
View File

@@ -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>