From 02dec265b1bd15555436061a3b0d1dd4fae99996 Mon Sep 17 00:00:00 2001 From: "van.danilov@gmail.com" Date: Fri, 10 Jan 2020 21:03:51 -0800 Subject: [PATCH] Fixed: WPF workaround for importing extensions does not always work 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". --- Source/MSBuild.Sdk.Extras/Build/Workarounds.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/MSBuild.Sdk.Extras/Build/Workarounds.props b/Source/MSBuild.Sdk.Extras/Build/Workarounds.props index be78ece..53a4cb6 100644 --- a/Source/MSBuild.Sdk.Extras/Build/Workarounds.props +++ b/Source/MSBuild.Sdk.Extras/Build/Workarounds.props @@ -39,6 +39,7 @@ <_SdkOriginalProjectFile>$(_SdkOriginalProjectName)$(MSBuildProjectExtension) <_SdkOriginalProjectExtensionsPath Condition="$(MSBuildProjectExtensionsPath.Contains('$(MSBuildProjectName)'))">$(MSBuildProjectExtensionsPath.Replace('$(MSBuildProjectName)', '$(_SdkOriginalProjectName)')) + <_SdkOriginalProjectExtensionsPath Condition=" '$(_SdkOriginalProjectExtensionsPath)' == '' ">$(MSBuildProjectExtensionsPath) $(_SdkOriginalProjectExtensionsPath)