debug, code clean, geo 2d with double versions

6 files changed, 40 insertions, 35 deletions

diff --git a/Samples/ControlLib/Class1.cs b/Samples/ControlLib/Class1.cs
new file mode 100644
index 00000000..23bcb161
--- /dev/null
+++ b/Samples/ControlLib/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace ControlLib
+{
+	public class Class1
+	{
+	}
+}
diff --git a/Samples/ControlLib/ControlLib.csproj b/Samples/ControlLib/ControlLib.csproj
new file mode 100644
index 00000000..42ac58c8
--- /dev/null
+++ b/Samples/ControlLib/ControlLib.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">  
+  <PropertyGroup>
+    <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
+    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>     
+    <ReleaseVersion>0.8.0</ReleaseVersion>
+  </PropertyGroup>
+            
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>TRACE;DEBUG;NETFRAMEWORK;NET471</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+    <Reference Include="System" />
+  </ItemGroup>    
+
+  <ItemGroup>  
+    <ProjectReference Include="..\..\Crow\Crow.csproj" />
+  </ItemGroup>    
+    
+  <ItemGroup>
+    <EmbeddedResource Include="ui\**\*.*">
+      <LogicalName>ControlLib.%(Filename)%(Extension)</LogicalName>
+    </EmbeddedResource>                
+  </ItemGroup>
+</Project>
diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj
index 14bb3d73..9363d574 100644
--- a/Samples/HelloWorld/HelloWorld.csproj
+++ b/Samples/HelloWorld/HelloWorld.csproj
@@ -1,14 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+<Project Sdk="Microsoft.NET.Sdk">  
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
     <OutputType>Exe</OutputType>        
-    <RepositoryUrl>https://github.com/jpbruyere/Crow</RepositoryUrl>
-    <License>MIT</License>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>     
-    <ReleaseVersion>0.8.0</ReleaseVersion>
   </PropertyGroup>
             
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -22,15 +16,9 @@
     <ProjectReference Include="..\..\Crow\Crow.csproj" />
   </ItemGroup>    
     
-  <ItemGroup>    
-    <Datas Include="..\data\**\*.*">      
-      <Link>data\%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Datas>
+  <ItemGroup>
     <EmbeddedResource Include="ui\**\*.*">
       <LogicalName>HelloWorld.%(Filename)%(Extension)</LogicalName>
     </EmbeddedResource>                
-  </ItemGroup>     
-  <ItemGroup>
-    <Compile Remove="..\common\CrowWin.cs" />
   </ItemGroup>
 </Project>
diff --git a/Samples/HelloWorld/ui/helloworld.crow b/Samples/HelloWorld/ui/helloworld.crow
index 1d1a3515..d150136e 100644
--- a/Samples/HelloWorld/ui/helloworld.crow
+++ b/Samples/HelloWorld/ui/helloworld.crow
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
-<Window Caption="Hello World" Icon="#Crow.Icons.crow.svg" Width="40%" Height="40%" CornerRadius="5">
+
     <VerticalStack>
         <Label Text="Hello World" Font="mono, 20"/>
         <Image Path="#Crow.Icons.crow.svg"/>
+        <CheckBox/>
     </VerticalStack>
-</Window>
+
 
diff --git a/Samples/ShowCase/ShowCase.csproj b/Samples/ShowCase/ShowCase.csproj
index fd711e6d..97dd9690 100644
--- a/Samples/ShowCase/ShowCase.csproj
+++ b/Samples/ShowCase/ShowCase.csproj
@@ -1,25 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
   <PropertyGroup>
-    <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
-    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
+    <TargetFrameworks>net471</TargetFrameworks>
     <OutputType>Exe</OutputType>        
-    <RepositoryUrl>https://github.com/jpbruyere/Crow</RepositoryUrl>
-    <License>MIT</License>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>    
-    <ReleaseVersion>0.8.0</ReleaseVersion>
   </PropertyGroup>
             
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-  </PropertyGroup>
-    
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <Reference Include="System" />
-  </ItemGroup>    
+  </PropertyGroup> 
 
   <ItemGroup>  
     <ProjectReference Include="..\..\Crow\Crow.csproj" />    
@@ -37,7 +27,4 @@
       <Link>Interfaces\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </None>
   </ItemGroup>     
-  <ItemGroup>
-    <Compile Remove="..\common\CrowWin.cs" />
-  </ItemGroup>
 </Project>
diff --git a/Samples/common/ui/Interfaces/GraphicObject/0.crow b/Samples/common/ui/Interfaces/GraphicObject/0.crow
index d786e6ae..2548fb64 100755
--- a/Samples/common/ui/Interfaces/GraphicObject/0.crow
+++ b/Samples/common/ui/Interfaces/GraphicObject/0.crow
@@ -1,5 +1,2 @@
 <?xml version="1.0"?>
-<VerticalStack Height="Fit" Width="20" Margin="1" Spacing="2" Background="White" >			
-	<Widget Height="50" Background="Green"/>						
-	<Widget Height="50" Background="Red"/>						
-</VerticalStack>
+<TestCairoPatch Background="White"/>