Skip to content
Permalink
Browse files

[Build] Make sure to override RuntimeIdentifiers on UWP otherwise it …

…builds all CPU versions and result in write conflicts
  • Loading branch information
xen2 committed Jan 8, 2019
1 parent e1384eb commit a86d1de46afa610626e260f8f7c392eb361cb676
Showing with 3 additions and 0 deletions.
  1. +1 −0 sources/targets/Xenko.Core.PreSettings.targets
  2. +2 −0 sources/targets/Xenko.GlobalSettings.targets
@@ -30,6 +30,7 @@
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0'))">
<!-- Reset runtime identifier by default (otherwise GetPackagingOutputs fail) -->
<RuntimeIdentifier></RuntimeIdentifier>
<RuntimeIdentifiers></RuntimeIdentifiers>
<WindowsAppContainer>false</WindowsAppContainer>
<AppxPackage>false</AppxPackage>
<Platform>AnyCPU</Platform>
@@ -35,6 +35,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(XenkoGraphicsApiDependent)' == 'true' And '$(XenkoGraphicsApiDependentBuildAll)' == 'true'">
<!-- Cross-compilation (multiple platforms at once) -->
<RuntimeIdentifiers></RuntimeIdentifiers>
<RuntimeIdentifiers Condition="($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoPlatforms.Contains(';Windows;'))">win-d3d11;win-d3d12;win-opengl;win-opengles;win-vulkan</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoPlatforms.Contains(';Linux;'))">$(RuntimeIdentifiers);linux-opengl;linux-vulkan</RuntimeIdentifiers>
<!-- Override if building a specific platform -->
@@ -43,6 +44,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(XenkoGraphicsApiDependent)' == 'true'">
<RuntimeIdentifiers>$([MSBuild]::Unescape($(RuntimeIdentifiers.Trim(';'))))</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(TargetFramework)' != 'netstandard2.0' And '$(RuntimeIdentifiers)' == ''">win</RuntimeIdentifiers>
<RuntimeIdentifierDefault Condition="'$(RuntimeIdentifiers)' != ''">$(RuntimeIdentifiers.Split(';')[0])</RuntimeIdentifierDefault>

<ExtrasBuildEachRuntimeIdentifier Condition="'$(RuntimeIdentifiers)' != ''">true</ExtrasBuildEachRuntimeIdentifier>

0 comments on commit a86d1de

Please sign in to comment.
You can’t perform that action at this time.