Skip to content

Commit

Permalink
Merge pull request #150 from KexyBiscuit/patch-1
Browse files Browse the repository at this point in the history
Try fixing #149.
  • Loading branch information
Oren Novotny committed Feb 9, 2019
2 parents 9d0ed92 + 4583e8e commit 3b76acb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Source/MSBuild.Sdk.Extras/Build/Workarounds.targets
Expand Up @@ -73,7 +73,7 @@
-->
<Target Name="_SdkDesignTimeBuildAndIntelliSenseWorkaround"
AfterTargets="_CheckCompileDesignTimePrerequisite"
Condition=" '$(_ExtrasHasDesktopSdk)' != 'true' and '@(ApplicationDefinition)' != '' OR '@(Page)' != '' OR '@(Resource)' != ''">
Condition=" '$(_ExtrasHasDesktopSdk)' != 'true' and ('@(ApplicationDefinition)' != '' OR '@(Page)' != '' OR '@(Resource)' != '')">
<PropertyGroup>
<BuildingProject>false</BuildingProject>
<DesignTimeBuild>true</DesignTimeBuild>
Expand All @@ -90,7 +90,7 @@
DependsOnTargets="PrepareLibraryLayout"
Condition="'$(GenerateLibraryLayout)' == 'true' AND '$(SDKIdentifier)' == 'Windows'">
<ItemGroup>
<TfmSpecificPackageFile Include="@(_LayoutFile)"
<TfmSpecificPackageFile Include="@(_LayoutFile)"
Condition="'$(ProjectName)' == '%(_LayoutFile.ProjectName)'"
PackagePath="lib\$(TargetFramework)\%(_LayoutFile.TargetPath)"/>
</ItemGroup>
Expand Down Expand Up @@ -123,4 +123,4 @@
<Warning Text="There are known issues using the 'Pack' target that comes with the v1 SDKs. Update to v2 and above SDKs to use the fixed 'Pack' target. If you don't need the fixed 'Pack' target the set 'ExtrasIgnoreOldSdkWarning' property to 'true'. If you need to use the v1 SDKs and to use the 'Pack' target, then add a 'NuGet.Build.Tasks.Pack' v4.3.0 and above, as a dependency to proceed."/>
</Target>

</Project>
</Project>

0 comments on commit 3b76acb

Please sign in to comment.