Skip to content

Commit

Permalink
Fixed: WPF workaround for importing extensions does not always work
Browse files Browse the repository at this point in the history
The issue happens when BaseIntermediateOutputPath is overridden, thus
MSBuildProjectExtensionsPath gets assigned without generated suffix
even in *_wpftmp.*proj file.
Since _SdkOriginalProjectExtensionsPath didn't have a fallback value -
that prevented importing project extensions. This change adds the
fallback, making it effectively like "if there's a suffix - remove it,
otherwise use as is".
  • Loading branch information
van.danilov@gmail.com committed Jan 11, 2020
1 parent 3f71919 commit 02dec26
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Source/MSBuild.Sdk.Extras/Build/Workarounds.props
Expand Up @@ -39,6 +39,7 @@
<PropertyGroup Condition="'$(_SdkOriginalProjectName)' != ''">
<_SdkOriginalProjectFile>$(_SdkOriginalProjectName)$(MSBuildProjectExtension)</_SdkOriginalProjectFile>
<_SdkOriginalProjectExtensionsPath Condition="$(MSBuildProjectExtensionsPath.Contains('$(MSBuildProjectName)'))">$(MSBuildProjectExtensionsPath.Replace('$(MSBuildProjectName)', '$(_SdkOriginalProjectName)'))</_SdkOriginalProjectExtensionsPath>
<_SdkOriginalProjectExtensionsPath Condition=" '$(_SdkOriginalProjectExtensionsPath)' == '' ">$(MSBuildProjectExtensionsPath)</_SdkOriginalProjectExtensionsPath>
<RestoreOutputPath>$(_SdkOriginalProjectExtensionsPath)</RestoreOutputPath>
</PropertyGroup>

Expand Down

0 comments on commit 02dec26

Please sign in to comment.