Skip to content

Commit

Permalink
Revert "[Build] Add XenkoBuildDoc parameter to force TargetFramework …
Browse files Browse the repository at this point in the history
…even if not specified (seems necessary for older version of Roslyn used in docfx)"

Should not be necessary anymore with docfx 2.47

This reverts commit 35923fa.
  • Loading branch information
xen2 committed Oct 30, 2019
1 parent e822a04 commit 6c4dfce
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions sources/targets/Xenko.Core.PreSettings.targets
Expand Up @@ -45,9 +45,6 @@
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';UWP;'))">$(XenkoRuntimeTargetFrameworks);uap10.0.16299</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Android;'))">$(XenkoRuntimeTargetFrameworks);monoandroid81</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';iOS;'))">$(XenkoRuntimeTargetFrameworks);xamarinios10</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeTargetFrameworks>$([MSBuild]::Unescape($(XenkoRuntimeTargetFrameworks.Trim(';'))))</XenkoRuntimeTargetFrameworks>
<TargetFrameworks>$(XenkoRuntimeTargetFrameworks)</TargetFrameworks>
<TargetFramework Condition="'$(XenkoBuildDoc)' == 'true' And '$(TargetFramework)' == ''">$(TargetFrameworks.Split(';', StringSplitOptions.RemoveEmptyEntries)[0])</TargetFramework>

<XenkoRuntimeIdentifiers Condition="'$(XenkoRuntimeNetStandardNoRuntimeIdentifiers)' != 'true' And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoPlatforms.Contains(';Windows;'))">$(XenkoRuntimeIdentifiers);win</XenkoRuntimeIdentifiers>
<XenkoRuntimeIdentifiers Condition="'$(XenkoRuntimeNetStandardNoRuntimeIdentifiers)' != 'true' And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoPlatforms.Contains(';Linux;'))">$(XenkoRuntimeIdentifiers);linux</XenkoRuntimeIdentifiers>
Expand All @@ -65,12 +62,12 @@
<!-- Otherwise compute fallback -->
<XenkoRuntimeIdentifier Condition="'$(XenkoRuntimeIdentifiers)' != '' And '$(XenkoRuntimeIdentifier)' == ''">$(XenkoRuntimeIdentifiers.Split(';', StringSplitOptions.RemoveEmptyEntries)[0])</XenkoRuntimeIdentifier>

<XenkoRuntimeTargetFrameworks>$([MSBuild]::Unescape($(XenkoRuntimeTargetFrameworks.Trim(';'))))</XenkoRuntimeTargetFrameworks>
<XenkoRuntimeIdentifiers>$([MSBuild]::Unescape($(XenkoRuntimeIdentifiers.Trim(';'))))</XenkoRuntimeIdentifiers>

<TargetFrameworks>$(XenkoRuntimeTargetFrameworks)</TargetFrameworks>
<RuntimeIdentifiers Condition="'$(XenkoRuntimeIdentifiers)' != ''">$(XenkoRuntimeIdentifiers)</RuntimeIdentifiers>

<RuntimeIdentifier Condition="'$(XenkoBuildDoc)' == 'true' And '$(RuntimeIdentifier)' == ''">$(XenkoRuntimeIdentifier)</RuntimeIdentifier>

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

<!-- UpToDate check doesn't work with multi-TFM projects! https://github.com/dotnet/project-system/issues/2487 -->
Expand Down

0 comments on commit 6c4dfce

Please sign in to comment.