Merge pull request #201 from ivan-danilov/fix-wpf-workaround

Fixed: WPF workaround for importing extensions does not always work
novotnyllc · Jul 24, 2020 · 3caa026 · 3caa026
2 parents e1c08af + 7cb4761
commit 3caa026
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/Workarounds.props b/Source/MSBuild.Sdk.Extras/Build/Workarounds.props
@@ -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>