update unit tests

diff --git a/Crow.sln b/Crow.sln
index 20fc3366feaf4ef43737dcc23c1730393efce453..48f3d69af58a0745f3c52bc0ae4fd6498a7c7c9c 100644 (file)
--- a/Crow.sln
+++ b/Crow.sln
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "unitTests", "unitTests\unit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicTests", "Samples\BasicTests\BasicTests.csproj", "{7AEB6DD5-916E-4415-84E1-78EC6E5881CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testMSBuild", "Samples\testMSBuild\testMSBuild.csproj", "{B912DD88-F41B-428A-9784-E2CF265CE3DD}"
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -56,10 +54,6 @@ Global
                {7AEB6DD5-916E-4415-84E1-78EC6E5881CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {7AEB6DD5-916E-4415-84E1-78EC6E5881CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {7AEB6DD5-916E-4415-84E1-78EC6E5881CE}.Release|Any CPU.Build.0 = Release|Any CPU
-               {B912DD88-F41B-428A-9784-E2CF265CE3DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {B912DD88-F41B-428A-9784-E2CF265CE3DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {B912DD88-F41B-428A-9784-E2CF265CE3DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {B912DD88-F41B-428A-9784-E2CF265CE3DD}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(MonoDevelopProperties) = preSolution
                Policies = $0
@@ -104,6 +98,5 @@ Global
                {56329D48-D382-4850-93DE-59C453894E8A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
                {91F1CE07-EECE-4F1D-A3EE-7239B563654A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
                {7AEB6DD5-916E-4415-84E1-78EC6E5881CE} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
-               {B912DD88-F41B-428A-9784-E2CF265CE3DD} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
        EndGlobalSection
 EndGlobal

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index 72424df96d130a7ad44152641820bc5de125475f..5f29d798603d33b591df3ffe843e98e0de9f0746 100644 (file)
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -4,7 +4,7 @@
                <TargetFramework>netstandard2.0</TargetFramework>
                
                <AssemblyVersion>$(CrowVersion)</AssemblyVersion>
-               <ReleaseVersion>$(CrowVersion)</ReleaseVersion>
+               <ReleaseVersion>0.8.0</ReleaseVersion>
                <Title>C# Rapid Open Widget Toolkit</Title>
                <Description>C.R.O.W. is a widget toolkit and rendering engine developed in C# with templates, styles, compositing, and bindings.</Description>
                <License>MIT</License>

diff --git a/Directory.Build.props b/Directory.Build.props
index de22b45a7fcff04b6b24fbd026b66a53c6cb998c..1e727169dd91410656ee5f7f083461e2faed3375 100644 (file)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
                <Authors>Jean-Philippe Bruyère</Authors>           
                <LangVersion>7.2</LangVersion>
                
-               <CrowVersion>0.8.11</CrowVersion>
+               <CrowVersion>0.8.12</CrowVersion>
                <CrowPackageVersion>$(CrowVersion)-beta</CrowPackageVersion>
                <CrowStbSharp>true</CrowStbSharp>
        </PropertyGroup>

diff --git a/unitTests/TestBackend.cs b/unitTests/TestBackend.cs
index 5b9afeb1062861125f1d689ddb0bfdb78f9d8d42..4ad680e8d4b54710a8af77add93b7c5bb2ad3351 100644 (file)
--- a/unitTests/TestBackend.cs
+++ b/unitTests/TestBackend.cs
@@ -11,15 +11,15 @@ namespace unitTests
        public class TestInterface : Interface
        {
                public TestInterface (int width = 800, int height = 600)
-                       : base (width, height, false) {}
-               public bool IsRunning {
-                       get => Running;
-                       set => Running = value; 
-               }
-               protected override void InitSurface ()
-               {
+                       : base (width, height, false, false) {
                        surf = new Crow.Cairo.ImageSurface (Crow.Cairo.Format.Argb32, ClientRectangle.Width, ClientRectangle.Height);
                }
+               bool isRunning;
+               public bool IsRunning {
+                       get => isRunning;
+                       set => isRunning = value; 
+               }
+
        }
        [TestFixture]
        public class TestBackend
@@ -31,13 +31,6 @@ namespace unitTests
                {
                        iFace = new TestInterface (800, 600);
                        iFace.Init ();
-                       iFace.IsRunning = true;
-               }
-
-               [OneTimeTearDown]
-               public void Cleanup ()
-               {
-                       iFace.IsRunning = false;
                }
 
                //[SetUp] public void InitTest (){}

diff --git a/unitTests/unitTests.csproj b/unitTests/unitTests.csproj
index 5796ca7677bc328eff261790a2978af62f2c4846..0d0eefe15b4e822f582e551ccb39bd9be6b6d7d8 100644 (file)
--- a/unitTests/unitTests.csproj
+++ b/unitTests/unitTests.csproj
@@ -9,7 +9,7 @@
        <ItemGroup>
          <PackageReference Include="NUnit" Version="3.12.0" />
          <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
-         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
        </ItemGroup>
        <ItemGroup>
          <ProjectReference Include="..\Crow\Crow.csproj" />