diff --git a/ConsoleGUI.Example/ConsoleGUI.Example.csproj b/ConsoleGUI.Example/ConsoleGUI.Example.csproj index 144bb0e..3fe5840 100644 --- a/ConsoleGUI.Example/ConsoleGUI.Example.csproj +++ b/ConsoleGUI.Example/ConsoleGUI.Example.csproj @@ -1,12 +1,10 @@ - Exe - netcoreapp2.1 + net8.0 + 2024.2.4.1031 - - - + \ No newline at end of file diff --git a/ConsoleGUI.MouseExample/ConsoleGUI.MouseExample.csproj b/ConsoleGUI.MouseExample/ConsoleGUI.MouseExample.csproj index ad6b390..83e5e36 100644 --- a/ConsoleGUI.MouseExample/ConsoleGUI.MouseExample.csproj +++ b/ConsoleGUI.MouseExample/ConsoleGUI.MouseExample.csproj @@ -1,60 +1,19 @@ - - - + - Debug - AnyCPU - {97B69CAE-3F74-4DEA-86FF-929FC45D3080} + net8.0 Exe - ConsoleGUI.MouseExample - ConsoleGUI.MouseExample - v4.7.2 - 512 - true - true + false + ConsoleGUI.MouseExample + ConsoleGUI.MouseExample + Copyright © 2019 + 1.0.0.0 + 1.0.0.0 - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - + - - {E3D8BC25-7EA1-4F81-9C31-BCF2DCBF77A9} - ConsoleGUI - + + - \ No newline at end of file diff --git a/ConsoleGUI.MouseExample/Properties/AssemblyInfo.cs b/ConsoleGUI.MouseExample/Properties/AssemblyInfo.cs index fd9f748..34557ed 100644 --- a/ConsoleGUI.MouseExample/Properties/AssemblyInfo.cs +++ b/ConsoleGUI.MouseExample/Properties/AssemblyInfo.cs @@ -1,16 +1,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ConsoleGUI.MouseExample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConsoleGUI.MouseExample")] -[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -21,16 +11,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("97b69cae-3f74-4dea-86ff-929fc45d3080")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ConsoleGUI.Test/Common/DrawingContextTest.cs b/ConsoleGUI.Test/Common/DrawingContextTest.cs index 4c281bf..8a723d9 100644 --- a/ConsoleGUI.Test/Common/DrawingContextTest.cs +++ b/ConsoleGUI.Test/Common/DrawingContextTest.cs @@ -16,7 +16,7 @@ public void DummyDrawingContext_HasEmptySize() { var drawingContext = DrawingContext.Dummy; - Assert.AreEqual(Size.Empty, drawingContext.Size); + Assert.That(Size.Empty,Is.EqualTo( drawingContext.Size)); } [Test] @@ -77,7 +77,7 @@ public void DrawingContext_PropagatesSizeLimits() drawingContext.SetLimits(new Size(10, 15), new Size(20, 25)); - Assert.IsTrue(raised); + Assert.That(raised,Is.True); } [Test] diff --git a/ConsoleGUI.Test/ConsoleGUI.Test.csproj b/ConsoleGUI.Test/ConsoleGUI.Test.csproj index cde8f04..c95cebe 100644 --- a/ConsoleGUI.Test/ConsoleGUI.Test.csproj +++ b/ConsoleGUI.Test/ConsoleGUI.Test.csproj @@ -1,20 +1,15 @@ - - netcoreapp2.1 - + net8.0 false - - - - - + + + + - - \ No newline at end of file diff --git a/ConsoleGUI.Test/Controls/BorderTest.cs b/ConsoleGUI.Test/Controls/BorderTest.cs index f8d7b6b..b10dc5f 100644 --- a/ConsoleGUI.Test/Controls/BorderTest.cs +++ b/ConsoleGUI.Test/Controls/BorderTest.cs @@ -28,7 +28,7 @@ public void Border_AdjustsItsSize_ToTheContent() }; (border as IControl).Context = context.Object; - Assert.AreEqual(new Size(22, 32), border.Size); + Assert.That(new Size(22, 32),Is.EqualTo( border.Size)); } [Test] @@ -41,7 +41,7 @@ public void EmptyBorder_AdjustsItsSize_ToTheMinSizeOfItsContainer() var border = new Border(); (border as IControl).Context = context.Object; - Assert.AreEqual(new Size(10, 20), border.Size); + Assert.That(new Size(10, 20),Is.EqualTo( border.Size)); } [Test] @@ -54,7 +54,7 @@ public void Border_ReturnsEmptyCharacter_ForItsInterior() var border = new Border(); (border as IControl).Context = context.Object; - Assert.AreEqual(Character.Empty, border[new Position(1, 1)].Character); + Assert.That(Character.Empty,Is.EqualTo( border[new Position(1, 1)].Character)); } [Test] @@ -67,7 +67,7 @@ public void Border_ReturnsEmptyCharacter_OutsideOfItsSize() var border = new Border(); (border as IControl).Context = context.Object; - Assert.AreEqual(Character.Empty, border[new Position(3, 1)].Character); + Assert.That(Character.Empty,Is.EqualTo( border[new Position(3, 1)].Character)); } } } diff --git a/ConsoleGUI.Test/Utils/ColorConverterTest.cs b/ConsoleGUI.Test/Utils/ColorConverterTest.cs index 2603e38..b8af2bb 100644 --- a/ConsoleGUI.Test/Utils/ColorConverterTest.cs +++ b/ConsoleGUI.Test/Utils/ColorConverterTest.cs @@ -30,7 +30,7 @@ public void ConsoleColor_IsRestoredCorrectly(ConsoleColor initialColor) var color = ColorConverter.GetColor(initialColor); var convertedColor = ColorConverter.GetNearestConsoleColor(color); - Assert.AreEqual(initialColor, convertedColor); + Assert.That(initialColor,Is.EqualTo( convertedColor)); } } } diff --git a/ConsoleGUI.sln b/ConsoleGUI.sln index 6efbf3d..863293c 100644 --- a/ConsoleGUI.sln +++ b/ConsoleGUI.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28922.388 @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleGUI", "ConsoleGUI\Co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleGUI.Test", "ConsoleGUI.Test\ConsoleGUI.Test.csproj", "{ABC28308-500E-48E9-AD7E-AA8977370D35}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleGUI.MouseExample", "ConsoleGUI.MouseExample\ConsoleGUI.MouseExample.csproj", "{97B69CAE-3F74-4DEA-86FF-929FC45D3080}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleGUI.MouseExample", "ConsoleGUI.MouseExample\ConsoleGUI.MouseExample.csproj", "{97B69CAE-3F74-4DEA-86FF-929FC45D3080}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ConsoleGUI/ConsoleGUI.csproj b/ConsoleGUI/ConsoleGUI.csproj index cc29f9f..cad01fb 100644 --- a/ConsoleGUI/ConsoleGUI.csproj +++ b/ConsoleGUI/ConsoleGUI.csproj @@ -1,7 +1,6 @@ - - netstandard2.0 + net8.0 true Tomasz Rewak @@ -24,6 +23,6 @@ 1.1.0 - Adding BreakPanel and Decorator 1.0.5 - Adding basic mouse support 1.0.4 - Adding support for window resizing + 2024.2.4.1031 - - + \ No newline at end of file