Merge pull request #184 from kellogg92/fix-wpf-without-net-core-3

Fix WPF Regression #158 when .net-core 3.0 preview is not installed
novotnyllc · Sep 19, 2019 · 8e4f1cc · 8e4f1cc
2 parents 1d3ed09 + 80cbfa5
commit 8e4f1cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/MSBuild.Sdk.Extras/Build/ExtrasShim.targets b/Source/MSBuild.Sdk.Extras/Build/ExtrasShim.targets
@@ -26,7 +26,7 @@
     <UseWindowsForms Condition="'$(UseWindowsForms)' == '' and '$(ExtrasEnableWinFormsProjectSetup)' == 'true' ">true</UseWindowsForms>
 
     <!-- Until there's a discreet property for this, default based on Wpf/WinForms -->
-    <ExtrasUseWindowsDesktopApp Condition="'$(UseWpf)' == 'true' or '$(UseWindowsForms)' == 'true'">true</ExtrasUseWindowsDesktopApp>
+    <ExtrasUseWindowsDesktopApp Condition="'$(_ExtrasHasDesktopSdk)' == 'true' and ('$(UseWpf)' == 'true' or '$(UseWindowsForms)' == 'true')">true</ExtrasUseWindowsDesktopApp>
     <ExtrasUseWindowsDesktopApp Condition="'$(ExtrasUseWindowsDesktopApp)' == '' ">false</ExtrasUseWindowsDesktopApp>
   </PropertyGroup>