From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 27 Jan 2020 11:16:40 +0000 (+0100)
Subject: update version to 0.1.13-beta, share vke versionning in top dir.props
X-Git-Tag: v0.1.21~13
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=18f064463b8e9c8dc787cfc7b62464e3747831a7;p=jp%2Fvke.net.git

update version to 0.1.13-beta, share vke versionning in top dir.props
---

diff --git a/Directory.Build.props b/Directory.Build.props
index 999299b..78bca32 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,5 +4,10 @@
 		<RestoreAdditionalProjectSources Condition="Exists('$(SolutionDir)build\$(Configuration)\')">$(SolutionDir)build\$(Configuration)\</RestoreAdditionalProjectSources>
 		<SpirVTasksReleaseVersion>0.1.41</SpirVTasksReleaseVersion>
 		<SpirVTasksPackageVersion>$(SpirVTasksReleaseVersion)-beta</SpirVTasksPackageVersion>
+		<VkeReleaseVersion>0.1.13</VkeReleaseVersion>
+		<VkePackageVersion>$(VkeReleaseVersion)-beta</VkePackageVersion>
+		
+		<LangVersion>7.2</LangVersion>
+
 	</PropertyGroup>
 </Project>
diff --git a/addons/Directory.Build.props b/addons/Directory.Build.props
index ba37f8f..33208f1 100644
--- a/addons/Directory.Build.props
+++ b/addons/Directory.Build.props
@@ -13,9 +13,7 @@
 		<OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>    	    
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
-		
-		<LangVersion>7.2</LangVersion>
-		
+				
 		<SpirVAdditionalIncludeDirectories>$(MSBuildThisFileDirectory)common\shaders</SpirVAdditionalIncludeDirectories>
 		
 		<RestoreAdditionalProjectSources Condition="Exists('$(SolutionDir)build\$(Configuration)\')">$(SolutionDir)build\$(Configuration)\</RestoreAdditionalProjectSources>
@@ -32,7 +30,7 @@
 		<ProjectReference Include="..\..\vke\vke.csproj" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildPackages|AnyCPU' ">
-		<PackageReference Include="vke" Version="0.1.12-beta" />
+		<PackageReference Include="vke" Version="$(VkePackageVersion)" />
 	</ItemGroup>
 	
 	<ItemGroup>
diff --git a/appveyor.yml b/appveyor.yml
index c712653..df4edee 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.1.12.{build}
+version: 0.1.13.{build}
 
 image:
   - Visual Studio 2019
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index a0f1de6..488ccaa 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -12,7 +12,7 @@
 
 		<OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
 		<OutputType>Exe</OutputType>
-		<!--<AllowUnsafeBlocks>true</AllowUnsafeBlocks>-->
+		
 		<IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
 
 		<SpirVAdditionalIncludeDirectories>$(MSBuildThisFileDirectory)common\shaders</SpirVAdditionalIncludeDirectories>
@@ -31,7 +31,7 @@
 		<ProjectReference Include="..\..\vke\vke.csproj" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'BuildPackages|AnyCPU' ">
-		<PackageReference Include="vke" Version="0.1.12-beta" />
+		<PackageReference Include="vke" Version="$(VkePackageVersion)" />
 	</ItemGroup>
 			
 	<ItemGroup>
diff --git a/vke.net.sln b/vke.net.sln
index 3f41d4e..1ce579e 100644
--- a/vke.net.sln
+++ b/vke.net.sln
@@ -5,7 +5,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpirVTasks", "SpirVTasks\Sp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vke", "vke\vke.csproj", "{642726F4-0592-4846-8EAF-A5D1964C85A7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7285454A-930F-4536-AB84-C076B44C0C80}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "addons", "addons", "{4AA67AB0-C331-4CB2-9C00-B74F5DE31658}"
+	ProjectSection(SolutionItems) = preProject
+		addons/Directory.Build.props = "Directory.Build.props"
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentPipeline", "addons\EnvironmentPipeline\EnvironmentPipeline.csproj", "{F04C3F79-2E08-4D35-A804-43039DCB7F5E}"
 EndProject
@@ -16,6 +24,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkvgPipeline", "addons\VkvgPipeline\VkvgPipeline.csproj", "{611541A0-CE88-4A83-A6FF-3917971841C9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{16439374-B8DB-4643-8116-EB3358B49A12}"
+	ProjectSection(SolutionItems) = preProject
+		samples/Directory.Build.props = "Directory.Build.props"
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Triangle", "samples\Triangle\Triangle.csproj", "{124152F8-FAE6-4D4B-87B9-6074DD365E9B}"
 EndProject
diff --git a/vke/vke.csproj b/vke/vke.csproj
index 6646adf..2e3a86b 100644
--- a/vke/vke.csproj
+++ b/vke/vke.csproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>		
+    <TargetFramework>netstandard2.0</TargetFramework>
 		
-		<ReleaseVersion>0.1.12</ReleaseVersion>		
+		<ReleaseVersion>$(VkeReleaseVersion)</ReleaseVersion>
 		
-		<AssemblyVersion>$(ReleaseVersion)</AssemblyVersion>
+		<AssemblyVersion>$(VkeReleaseVersion)</AssemblyVersion>
 		<Description>C# vulkan library with IDispose model and references counting</Description>		
 		<RepositoryUrl>https://github.com/jpbruyere/vke.net</RepositoryUrl>
 		<PackageTags>vulkan game engine compute glfw c#</PackageTags>
-		<PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
+		<PackageVersion>$(VkePackageVersion)</PackageVersion>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
@@ -53,7 +53,7 @@
 		
 	<ItemGroup>
 		<PackageReference Include="SpirVTasks" Version="$(SpirVTasksPackageVersion)" />
-		<PackageReference Include="Vulkan" Version="0.2.0-beta" />
+		<PackageReference Include="Vulkan" Version="0.2.1-beta" />
 	</ItemGroup>
 	<ItemGroup>
 		<GLSLShader Include="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />