Skip to content

Commit 34f4f7a

Browse files
committed
Use locally-named properties in Veldrid.SPIRV.targets
Bump version to 1.0.9.
1 parent 18dd7f7 commit 34f4f7a

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/Veldrid.SPIRV/build/net40/Veldrid.SPIRV.targets

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</_IsWindows>
5-
<_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</_IsMacOS>
6-
<_IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</_IsLinux>
4+
<_Veldrid_SPIRV_IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</_Veldrid_SPIRV_IsWindows>
5+
<_Veldrid_SPIRV_IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</_Veldrid_SPIRV_IsMacOS>
6+
<_Veldrid_SPIRV_IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</_Veldrid_SPIRV_IsLinux>
77

8-
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64</_NativeRuntime>
9-
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_NativeRuntime>
10-
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_NativeRuntime>
11-
<_NativeRuntime Condition=" '$(_NativeRuntime)' == '' And '$(_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_NativeRuntime>
8+
<_Veldrid_SPIRV_NativeRuntime Condition=" '$(_Veldrid_SPIRV_NativeRuntime)' == '' And '$(_Veldrid_SPIRV_IsMacOS)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">osx-x64</_Veldrid_SPIRV_NativeRuntime>
9+
<_Veldrid_SPIRV_NativeRuntime Condition=" '$(_Veldrid_SPIRV_NativeRuntime)' == '' And '$(_Veldrid_SPIRV_IsLinux)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">linux-x64</_Veldrid_SPIRV_NativeRuntime>
10+
<_Veldrid_SPIRV_NativeRuntime Condition=" '$(_Veldrid_SPIRV_NativeRuntime)' == '' And '$(_Veldrid_SPIRV_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'true' Or '$(PlatformTarget)' == 'x86')">win-x86</_Veldrid_SPIRV_NativeRuntime>
11+
<_Veldrid_SPIRV_NativeRuntime Condition=" '$(_Veldrid_SPIRV_NativeRuntime)' == '' And '$(_Veldrid_SPIRV_IsWindows)' == 'true' And ('$(Prefer32Bit)' == 'false' Or '$(PlatformTarget)' == 'x64')">win-x64</_Veldrid_SPIRV_NativeRuntime>
1212

13-
<_NativeLibName Condition="'$(_NativeRuntime)' == 'win-x86' Or '$(_NativeRuntime)' == 'win-x64'">libveldrid-spirv.dll</_NativeLibName>
14-
<_NativeLibName Condition="'$(_NativeRuntime)' == 'osx-x64'">libveldrid-spirv.dylib</_NativeLibName>
15-
<_NativeLibName Condition="'$(_NativeRuntime)' == 'linux-x64'">libveldrid-spirv.so</_NativeLibName>
13+
<_Veldrid_SPIRV_NativeLibName Condition="'$(_Veldrid_SPIRV_NativeRuntime)' == 'win-x86' Or '$(_Veldrid_SPIRV_NativeRuntime)' == 'win-x64'">libveldrid-spirv.dll</_Veldrid_SPIRV_NativeLibName>
14+
<_Veldrid_SPIRV_NativeLibName Condition="'$(_Veldrid_SPIRV_NativeRuntime)' == 'osx-x64'">libveldrid-spirv.dylib</_Veldrid_SPIRV_NativeLibName>
15+
<_Veldrid_SPIRV_NativeLibName Condition="'$(_Veldrid_SPIRV_NativeRuntime)' == 'linux-x64'">libveldrid-spirv.so</_Veldrid_SPIRV_NativeLibName>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<Content Condition="'$(_NativeRuntime)' != ''" Include="$(MSBuildThisFileDirectory)..\..\runtimes\$(_NativeRuntime)\native\$(_NativeLibName)">
18+
<Content Condition="'$(_Veldrid_SPIRV_NativeRuntime)' != ''" Include="$(MSBuildThisFileDirectory)..\..\runtimes\$(_Veldrid_SPIRV_NativeRuntime)\native\$(_Veldrid_SPIRV_NativeLibName)">
1919
<Link>%(Filename)%(Extension)</Link>
2020
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2121
<Visible>False</Visible>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"publicReleaseRefSpec": [
55
"^refs/tags/v\\d+\\.\\d+" // we also release tags starting with vN.N
66
],

0 commit comments

Comments
 (0)