update msbuild files

author: Jean-Philippe Bruyère <jp_bruyere@hotmail.com> 2019-05-22 21:24:23 +0200
committer: Jean-Philippe Bruyère <jp_bruyere@hotmail.com> 2019-05-22 21:24:23 +0200
commit: 9dda0ab45d80af342ad93705f14d4e719a44075b (patch)
tree: b64898f494c8a0e5bff4851879b3ec6e0cf0b3dd
parent: 4a66e4204a13cc3fe5c134f736d79058629c2502 (diff)
15 files changed, 128 insertions, 50 deletions
diff --git a/README.md b/README.md
index 15b8846..8e27394 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <h1 align="center">
-  C# Vulkan Library
+  C# Vulkan Libraries
   <br>  
 <p align="center">
   <a href="https://www.paypal.me/GrandTetraSoftware">
@@ -11,19 +11,79 @@
 # vk.net
 <a href="https://www.nuget.org/packages/Vulkan"><img src="https://buildstats.info/nuget/Vulkan"></a>
 
-Autogenerated low level Vulkan c# binding. Some code of the generator is derived from https://github.com/mellinoe.
-Parameters and structures use **IntPtr** and **ref/out** decorations instead of pointers. The nuget package is available under the name **Vulkan**.
-
-#### Port of the gltfPBR from Sacha Willems
+Autogenerated low level Vulkan c# binding. This project starts as a fork of the work of https://github.com/mellinoe. I made a new generator limiting the number of overrides and trying to avoid use of unsafe raw pointers.
+The nuget package is available under the name **Vulkan**.
 <p align="center">
   <a href="https://github.com/jpbruyere/vk.net/blob/master/samples/pbr/screenshot.png">
     <kbd><img src="https://github.com/jpbruyere/vk.net/blob/master/samples/pbr/screenshot.png" height="300"></kbd>
   </a>
+   Port of the gltfPBR from Sacha Willems
 </p>
 
 # CVKL
 <a href="https://www.nuget.org/packages/CVKL"><img src="https://buildstats.info/nuget/CVKL"></a>
