update packages

diff --git a/Crow.sln b/Crow.sln
index 7101b7109af808ddc9b7a744dd5c2c4ec24f6032..2bb604eba91e6b98080e45bd059a8def5c877848 100644 (file)
--- a/Crow.sln
+++ b/Crow.sln
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShowCase", "Samples\ShowCas
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Samples\Tests\Tests.csproj", "{5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrowIDE", "Samples\CrowIDE\CrowIDE.csproj", "{232046EE-C7B3-42CD-9EED-8E3A35097C42}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "CrowIDE", "Samples\CrowIDE\CrowIDE.csproj", "{B10C0B1B-B827-45E0-B96D-DAB6A22CE776}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,19 +24,19 @@ Global
                {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {C2980F9B-4798-4C05-99E2-E174810F7C7B}.Release|Any CPU.Build.0 = Release|Any CPU
                {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Release|Any CPU.Build.0 = Release|Any CPU
+               {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {56329D48-D382-4850-93DE-59C453894E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {56329D48-D382-4850-93DE-59C453894E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {56329D48-D382-4850-93DE-59C453894E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {56329D48-D382-4850-93DE-59C453894E8A}.Release|Any CPU.Build.0 = Release|Any CPU
                {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Release|Any CPU.Build.0 = Release|Any CPU
-               {232046EE-C7B3-42CD-9EED-8E3A35097C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {232046EE-C7B3-42CD-9EED-8E3A35097C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {B10C0B1B-B827-45E0-B96D-DAB6A22CE776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {B10C0B1B-B827-45E0-B96D-DAB6A22CE776}.Release|Any CPU.ActiveCfg = Release|Any CPU
        EndGlobalSection
        GlobalSection(MonoDevelopProperties) = preSolution
                Policies = $0
@@ -81,6 +81,6 @@ Global
                {F535A8AB-CD93-49AB-B1B0-FFF9AE51ED6A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
                {56329D48-D382-4850-93DE-59C453894E8A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
                {5B7CA5BD-AEE8-40EE-85B0-0CAADD19B43A} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
-               {232046EE-C7B3-42CD-9EED-8E3A35097C42} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
+               {B10C0B1B-B827-45E0-B96D-DAB6A22CE776} = {B2C7855A-2878-47FD-AD32-9A83DB4AB8C6}
        EndGlobalSection
 EndGlobal

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index db18440f6e6168f3badecd4973a3bdb429da55ee..48374a190dbf4aebd89a9283ed991ce345bc78bb 100644 (file)
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -12,7 +12,8 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
         
     <Authors>Jean-Philippe Bruyère</Authors>
-    <Title>C# Rapid Open Widget Toolkit</Title>        
+    <Title>C# Rapid Open Widget Toolkit</Title>
+       <License>MIT</License>
     <PackageId>Crow.VK</PackageId>
     <PackageTags>Crow Vulkan Widget Interface GUI</PackageTags>
     <PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
@@ -33,7 +34,7 @@
   
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
-    <DefineConstants>TRACE;DESIGN_MODE;DEBUG;NETFRAMEWORK;NET471</DefineConstants>
+    <DefineConstants>TRACE;DESIGN_MODE;_DEBUG_CLIP_RECTANGLE;DEBUG;NETFRAMEWORK;NET471</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
   
@@ -64,6 +65,6 @@
   </ItemGroup>  
     
   <ItemGroup>
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />    
+    <PackageReference Include="Vulkan" Version="0.1.4-beta" />    
   </ItemGroup>
 </Project>

diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj
index ed3e9803ac94b65709adc2f0ec480b4ebbc83e9e..5b4cb6719156b34eface4e1e7928215952daf1a3 100644 (file)
--- a/Samples/HelloWorld/HelloWorld.csproj
+++ b/Samples/HelloWorld/HelloWorld.csproj
@@ -29,6 +29,6 @@
     </EmbeddedResource>                
   </ItemGroup>     
   <ItemGroup>
-    <PackageReference Include="CVKL" Version="0.1.3.2-beta" />
+    <PackageReference Include="CVKL" Version="0.1.5-beta" />
   </ItemGroup>
 </Project>

diff --git a/Samples/HelloWorld/main.cs b/Samples/HelloWorld/main.cs
index 9465f713ae9798f8c4ba609f9d709b61470d9120..fb9ef3043cfeab996b3fb2d3c2565c14a801061d 100644 (file)
--- a/Samples/HelloWorld/main.cs
+++ b/Samples/HelloWorld/main.cs
@@ -5,10 +5,16 @@ namespace HelloWorld
        class Program : CrowVkWin {
                static void Main (string[] args) {
                        using (Program vke = new Program ()) {
-                               vke.crow.Load ("#HelloWorld.helloworld.crow").DataSource = vke;
                                vke.Run ();
                        }
                }
 
+               protected override void onLoad ()
+               {
+                       base.onLoad ();
+
+                       crow.Load ("#HelloWorld.helloworld.crow");
+               }
+
        }
 }

diff --git a/Samples/ShowCase/ShowCase.csproj b/Samples/ShowCase/ShowCase.csproj
index 610ed694f54c8ac105671f1326f78b83bd7fc1f9..a0e6528b8b05ad1f3920b7958651728ce620a6a9 100644 (file)
--- a/Samples/ShowCase/ShowCase.csproj
+++ b/Samples/ShowCase/ShowCase.csproj
@@ -5,7 +5,7 @@
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
     <OutputType>Exe</OutputType>        
     <RepositoryUrl>https://github.com/jpbruyere/Crow</RepositoryUrl>
-    <License>https://opensource.org/licenses/MIT</License>
+    <License>MIT</License>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>    
     <TargetFramework>net471</TargetFramework>
@@ -23,7 +23,7 @@
   </ItemGroup>    
 
   <ItemGroup>  
-    <ProjectReference Include="..\..\Crow\Crow.csproj" />
+    <ProjectReference Include="..\..\Crow\Crow.csproj" />    
   </ItemGroup>    
     
   <ItemGroup>    
@@ -40,6 +40,6 @@
     </None>
   </ItemGroup>     
   <ItemGroup>
-    <PackageReference Include="CVKL" Version="0.1.3.2-beta" />
+    <PackageReference Include="CVKL" Version="0.1.5-beta" />
   </ItemGroup>
 </Project>

diff --git a/Samples/Tests/Tests.csproj b/Samples/Tests/Tests.csproj
index 0382c9380d2f85f94233a48c8d5135c38ecd2aab..9b264e05bf7c5fc3aa882298323fc7cec849cba2 100644 (file)
--- a/Samples/Tests/Tests.csproj
+++ b/Samples/Tests/Tests.csproj
@@ -35,7 +35,7 @@
   </ItemGroup>  
     
   <ItemGroup>
-    <PackageReference Include="CVKL" Version="0.1.3.2-beta" />
+    <PackageReference Include="CVKL" Version="0.1.5-beta" />
   </ItemGroup>
 </Project>
 

diff --git a/Samples/Tests/main.cs b/Samples/Tests/main.cs
index 5f2e6b65059f1e3c09ee657b8481c7d8129cbae3..97511c323e07014e2b6f2bb61a544ea0efe72fcd 100644 (file)
--- a/Samples/Tests/main.cs
+++ b/Samples/Tests/main.cs
@@ -147,7 +147,7 @@ namespace HelloWorld
 
                        //testFiles = new string [] { @"Interfaces/Experimental/testDock.crow" };
                        testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
-                       //testFiles = new string [] { @"Interfaces/Divers/colorPicker.crow" };
+                       //testFiles = new string [] { @"Interfaces/Divers/0.crow" };
                        testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray ();
                        testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray ();
                        testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray ();
@@ -187,9 +187,11 @@ namespace HelloWorld
                        else if (idx < 0)
                                idx = testFiles.Length - 1;
 
+                       Console.WriteLine ($"loading: {testFiles [idx]}");
                        try {
                                Widget w = crow.Load (testFiles [idx]);
                                w.DataSource = this;
+
                        } catch (Exception ex) {
                                MessageBox.Show (crow, MessageBox.Type.Error, ex.Message + "\n" + ex.InnerException.Message).Modal = true;
                        }