SpiprVTask nuget package

24 files changed, 276 insertions, 307 deletions

diff --git a/Directory.Build.props b/Directory.Build.props
index 756aa73..43301f1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,7 +10,7 @@
 	    <Authors>Jean-Philippe Bruyère</Authors>
 	    
 	    <LangVersion>7.2</LangVersion>
-
+	    
         <!--<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>-->
     </PropertyGroup>
     <!--<Import Project="netfx.props" />-->
diff --git a/Directory.Build.targets b/Directory.Build.targets
deleted file mode 100644
index eadc029..0000000
--- a/Directory.Build.targets
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project>
-  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)SpirVTasks.dll" TaskName="SpirVTasks.CompileGLSLTask" />
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)spirv.xml" />
-    <AvailableItemName Include="GLSLShader">
-      <Targets>DXC</Targets>
-    </AvailableItemName>
-  </ItemGroup>
-	
-  <Target Name="DataCopy">
-    <Copy SourceFiles="@(Datas)"
-		  DestinationFiles="@(Datas->'$(OutputPath)\data\%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-	
-	<Target Name="CompileShaders" BeforeTargets="BeforeBuild" Condition="'@(GLSLShader)'!=''" Outputs="@(CompiledShaders)">				
-		<CompileGLSLTask SourceFile="%(GLSLShader.Identity)"
-						 AdditionalIncludeDirectories="$(MSBuildThisFileDirectory)samples\common\shaders"
-						 TempDirectory="$(IntermediateOutputPath)"
-						 DestinationFile="$(IntermediateOutputPath)%(RelativeDir)%(Filename)%(Extension).spv" />		
-		<CreateItem
-            Include="$(IntermediateOutputPath)%(GLSLShader.RelativeDir)%(Filename)%(Extension).spv">			
-           	<Output				
-               TaskParameter="Include"
-               ItemName="EmbeddedResource"/>
-			
-        </CreateItem>		
-		<Message Importance="High" Text="Embedding $(IntermediateOutputPath)%(GLSLShader.RelativeDir)%(Filename)%(Extension).spv" />
-	</Target>
-	<Target Name="ModifyEmbeddedResourceNames" AfterTargets="CompileShaders">
-	  <ItemGroup>
-	    <EmbeddedResource>
-	      <LogicalName>$(AssemblyName).%(EmbeddedResource.Filename)%(Extension)</LogicalName>
-	    </EmbeddedResource>
-	  </ItemGroup>
-	</Target>
-</Project>
diff --git a/SpirVTask/SpirVTasks.csproj b/SpirVTask/SpirVTasks.csproj
deleted file mode 100644
index 24472ce..0000000
--- a/SpirVTask/SpirVTasks.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputPath>$(SolutionDir)build</OutputPath>
-        <TargetFramework>net471</TargetFramework>        
-    </PropertyGroup>
-    <ItemGroup>        
-        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
-    </ItemGroup>
-</Project>
diff --git a/SpirVTasks.dll b/SpirVTasks.dll
deleted file mode 100644
index cd37fc5..0000000
--- a/SpirVTasks.dll
+++ /dev/null
diff --git a/SpirVTask/CompileGLSLTask.cs b/SpirVTasks/CompileGLSLTask.cs
index ad51ce6..c2d1a7e 100644
--- a/SpirVTask/CompileGLSLTask.cs
+++ b/SpirVTasks/CompileGLSLTask.cs
@@ -33,6 +33,10 @@ namespace SpirVTasks {
 			get;
 			set;
 		}