+The second project included in this repository is a set of classes encapsulating vulkan objects with `IDispose` model and **reference counting**. [GLFW](https://www.glfw.org/)  handles the windowing system.
+Developping exclusively on linux, I would be glad to have some feedback frow windows experiences.
+
+### VkWindow class
+
+To create a new vulkan application, derrive your application from `VkWindow`.
+
+```csharp
+class Program : VkWindow {
+	static void Main (string[] args) {
+		Instance.VALIDATION = true;
+		
+		using (Program vke = new Program ()) {
+			vke.Run ();
+		}
+	}
+}
+```
+### Enabling features
+
+Override the `configureEnabledFeatures` method of `VkWindow` to enable features.
+```csharp
+protected override void configureEnabledFeatures (VkPhysicalDeviceFeatures available_features, ref VkPhysicalDeviceFeatures enabled_features) {
+	enabled_features.samplerAnisotropy = available_features.samplerAnisotropy;
+}
+```
+### Creating queues
+
+To create queues, override the `createQueues` method of `VkWindow`. This function is called before the logical device creation and will take care of physically available queues, creating duplicates if count exceed availability. The `base` method will create a default presentable queue.
+
+```csharp
+protected override void createQueues () {
+	base.createQueues ();
+	transferQ = new Queue (dev, VkQueueFlags.Transfer);
+}
+```
+### Rendering
+
+The constructor of the VkWIndow will finish the vulkan initialisation, so that you may create pipelines, buffers, and so on in your constructor.
+
+VkWindow will provide the default swapchain, but it's up to you to create the frame buffers. For the triangle example, create them in the `OnResize` override.
+```csharp
+Framebuffer[] frameBuffers;
+
+protected override void OnResize () {
+	if (frameBuffers != null)
+		for (int i = 0; i < swapChain.ImageCount; ++i)
+			frameBuffers[i]?.Dispose ();
+	frameBuffers = new Framebuffer[swapChain.ImageCount];
 
-Higher c# classes with `IDispose` model and reference counting.
+	for (int i = 0; i < swapChain.ImageCount; ++i) 
+		frameBuffers[i] = new Framebuffer (pipeline.RenderPass, swapChain.Width, swapChain.Height,
+			(pipeline.Samples == VkSampleCountFlags.SampleCount1) ? new Image[] {
+				swapChain.images[i],
+				null
+			} : new Image[] {
+				null,
+				null,
+				swapChain.images[i]
+			});
 
+	buildCommandBuffers ();
+}
+```
 
diff --git a/VK/vulkan.csproj b/VK/vulkan.csproj
index afaa2a9..bc15b4d 100644
--- a/VK/vulkan.csproj
+++ b/VK/vulkan.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     
     <Copyright></Copyright>
-    <AssemblyVersion>0.1.2.8</AssemblyVersion>
+    <AssemblyVersion>0.1.3</AssemblyVersion>
     <AssemblyName>VK</AssemblyName>
     <Description>C# vulkan binding</Description>
     <Company></Company>
@@ -12,7 +12,7 @@
         
     <PackageId>Vulkan</PackageId>
     <PackageTags>C# vulkan net binding</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>
@@ -23,15 +23,15 @@
     
     <Authors>Jean-Philippe Bruyère</Authors> 
     <SynchReleaseVersion>false</SynchReleaseVersion>
-    <OutputPath>$(SolutionDir)build\$(TargetFramework)\$(Configuration)\</OutputPath>
+    <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System" />    
   </ItemGroup>
     
   <ItemGroup>
-    <ProjectReference Include="..\vk.generator\vk.generator.csproj" />
-    <ProjectReference Include="..\vk.rewrite\vk.rewrite.csproj" />
+    <ProjectReference Include="..\vk.generator\vk.generator.csproj" PrivateAssets="All" />
+    <ProjectReference Include="..\vk.rewrite\vk.rewrite.csproj" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -41,23 +41,44 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
     
-  <ItemGroup>
-    <Compile Include="$(SolutionDir)vk.generator\bin\$(Configuration)\**\*.cs">
+<!--  <ItemGroup>
+    <Compile Include="../vk.generator/bin/$(Configuration)/$(TargetFramework)/*.cs">
       <Link>generated\%(Filename)%(Extension)</Link>
     </Compile>
-  </ItemGroup> 
+  </ItemGroup> -->
     
-  <Target Name="generate" BeforeTargets="BeforeBuild">
-    <Exec Condition="$(OS) == 'Windows_NT'" Command="$(SolutionDir)build/$(TargetFramework)rewrite/vk.rewrite.exe $(OutputPath)VK.dll" />
-    <Exec Condition="$(OS) != 'Windows_NT'" Command="mono $(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/vk.generator.exe" WorkingDirectory="$(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/" ConsoleToMSBuild="true" EchoOff="true">
+  <Target Name="generate" BeforeTargets="BeforeCompile">
+    <Exec Condition="$(OS) == 'Windows_NT'" Command="$(SolutionDir)vk.generator/bin/$(Configuration)/net471/vk.generator.exe" WorkingDirectory="$(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/" ConsoleToMSBuild="true" EchoOff="true">
         <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
-    </Exec>        
+    </Exec>
+        
+    <!--<Exec Condition="$(OS) != 'Windows_NT' and $(TargetFramework.StartsWith('net4'))" Command="mono $(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/vk.generator.exe" WorkingDirectory="$(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/" ConsoleToMSBuild="true" EchoOff="true">
+        <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+    </Exec>  
+    <Exec Condition="$(OS) != 'Windows_NT' and $(TargetFramework.StartsWith('netcore'))" Command="dotnet $(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/vk.generator.dll" WorkingDirectory="$(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/" ConsoleToMSBuild="true" EchoOff="true">
+        <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+    </Exec>-->  
+    <Exec Condition="$(OS) != 'Windows_NT'" Command="mono $(SolutionDir)vk.generator/bin/$(Configuration)/net471/vk.generator.exe" WorkingDirectory="$(SolutionDir)vk.generator/bin/$(Configuration)/$(TargetFramework)/" ConsoleToMSBuild="true" EchoOff="true">
+        <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+    </Exec>
+    <CreateItem Include="../vk.generator/bin/$(Configuration)/$(TargetFramework)/*.cs">            
+        <Output TaskParameter="Include" ItemName="Compile" />
+    </CreateItem>        
   </Target>
         
   <Target Name="rewrite" AfterTargets="CoreBuild">
-    <Exec Condition="$(OS) == 'Windows_NT'" Command="$(SolutionDir)build/$(TargetFramework)rewrite/vk.rewrite.exe $(OutputPath)VK.dll" />
-    <Exec Condition="$(OS) != 'Windows_NT'" Command="mono $(SolutionDir)vk.rewrite/bin/$(Configuration)/$(TargetFramework)/vk.rewrite.exe $(OutputPath)VK.dll" ConsoleToMSBuild="true" EchoOff="true">
+    <Exec Condition="$(OS) == 'Windows_NT'" Command="$(SolutionDir)vk.rewrite/bin/$(Configuration)/net471/vk.rewrite.exe $(OutputPath)VK.dll" ConsoleToMSBuild="true" EchoOff="true">
         <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
     </Exec>
+        
+    <!--<Exec Condition="$(OS) != 'Windows_NT' and $(TargetFramework.StartsWith('net4'))" Command="mono $(SolutionDir)vk.rewrite/bin/$(Configuration)/$(TargetFramework)/vk.rewrite.exe $(OutputPath)VK.dll" ConsoleToMSBuild="true" EchoOff="true">
+        <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+    </Exec>        
+    <Exec Condition="$(OS) != 'Windows_NT' and $(TargetFramework.StartsWith('netcore'))" Command="dotnet $(SolutionDir)vk.rewrite/bin/$(Configuration)/$(TargetFramework)/vk.rewrite.dll $(OutputPath)VK.dll" ConsoleToMSBuild="true" EchoOff="true">
+        <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+    </Exec>-->     
+    <Exec Condition="$(OS) != 'Windows_NT'" Command="mono $(SolutionDir)vk.rewrite/bin/$(Configuration)/net471/vk.rewrite.exe $(OutputPath)VK.dll" ConsoleToMSBuild="true" EchoOff="true">
+        <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
+    </Exec>        
   </Target>
 </Project>
diff --git a/samples/Textured/Textured.csproj b/samples/Textured/Textured.csproj
index 33a90c4..6d93943 100644
--- a/samples/Textured/Textured.csproj
+++ b/samples/Textured/Textured.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -21,7 +21,7 @@
     
   <ItemGroup>
     <PackageReference Include="glTF2Loader" Version="1.1.3-alpha" />
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />        
+    <PackageReference Include="Vulkan" Version="0.1.3" />        
   </ItemGroup>    
     
   <ItemGroup>
diff --git a/samples/TexturedCube/TexturedCube.csproj b/samples/TexturedCube/TexturedCube.csproj
index 6ee1a94..6dfe9a1 100644
--- a/samples/TexturedCube/TexturedCube.csproj
+++ b/samples/TexturedCube/TexturedCube.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -20,7 +20,7 @@
   </ItemGroup>    
     
   <ItemGroup>
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />        
+    <PackageReference Include="Vulkan" Version="0.1.3" />        
   </ItemGroup>    
     
   <ItemGroup>
diff --git a/samples/Triangle/Triangle.csproj b/samples/Triangle/Triangle.csproj
index f97079c..9d4fbf3 100644
--- a/samples/Triangle/Triangle.csproj
+++ b/samples/Triangle/Triangle.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -21,7 +21,7 @@
     
   <ItemGroup>
     <PackageReference Include="glTF2Loader" Version="1.1.3-alpha" />
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />        
+    <PackageReference Include="Vulkan" Version="0.1.3" />        
   </ItemGroup>    
     
   <ItemGroup>
diff --git a/samples/Triangle/main.cs b/samples/Triangle/main.cs
index e37d861..6a3fe5b 100644
--- a/samples/Triangle/main.cs
+++ b/samples/Triangle/main.cs
@@ -6,8 +6,8 @@ using VK;
 namespace Triangle {
 	class Program : VkWindow {
 		static void Main (string[] args) {
-			Instance.RenderDocCapture = true;
-			Instance.Validation = true;
+			Instance.RENDER_DOC_CAPTURE = true;
+			Instance.VALIDATION = true;
 
 			using (Program vke = new Program ()) {
 				vke.Run ();
diff --git a/samples/compute/compute.csproj b/samples/compute/compute.csproj
index e8f1276..5d34fdd 100644
--- a/samples/compute/compute.csproj
+++ b/samples/compute/compute.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -21,7 +21,7 @@
   </ItemGroup>    
     
   <ItemGroup>
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />        
+    <PackageReference Include="Vulkan" Version="0.1.3" />        
   </ItemGroup>    
     
   <ItemGroup>
diff --git a/samples/compute/delaunay.cs b/samples/compute/delaunay.cs
index a0af948..e7fc188 100644
--- a/samples/compute/delaunay.cs
+++ b/samples/compute/delaunay.cs
@@ -49,7 +49,7 @@ namespace delaunay {
 
 
 		public Program () : base () {
-			if (Instance.DebugUtils)
+			if (Instance.DEBUG_UTILS)
 				dbgReport = new DebugReport (instance,
 					VkDebugReportFlagsEXT.ErrorEXT
 					| VkDebugReportFlagsEXT.DebugEXT
diff --git a/samples/deferred/deferred.csproj b/samples/deferred/deferred.csproj
index a670d9f..8ee850e 100644
--- a/samples/deferred/deferred.csproj
+++ b/samples/deferred/deferred.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -48,7 +48,7 @@
   </ItemGroup>    
     
   <ItemGroup>
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />            
+    <PackageReference Include="Vulkan" Version="0.1.3" />            
     <ProjectReference Include="..\..\vke\CVKL.csproj" />    
     <PackageReference Include="Crow.VK" Version="0.9.0-beta" />
   </ItemGroup> 
diff --git a/samples/pbr/pbr.csproj b/samples/pbr/pbr.csproj
index 1e1cb59..b7830aa 100644
--- a/samples/pbr/pbr.csproj
+++ b/samples/pbr/pbr.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -23,7 +23,7 @@
   </ItemGroup>    
     
   <ItemGroup>
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />            
+    <PackageReference Include="Vulkan" Version="0.1.3" />            
     <PackageReference Include="vkvg.net" Version="0.2.2-beta" />
   </ItemGroup>    
     
diff --git a/samples/vkvg_tests/vkvg_tests.csproj b/samples/vkvg_tests/vkvg_tests.csproj
index 1e1cb59..b7830aa 100644
--- a/samples/vkvg_tests/vkvg_tests.csproj
+++ b/samples/vkvg_tests/vkvg_tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
@@ -23,7 +23,7 @@
   </ItemGroup>    
     
   <ItemGroup>
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />            
+    <PackageReference Include="Vulkan" Version="0.1.3" />            
     <PackageReference Include="vkvg.net" Version="0.2.2-beta" />
   </ItemGroup>    
     
diff --git a/vk.generator/vk.generator.csproj b/vk.generator/vk.generator.csproj
index 0bc275e..00a5935 100644
--- a/vk.generator/vk.generator.csproj
+++ b/vk.generator/vk.generator.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>        
diff --git a/vk.net.sln b/vk.net.sln
index 5d6ed69..4820388 100644
--- a/vk.net.sln
+++ b/vk.net.sln
@@ -35,13 +35,11 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{96A2E0B8-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{96A2E0B8-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96A2E0B8-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96A2E0B8-91AE-4EB9-A435-185D01E24067}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{96A2E0B8-91AE-4EB9-A435-185D01E24067}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
 		{96A2E0B8-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{96A2A7896-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{96A2A7896-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96A2A7896-91AE-4EB9-A435-185D01E24067}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96A2A7896-91AE-4EB9-A435-185D01E24067}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{96A2A7896-91AE-4EB9-A435-185D01E24067}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
 		{96A2A7896-91AE-4EB9-A435-185D01E24067}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -61,7 +59,6 @@ Global
 		{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}.Release|Any CPU.Build.0 = 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
 		{1603D809-D9C4-4EE5-B921-B053CE22E068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -73,12 +70,11 @@ Global
 		{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}.Release|Any CPU.Build.0 = 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
 		{001F5D64-871B-47A4-A823-78C7CE3785AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{001F5D64-871B-47A4-A823-78C7CE3785AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{001F5D64-871B-47A4-A823-78C7CE3785AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{001F5D64-871B-47A4-A823-78C7CE3785AA}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{001F5D64-871B-47A4-A823-78C7CE3785AA}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
@@ -88,14 +84,15 @@ Global
 		{BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.DebugCrow|Any CPU.ActiveCfg = DebugCrow|Any CPU
 		{BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.DebugCrow|Any CPU.Build.0 = DebugCrow|Any CPU
+		{BFF1BEEC-2E93-4963-AD3C-2A8C9BA05C36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05515E15-D3C3-4A8C-A940-9467D9D77823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05515E15-D3C3-4A8C-A940-9467D9D77823}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{05515E15-D3C3-4A8C-A940-9467D9D77823}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
 		{05515E15-D3C3-4A8C-A940-9467D9D77823}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05515E15-D3C3-4A8C-A940-9467D9D77823}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.temp|Any CPU.ActiveCfg = Debug|Any CPU
 		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.temp|Any CPU.Build.0 = Debug|Any CPU
 		{790642C5-7AD1-437D-9F9C-3F721133AFEF}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/vk.rewrite/vk.rewrite.csproj b/vk.rewrite/vk.rewrite.csproj
index 75962f1..804d8ca 100644
--- a/vk.rewrite/vk.rewrite.csproj
+++ b/vk.rewrite/vk.rewrite.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>        
diff --git a/vke/CVKL.csproj b/vke/CVKL.csproj
index 91add1b..fffbe7e 100644
--- a/vke/CVKL.csproj
+++ b/vke/CVKL.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)netfx.props" />
+  <Import Project="../netfx.props" />
   <PropertyGroup>
     <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     
     <Copyright></Copyright>
-    <AssemblyVersion>0.1.3.2</AssemblyVersion>
+    <AssemblyVersion>0.1.4</AssemblyVersion>
     <Description>C# vulkan library with IDispose model and references counting</Description>
     <Company></Company>
     <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>
@@ -48,7 +48,7 @@
   </ItemGroup>    
   <ItemGroup>
     <PackageReference Include="glTF2Loader" Version="1.1.3-alpha" />
-    <PackageReference Include="Vulkan" Version="0.1.2.8-beta" />        
+    <PackageReference Include="Vulkan" Version="0.1.3" />        
   </ItemGroup>
   <ItemGroup>        
     <None Remove="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />
author	Jean-Philippe Bruyère <jp_bruyere@hotmail.com>	2019-05-22 21:24:23 +0200
committer	Jean-Philippe Bruyère <jp_bruyere@hotmail.com>	2019-05-22 21:24:23 +0200
commit	9dda0ab45d80af342ad93705f14d4e719a44075b (patch)
tree	b64898f494c8a0e5bff4851879b3ec6e0cf0b3dd
parent	4a66e4204a13cc3fe5c134f736d79058629c2502 (diff)