+		public ITaskItem SpirVCompilerPath {
+			get;
+			set;
+		}
 		[Required]
 		[Output]
 		public ITaskItem DestinationFile {
@@ -43,7 +47,7 @@ namespace SpirVTasks {
 		volatile bool success;
 
 		bool tryFindInclude (string include, out string incFile) {
-			if (!string.IsNullOrEmpty (AdditionalIncludeDirectories.ItemSpec)) {
+			if (!string.IsNullOrEmpty (AdditionalIncludeDirectories?.ItemSpec)) {
 				foreach (string incDir in AdditionalIncludeDirectories.ItemSpec.Split (';', ',', '|')) {
 					incFile = Path.Combine (incDir, include);
 					if (File.Exists (incFile))
@@ -62,7 +66,6 @@ namespace SpirVTasks {
 					if (line.Trim ().StartsWith ("#include", StringComparison.Ordinal)) {
 						string include = line.Split ('"', '<', '>')[1];
 						string incFile = Path.Combine (Path.GetDirectoryName (src), include);
-
 						if (!File.Exists (incFile)) {
 							if (!tryFindInclude(include, out incFile))
 								throw new IncludeFileNotFound (src, srcLine, include);
@@ -75,24 +78,44 @@ namespace SpirVTasks {
 			}
 		}
 
+		bool tryFindGlslcExecutable (out string glslcPath) {
+			if (!string.IsNullOrEmpty (SpirVCompilerPath?.ItemSpec)) {
+				glslcPath = SpirVCompilerPath.ItemSpec;
+				if (!File.Exists (glslcPath))
+					return false;
+			}
+
+			string glslcExec = "glslc";
+			if (Environment.OSVersion.Platform.ToString ().StartsWith ("Win", StringComparison.Ordinal))
+				glslcExec = glslcExec + "exe";
+
+			glslcPath = Path.Combine (Environment.GetEnvironmentVariable ("VULKAN_SDK"), "bin");
+			glslcPath = Path.Combine (glslcPath, glslcExec);
+			if (File.Exists (glslcPath))
+				return true;
+
+			string envStrPathes = Environment.GetEnvironmentVariable ("PATH");
+			if (!string.IsNullOrEmpty (envStrPathes)) {
+				foreach (string path in envStrPathes.Split (';')) {
+					glslcPath = Path.Combine (path, glslcExec);
+					if (File.Exists (glslcPath))
+						return true;
+				}
+			}
+			return false;		
+		}
+
 
 		public override bool Execute () {
 
 			success = true;
 
-			string glslcPath = Path.Combine (Environment.GetEnvironmentVariable ("VULKAN_SDK"), "bin");
-			glslcPath = Path.Combine (glslcPath, "glslc");
-
-			if (!File.Exists (glslcPath)) {
+			if (!tryFindGlslcExecutable(out string glslcPath)) {
 				BuildErrorEventArgs err = new BuildErrorEventArgs ("execute", "VK001", BuildEngine.ProjectFileOfTaskNode, 0, 0, 0, 0, $"glslc command not found: {glslcPath}", "Set 'VULKAN_SDK' environment variable", "SpirVTasks");
 				BuildEngine.LogErrorEvent (err);
 				return false;
 			}
 
-			//foreach (string item in DestinationFile.MetadataNames) {
-			//	Log.LogMessage (MessageImportance.High, $"METADATA name: {item} = {DestinationFile.GetMetadata(item)}");
-			//}
-
 			string tempFile = Path.Combine (TempDirectory.ItemSpec, SourceFile.ItemSpec);
 			if (File.Exists (tempFile))
 				File.Delete (tempFile);
@@ -103,11 +126,11 @@ namespace SpirVTasks {
 					build_source (SourceFile.ItemSpec, sw);
 				}
 			} catch (IncludeFileNotFound ex) {
-				BuildErrorEventArgs err = new BuildErrorEventArgs ("include", "ERR_INC", ex.SourceFile, ex.SourceLine, 0, 0, 0, $"include file not found: {ex.FileName}", "", "SpirVTasks");
+				BuildErrorEventArgs err = new BuildErrorEventArgs ("include", "VK002", ex.SourceFile, ex.SourceLine, 0, 0, 0, $"include file not found: {ex.FileName}", "", "SpirVTasks");
 				BuildEngine.LogErrorEvent (err);
 				return false;
 			}catch (Exception ex) {
-				BuildErrorEventArgs err = new BuildErrorEventArgs ("include", "ERR", SourceFile.ItemSpec, 0, 0, 0, 0, ex.ToString(), "", "SpirVTasks");
+				BuildErrorEventArgs err = new BuildErrorEventArgs ("include", "VK000", SourceFile.ItemSpec, 0, 0, 0, 0, ex.ToString(), "", "SpirVTasks");
 				BuildEngine.LogErrorEvent (err);
 				return false;
 			}
@@ -115,8 +138,8 @@ namespace SpirVTasks {
 			Directory.CreateDirectory (Path.GetDirectoryName (DestinationFile.ItemSpec));
 
 			Process glslc = new Process();
-			glslc.StartInfo.StandardOutputEncoding = System.Text.Encoding.ASCII;
-			glslc.StartInfo.StandardErrorEncoding = System.Text.Encoding.ASCII;
+			//glslc.StartInfo.StandardOutputEncoding = System.Text.Encoding.ASCII;
+			//glslc.StartInfo.StandardErrorEncoding = System.Text.Encoding.ASCII;
 			glslc.StartInfo.UseShellExecute = false;
 			glslc.StartInfo.RedirectStandardOutput = true;
 			glslc.StartInfo.RedirectStandardError = true;
@@ -149,7 +172,6 @@ namespace SpirVTasks {
 
 			string[] tmp = e.Data.Split (':');
 
-
 			Log.LogMessage (MessageImportance.High, $"glslc: {e.Data}");
 
 			if (tmp.Length == 5) {
@@ -161,8 +183,6 @@ namespace SpirVTasks {
 				success = false;
 			} else {
 				Log.LogMessage (MessageImportance.High, $"{e.Data}");
-				//BuildErrorEventArgs err = new BuildErrorEventArgs ("unkn", "ERR0", BuildEngine.ProjectFileOfTaskNode, 0, 0, 0, 0, $"{e.Data}", "no help", "SpirVTasks");
-				//BuildEngine.LogErrorEvent (err);
 			}
 		}
 
diff --git a/SpirVTasks/SpirVTasks.csproj b/SpirVTasks/SpirVTasks.csproj
new file mode 100644
index 0000000..ac00130
--- /dev/null
+++ b/SpirVTasks/SpirVTasks.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
+        <AssemblyVersion>0.1.6</AssemblyVersion>
+
+        <PackageId>SpirVTasks</PackageId>
+        <PackageTags>msbuild vulkan spirv glsl addons</PackageTags>    
+        <PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
+        <PackageProjectUrl>https://github.com/jpbruyere/vk.net/blob/master/README.md</PackageProjectUrl>
+        <License>MIT</License>
+        <Authors>Jean-Philippe Bruyère</Authors>        
+        <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
+		
+		<EnableDefaultContentItems>false</EnableDefaultContentItems>
+		<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+		<EnableDefaultCompileItems>true</EnableDefaultCompileItems>
+    </PropertyGroup>
+    <ItemGroup>        
+        <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
+    </ItemGroup>
+    <ItemGroup>
+      <Content Include="SpirVTasks.targets">
+        <Pack>true</Pack>
+        <IncludeInPackage>true</IncludeInPackage>
+        <PackagePath>build\net471\</PackagePath>
+      </Content>
+      <Content Include="SpirVTasks.targets">
+        <Pack>true</Pack>
+        <IncludeInPackage>true</IncludeInPackage>
+        <PackagePath>build\netstandard2.0\</PackagePath>
+      </Content>
+      <Content Include="spirv.xml">        
+        <Pack>true</Pack>
+        <IncludeInPackage>true</IncludeInPackage>
+        <PackagePath>build</PackagePath>
+      </Content>
+    </ItemGroup>
+</Project>
diff --git a/SpirVTasks/SpirVTasks.targets b/SpirVTasks/SpirVTasks.targets
new file mode 100644
index 0000000..8f7ae56
--- /dev/null
+++ b/SpirVTasks/SpirVTasks.targets
@@ -0,0 +1,29 @@
+<Project>
+  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\lib\$(TargetFramework)\SpirVTasks.dll" TaskName="SpirVTasks.CompileGLSLTask" />
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)..\spirv.xml" />
+    <AvailableItemName Include="GLSLShader">
+      <Targets>DXC</Targets>
+    </AvailableItemName>
+  </ItemGroup>
+  <Target Name="CompileShaders" BeforeTargets="BeforeBuild" Condition="'@(GLSLShader)'!=''" Outputs="@(CompiledShaders)">				
+	<CompileGLSLTask SourceFile="%(GLSLShader.Identity)"
+					 AdditionalIncludeDirectories="$(SpirVAdditionalIncludeDirectories)"
+					 TempDirectory="$(IntermediateOutputPath)"
+					 DestinationFile="$(IntermediateOutputPath)%(RelativeDir)%(Filename)%(Extension).spv" />		
+    <CreateItem
+        Include="$(IntermediateOutputPath)%(GLSLShader.RelativeDir)%(Filename)%(Extension).spv">			
+       	<Output				
+           TaskParameter="Include"
+           ItemName="EmbeddedResource"/>
+    </CreateItem>		
+    <Message Importance="High" Text="Embedding $(IntermediateOutputPath)%(GLSLShader.RelativeDir)%(Filename)%(Extension).spv" />
+  </Target>
+  <Target Name="ModifyEmbeddedResourceNames" AfterTargets="CompileShaders">
+    <ItemGroup>
+      <EmbeddedResource>
+        <LogicalName>$(AssemblyName).%(EmbeddedResource.Filename)%(Extension)</LogicalName>
+      </EmbeddedResource>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/spirv.xml b/SpirVTasks/spirv.xml
index 9635ad6..9635ad6 100644
--- a/spirv.xml
+++ b/SpirVTasks/spirv.xml
diff --git a/VK/vulkan.csproj b/VK/vulkan.csproj
index 0605ba7..0589402 100644
--- a/VK/vulkan.csproj
+++ b/VK/vulkan.csproj
@@ -10,7 +10,7 @@
         
     <PackageId>Vulkan</PackageId>
     <PackageTags>C# vulkan net binding</PackageTags>    
-    <PackageVersion>$(AssemblyVersion)-beta</PackageVersion>        
+    <PackageVersion>$(AssemblyVersion)</PackageVersion>        
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/jpbruyere/vk.net/blob/master/README.md</PackageProjectUrl>
     <!--<PackageIconUrl>https://github.com/KhronosGroup/glTF/blob/master/specification/figures/gltf.png</PackageIconUrl>-->
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 483cac6..3a38b39 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -13,6 +13,9 @@
 	    <OutputType>Exe</OutputType>        
 	    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	    <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
+	    
+	    <SpirVAdditionalIncludeDirectories>$(MSBuildThisFileDirectory)common\shaders</SpirVAdditionalIncludeDirectories>
+
     </PropertyGroup>
     
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">    
@@ -22,21 +25,21 @@
 		<DefineConstants>NETSTANDARD;NETSTANDARD2_0;WITH_SHADOWS;_WITH_VKVG</DefineConstants>    
 	</PropertyGroup>
 
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+<!--	<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
 		<Reference Include="System" />
-	</ItemGroup>      
+	</ItemGroup>      -->
 	
 	<ItemGroup>		
 		<ProjectReference Include="$(RootDirectory)vke\CVKL.csproj" />
 	</ItemGroup>    
 	
 	<ItemGroup>
-		<PackageReference Include="Vulkan" Version="0.1.4-beta" />        
+		<PackageReference Include="SpirVTasks" Version="0.1.6-beta" />        
+		<PackageReference Include="Vulkan" Version="0.1.4" />        
 	</ItemGroup>    
 
 	<ItemGroup>    
 		<GLSLShader Include="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />
 	</ItemGroup>     
-
-	<Import Project="$(RootDirectory)spirv.targets" />      
+	
 </Project>
diff --git a/samples/Model/main.cs b/samples/Model/main.cs
index 73aca7c..5008afa 100644
--- a/samples/Model/main.cs
+++ b/samples/Model/main.cs
@@ -88,8 +88,8 @@ namespace ModelSample {
 
 			pipeline = new GraphicPipeline (cfg);
 
-			helmet = new SimpleModel (presentQueue, "data/models/DamagedHelmet/glTF/DamagedHelmet.gltf");
-			//helmet = new SimpleModel (presentQueue, "data/models/Hubble.glb");
+			helmet = new SimpleModel (presentQueue, "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf");
+			//helmet = new SimpleModel (presentQueue, "../data/models/Hubble.glb");
 
 			//helmet = new SimpleModel (presentQueue, "/mnt/devel/vulkan/Lugdunum/resources/models/Box.gltf");
 
diff --git a/samples/Textured/main.cs b/samples/Textured/main.cs
index 3f8a3b4..b11cef9 100644
--- a/samples/Textured/main.cs
+++ b/samples/Textured/main.cs
@@ -59,11 +59,11 @@ namespace Textured {
 		string[] imgPathes = {
 			"/mnt/devel/vulkan/VulkanExamples/data/models/voyager/voyager_rgba_unorm.ktx",
 			"/mnt/devel/vulkan/vulkanExUpstream/data/models/voyager/voyager_astc_8x8_unorm.ktx",
-			"data/textures/rgba-reference.ktx",
+			"../data/textures/rgba-reference.ktx",
 			"/mnt/devel/vulkan/vulkanExUpstream/data/textures/trail_astc_8x8_unorm.ktx",
-			"data/textures/texturearray_rocks_bc3_unorm.ktx",
-			"data/textures/texture.jpg",
-			"data/textures/tex256.jpg",
+			"../data/textures/texturearray_rocks_bc3_unorm.ktx",
+			"../data/textures/texture.jpg",
+			"../data/textures/tex256.jpg",
 		};
 
 		Program () : base () {		
diff --git a/samples/TexturedCube/main.cs b/samples/TexturedCube/main.cs
index 2b98292..295334d 100644
--- a/samples/TexturedCube/main.cs
+++ b/samples/TexturedCube/main.cs
@@ -85,11 +85,11 @@ namespace TextureCube {
 		};
 		int currentImgIndex = 4;
 		string[] imgPathes = {
-			"data/textures/uffizi_cube.ktx",
-			"data/textures/papermill.ktx",
-			"data/textures/cubemap_yokohama_bc3_unorm.ktx",
-			"data/textures/gcanyon_cube.ktx",
-			"data/textures/pisa_cube.ktx",
+			"../data/textures/uffizi_cube.ktx",
+			"../data/textures/papermill.ktx",
+			"../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+			"../data/textures/gcanyon_cube.ktx",
+			"../data/textures/pisa_cube.ktx",
 		};
 
 		VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1;
diff --git a/samples/Triangle/Triangle.csproj b/samples/Triangle/Triangle.csproj
index 63844b6..dbb4bc8 100644
--- a/samples/Triangle/Triangle.csproj
+++ b/samples/Triangle/Triangle.csproj
@@ -1,3 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(RootDirectory)netfx.props" />
-</Project>
\ No newline at end of file
+  <PropertyGroup>
+    <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
+  </PropertyGroup>    
+</Project>
diff --git a/samples/datas/datas.csproj b/samples/datas/datas.csproj
index 4f14b82..060aded 100644
--- a/samples/datas/datas.csproj
+++ b/samples/datas/datas.csproj
@@ -1,13 +1,28 @@
-<Project InitialTargets="DataCopy" Sdk="Microsoft.NET.Sdk">
-<!--	xmlns="http://schemas.microsoft.com/developer/msbuild/2003">-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>        
+        <ProjectGuid>{0819E729-64D0-4D96-B7A7-FFDE86639977}</ProjectGuid>
+        <OutputType>Exe</OutputType>
+    </PropertyGroup>
     
-  <PropertyGroup>
-	<TargetFramework>net471</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-  <ItemGroup>
-    <Datas Include="data\**\*.*" />      
-  </ItemGroup>     
+    <ItemGroup>
+        <Datas Include="data\**\*.*" />        
+    </ItemGroup> 
+
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <OutputPath>$(SolutionDir)build\Debug\</OutputPath>
+    </PropertyGroup>
+        
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <OutputPath>$(SolutionDir)build\Release\</OutputPath>
+    </PropertyGroup>  
+
+    <Target Name="Build" Condition="'@(Datas)'!=''">        
+        <Copy SourceFiles="@(Datas)" DestinationFiles="@(Datas-&gt;'$(OutputPath)data\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />        
+    </Target>    
+
+
+    <Target Name="Clean">
+      <RemoveDir Directories="$(OutputPath)\data\" />
+    </Target>
 </Project>
diff --git a/samples/deferred/main-crow.cs b/samples/deferred/main-crow.cs
index d265157..dd70624 100644
--- a/samples/deferred/main-crow.cs
+++ b/samples/deferred/main-crow.cs
@@ -111,20 +111,20 @@ namespace deferred {
 		}
 
 		string[] cubemapPathes = {
-			"data/textures/papermill.ktx",
-			"data/textures/cubemap_yokohama_bc3_unorm.ktx",
-			"data/textures/gcanyon_cube.ktx",
-			"data/textures/pisa_cube.ktx",
-			"data/textures/uffizi_cube.ktx",
+			"../data/textures/papermill.ktx",
+			"../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+			"../data/textures/gcanyon_cube.ktx",
+			"../data/textures/pisa_cube.ktx",
+			"../data/textures/uffizi_cube.ktx",
 		};
 		string[] modelPathes = {
 				//"/mnt/devel/gts/vkChess.net/data/models/chess.glb",
 				//"/home/jp/gltf/jaguar/scene.gltf",
-				"data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
-				"data/models/shadow.glb",
-				"data/models/Hubble.glb",
-				"data/models/MER_static.glb",
-				"data/models/ISS_stationary.glb",
+				"../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+				"../data/models/shadow.glb",
+				"../data/models/Hubble.glb",
+				"../data/models/MER_static.glb",
+				"../data/models/ISS_stationary.glb",
 			};
 
 		int curModelIndex = 0;
diff --git a/samples/deferred/main.cs b/samples/deferred/main.cs
index d3a1297..e11bdf0 100644
--- a/samples/deferred/main.cs
+++ b/samples/deferred/main.cs
@@ -46,19 +46,19 @@ namespace deferred {
 			computeQ = new Queue (dev, VkQueueFlags.Compute);
 		}
 		string[] cubemapPathes = {
-			"data/textures/papermill.ktx",
-			"data/textures/cubemap_yokohama_bc3_unorm.ktx",
-			"data/textures/gcanyon_cube.ktx",
-			"data/textures/pisa_cube.ktx",
-			"data/textures/uffizi_cube.ktx",
+			"../data/textures/papermill.ktx",
+			"../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+			"../data/textures/gcanyon_cube.ktx",
+			"../data/textures/pisa_cube.ktx",
+			"../data/textures/uffizi_cube.ktx",
 		};
 		string[] modelPathes = {
 				//"/mnt/devel/gts/vkChess.net/data/models/chess.glb",
-				"data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
-				"data/models/shadow.glb",
-				"data/models/Hubble.glb",
-				"data/models/MER_static.glb",
-				"data/models/ISS_stationary.glb",
+				"../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+				"../data/models/shadow.glb",
+				"../data/models/Hubble.glb",
+				"../data/models/MER_static.glb",
+				"../data/models/ISS_stationary.glb",
 			};
 
 		int curModelIndex = 0;
diff --git a/samples/pbr/EnvironmentPipeline.cs b/samples/pbr/EnvironmentPipeline.cs
index 40ac8a2..b259863 100644
--- a/samples/pbr/EnvironmentPipeline.cs
+++ b/samples/pbr/EnvironmentPipeline.cs
@@ -64,11 +64,11 @@ namespace CVKL {
 
 		#region skybox
 		public List<string> cubemapPathes = new List<string>() {
-			"data/textures/papermill.ktx",
-			"data/textures/cubemap_yokohama_bc3_unorm.ktx",
-			"data/textures/gcanyon_cube.ktx",
-			"data/textures/pisa_cube.ktx",
-			"data/textures/uffizi_cube.ktx",
+			"../data/textures/papermill.ktx",
+			"../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+			"../data/textures/gcanyon_cube.ktx",
+			"../data/textures/pisa_cube.ktx",
+			"../data/textures/uffizi_cube.ktx",
 		};
 		static float[] box_vertices = {			
 			 1.0f, 1.0f,-1.0f,  // +X side
diff --git a/samples/pbr/PbrPipeline.cs b/samples/pbr/PbrPipeline.cs
index d62090e..852efd5 100644
--- a/samples/pbr/PbrPipeline.cs
+++ b/samples/pbr/PbrPipeline.cs
@@ -93,7 +93,7 @@ namespace CVKL {
 			uboMats = new HostBuffer (Dev, VkBufferUsageFlags.UniformBuffer, matrices, true);
 
 			string[] modelPathes = {
-				"data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+				"../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
 				"/mnt/devel/vulkan/glTF-Sample-Models-master/2.0/Avocado/glTF/Avocado.gltf",
 				"/mnt/devel/vulkan/glTF-Sample-Models-master/2.0/BarramundiFish/glTF/BarramundiFish.gltf",
 				"/mnt/devel/vulkan/glTF-Sample-Models-master/2.0/BoomBoxWithAxes/glTF/BoomBoxWithAxes.gltf",
diff --git a/spirv.targets b/spirv.targets
deleted file mode 100644
index 957ade8..0000000
--- a/spirv.targets
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-</Project>
diff --git a/testGlslc/Program.cs b/testGlslc/Program.cs
deleted file mode 100644
index 0aee4a1..0000000
--- a/testGlslc/Program.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-
-namespace testGlslc {
-	class Program {
-		static void Main (string[] args) {
-
-			string SourceFile = "/mnt/devel/gts/vk.net/samples/Triangle/shaders/triangle.frag";
-			string DestinationFile = "/tmp/triangle.frag.spv";
-
-
-			string glslcPath = Path.Combine (Environment.GetEnvironmentVariable ("VULKAN_SDK"), "bin");
-			glslcPath = Path.Combine (glslcPath, "glslc");
-
-
-
-			Process glslc = new Process ();
-			glslc.StartInfo.StandardOutputEncoding = System.Text.Encoding.ASCII;
-			glslc.StartInfo.StandardErrorEncoding = System.Text.Encoding.ASCII;
-			glslc.StartInfo.UseShellExecute = false;
-			glslc.StartInfo.RedirectStandardOutput = true;
-			glslc.StartInfo.RedirectStandardError = true;
-			glslc.StartInfo.FileName = glslcPath;
-			glslc.StartInfo.Arguments = $"{SourceFile} -o {DestinationFile}";
-			glslc.StartInfo.CreateNoWindow = true;
-
-			glslc.EnableRaisingEvents = true;
-			glslc.OutputDataReceived += Glslc_OutputDataReceived;
-			glslc.ErrorDataReceived += Glslc_ErrorDataReceived;
-
-			glslc.Start ();
-
-
-
-			glslc.BeginErrorReadLine ();
-			glslc.BeginOutputReadLine ();
-
-
-			glslc.WaitForExit ();
-
-
-		}
-
-		static void Glslc_ErrorDataReceived (object sender, DataReceivedEventArgs e) {
-			if (e.Data == null)
-				return;
-			if (string.Equals (e.Data, "(0)", StringComparison.Ordinal))
-				return;
-			string[] tmp = e.Data.Split (':');
-			if (tmp.Length == 5) {
-				int line = int.Parse (tmp[1]);
-				Console.WriteLine ($"file: {tmp[0]} line:{line}");
-			} else {
-				tmp = e.Data.Split (' ');
-				Console.WriteLine ($"error count = {int.Parse (tmp[0])}");
-			}
-			Console.WriteLine ($"=> {e.Data}");
-		}
-
-
-		static void Glslc_OutputDataReceived (object sender, DataReceivedEventArgs e) {
-			if (e.Data == null)
-				return;
-			if (string.Equals (e.Data, "(0)", StringComparison.Ordinal))
-				return;
-			Console.WriteLine (e.Data);
-		}
-	}
-}
diff --git a/testGlslc/testGlslc.csproj b/testGlslc/testGlslc.csproj
deleted file mode 100644
index 5d175c8..0000000
--- a/testGlslc/testGlslc.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net471</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/vk.net.sln b/vk.net.sln
index c4e2cba..9925e41 100644
--- a/vk.net.sln
+++ b/vk.net.sln
@@ -7,33 +7,33 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vk.generator", "vk.generato
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vk.rewrite", "vk.rewrite\vk.rewrite.csproj", "{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vkvg_tests", "samples\vkvg_tests\vkvg_tests.csproj", "{1F05E74F-AEE8-481C-8FDF-456654CC30BE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vulkan", "VK\vulkan.csproj", "{1603D809-D9C4-4EE5-B921-B053CE22E068}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CVKL", "vke\CVKL.csproj", "{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpirVTasks", "SpirVTask\SpirVTasks.csproj", "{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpirVTasks", "SpirVTasks\SpirVTasks.csproj", "{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Triangle", "samples\Triangle\Triangle.csproj", "{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deferred", "samples\deferred\deferred.csproj", "{D9C2AFFC-2BEC-487F-86F5-400516D8A991}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deferred", "samples\deferred\deferred.csproj", "{E61D0F9F-734E-43B3-B077-D54C1DED7021}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hdr", "samples\hdr\hdr.csproj", "{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hdr", "samples\hdr\hdr.csproj", "{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pbr", "samples\pbr\pbr.csproj", "{6C06AD14-6170-476A-9446-585D113E401A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pbr", "samples\pbr\pbr.csproj", "{C91689E2-6F72-4812-8166-3EA500E2D5BE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Textured", "samples\Textured\Textured.csproj", "{91B415CF-2DFE-481D-90DF-6D7AABE2D747}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Textured", "samples\Textured\Textured.csproj", "{C7746F60-3A53-41CE-9241-69F89E377CF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexturedCube", "samples\TexturedCube\TexturedCube.csproj", "{E3F46936-9586-4E14-A876-95A031C2A178}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexturedCube", "samples\TexturedCube\TexturedCube.csproj", "{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "datas", "samples\datas\datas.csproj", "{0819E729-64D0-4D96-B7A7-FFDE86639977}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "datas", "samples\datas\datas.csproj", "{E34F499F-99A4-4930-81F5-32E85CD39E13}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compute", "samples\compute\compute.csproj", "{FAA57EFA-275C-44D5-9008-2F67E79B2C07}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compute", "samples\compute\compute.csproj", "{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "samples\Model\Model.csproj", "{BB1DC113-9594-43C5-AEC2-81A773AC415B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "samples\Model\Model.csproj", "{F134D6DF-893C-41B0-85FC-82E30773F3D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "samples\tests\tests.csproj", "{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "tests", "samples\tests\tests.csproj", "{3FE2F866-C21D-4FED-B2F3-3385789165A2}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "vkvg_tests", "samples\vkvg_tests\vkvg_tests.csproj", "{AE2E552F-D600-41DB-8FA2-7FD5C73D2C91}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,127 +41,113 @@ Global
 		Release|Any CPU = Release|Any CPU
 		temp|Any CPU = temp|Any CPU
 		DebugCrow|Any CPU = DebugCrow|Any CPU
+		BuildPackages|Any CPU = BuildPackages|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.temp|Any CPU.Build.0 = Debug|Any CPU
 		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+		{87AC7BE1-143E-4FF4-91F8-981B1CAAF1DD}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
 		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.temp|Any CPU.Build.0 = Debug|Any CPU
 		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F05E74F-AEE8-481C-8FDF-456654CC30BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F05E74F-AEE8-481C-8FDF-456654CC30BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F05E74F-AEE8-481C-8FDF-456654CC30BE}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F05E74F-AEE8-481C-8FDF-456654CC30BE}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+		{F41EA96F-A9F7-4E85-B2EE-5757C5FAD00D}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
 		{1603D809-D9C4-4EE5-B921-B053CE22E068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1603D809-D9C4-4EE5-B921-B053CE22E068}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1603D809-D9C4-4EE5-B921-B053CE22E068}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1603D809-D9C4-4EE5-B921-B053CE22E068}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1603D809-D9C4-4EE5-B921-B053CE22E068}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{1603D809-D9C4-4EE5-B921-B053CE22E068}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{1603D809-D9C4-4EE5-B921-B053CE22E068}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+		{1603D809-D9C4-4EE5-B921-B053CE22E068}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
 		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
 		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+		{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
 		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.temp|Any CPU.Build.0 = Debug|Any CPU
 		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
+		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+		{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
 		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.DebugCrow|Any CPU.ActiveCfg = DebugCrow|Any CPU
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991}.DebugCrow|Any CPU.Build.0 = DebugCrow|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.temp|Any CPU.Build.0 = Debug|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.temp|Any CPU.Build.0 = Debug|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
-		{C7746F60-3A53-41CE-9241-69F89E377CF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7746F60-3A53-41CE-9241-69F89E377CF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7746F60-3A53-41CE-9241-69F89E377CF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7746F60-3A53-41CE-9241-69F89E377CF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7746F60-3A53-41CE-9241-69F89E377CF1}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7746F60-3A53-41CE-9241-69F89E377CF1}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{E34F499F-99A4-4930-81F5-32E85CD39E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E34F499F-99A4-4930-81F5-32E85CD39E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E34F499F-99A4-4930-81F5-32E85CD39E13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E34F499F-99A4-4930-81F5-32E85CD39E13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.temp|Any CPU.Build.0 = Debug|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.temp|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.temp|Any CPU.Build.0 = Debug|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
+		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.DebugCrow|Any CPU.ActiveCfg = DebugCrow|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.DebugCrow|Any CPU.Build.0 = DebugCrow|Any CPU
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C06AD14-6170-476A-9446-585D113E401A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C06AD14-6170-476A-9446-585D113E401A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C06AD14-6170-476A-9446-585D113E401A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C06AD14-6170-476A-9446-585D113E401A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C06AD14-6170-476A-9446-585D113E401A}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C06AD14-6170-476A-9446-585D113E401A}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3F46936-9586-4E14-A876-95A031C2A178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3F46936-9586-4E14-A876-95A031C2A178}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3F46936-9586-4E14-A876-95A031C2A178}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3F46936-9586-4E14-A876-95A031C2A178}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3F46936-9586-4E14-A876-95A031C2A178}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3F46936-9586-4E14-A876-95A031C2A178}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{0819E729-64D0-4D96-B7A7-FFDE86639977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0819E729-64D0-4D96-B7A7-FFDE86639977}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0819E729-64D0-4D96-B7A7-FFDE86639977}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0819E729-64D0-4D96-B7A7-FFDE86639977}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2E552F-D600-41DB-8FA2-7FD5C73D2C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2E552F-D600-41DB-8FA2-7FD5C73D2C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE2E552F-D600-41DB-8FA2-7FD5C73D2C91}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2E552F-D600-41DB-8FA2-7FD5C73D2C91}.BuildPackages|Any CPU.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1F05E74F-AEE8-481C-8FDF-456654CC30BE} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
 		{3CFF99D3-8C0E-4B37-9146-9A7ED9D28CAA} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{D9C2AFFC-2BEC-487F-86F5-400516D8A991} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{BFD9B8B7-B7D2-4D25-B8DE-08D3EC6626CF} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{C91689E2-6F72-4812-8166-3EA500E2D5BE} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{C7746F60-3A53-41CE-9241-69F89E377CF1} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{28109FE9-9CA7-4B01-A184-5F612CC6C2E1} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{E34F499F-99A4-4930-81F5-32E85CD39E13} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{D6B4200E-25FA-4AFD-BD9E-4240BAF1AFE4} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{F134D6DF-893C-41B0-85FC-82E30773F3D5} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
-		{3FE2F866-C21D-4FED-B2F3-3385789165A2} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{E61D0F9F-734E-43B3-B077-D54C1DED7021} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{A258C8F7-2DA8-40C6-9D2F-70DF6D2E73BB} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{6C06AD14-6170-476A-9446-585D113E401A} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{91B415CF-2DFE-481D-90DF-6D7AABE2D747} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{E3F46936-9586-4E14-A876-95A031C2A178} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{0819E729-64D0-4D96-B7A7-FFDE86639977} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{FAA57EFA-275C-44D5-9008-2F67E79B2C07} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{BB1DC113-9594-43C5-AEC2-81A773AC415B} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{6F1AA09C-FFE2-45CC-AF39-CACA980D760B} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
+		{AE2E552F-D600-41DB-8FA2-7FD5C73D2C91} = {A2A2849A-0032-4AA8-BC0E-82C69D7DE354}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
diff --git a/vke/CVKL.csproj b/vke/CVKL.csproj
index b2c6032..9c556c0 100644
--- a/vke/CVKL.csproj
+++ b/vke/CVKL.csproj
@@ -6,7 +6,7 @@
     <Product>CVKL</Product>
     <PackageId>CVKL</PackageId>
     <PackageTags>C# vulkan game library compute glfw</PackageTags>    
-    <PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
+    <PackageVersion>$(AssemblyVersion)</PackageVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/jpbruyere/vk.net/blob/master/README.md</PackageProjectUrl>
@@ -43,7 +43,7 @@
   </ItemGroup>    
   <ItemGroup>
     <PackageReference Include="glTF2Loader" Version="1.1.3-alpha" />
-    <PackageReference Include="Vulkan" Version="0.1.4-beta" />
+    <PackageReference Include="Vulkan" Version="0.1.4" />
 <!--        <ProjectReference Include="$(SolutionDir)SpirVTask\SpirVTasks.csproj" />-->
   </ItemGroup>
   <ItemGroup>