From a7aeab79d8a971e99d8b2678985abe7dc01dca80 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Wed, 18 Oct 2017 12:17:03 -0700
Subject: [PATCH] Fix problems with excluding MSBuildSdkResolver from build

---
 build/Compile.targets       | 2 +-
 build/Prepare.targets       | 4 ++--
 build/package/Nupkg.targets | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index 044c10303..1369ad7d5 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -15,7 +15,7 @@
 
     <!-- Build MSBuildSdkResolver for all target frameworks (so we can build and test it x-plat) -->
     <MSBuild Projects="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj"
-             Condition="'$(IncludeMSBuildSdkResolver)' != 'false'" />
+             Condition="'$(IncludeMSBuildSdkResolver)' == 'true'" />
 
     <!-- Publish MSBuildSdkResolver for net46 (to prepare it for the VS insertion nupkg packaging) -->
     <MSBuild Projects="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj"
diff --git a/build/Prepare.targets b/build/Prepare.targets
index d363483a5..e0cdb1bd2 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -68,8 +68,8 @@
 
   <Target Name="SetupRestoreSrcPackagesInputsOutputs">
     <ItemGroup>
-      <RestoreSrcPackagesInput Include="$(RepoRoot)/src/**/*.csproj" Exclude="$(RepoRoot)/src/**/%24projectName%24.csproj" />
-      <RestoreSrcPackagesInput Remove="$(RepoRoot)/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj" Condition="'$(IncludeMSBuildSdkResolver)' == 'false'" />
+      <RestoreSrcPackagesInput Include="$(RepoRoot)/src/**/*.csproj" />
+      <RestoreSrcPackagesInput Remove="%(RestoreSrcPackagesInput.Identity)" Condition="'%(RestoreSrcPackagesInput.Filename)' == 'Microsoft.DotNet.MSBuildSdkResolver' and '$(IncludeMSBuildSdkResolver)' != 'true'" />
     </ItemGroup>
   </Target>
 
diff --git a/build/package/Nupkg.targets b/build/package/Nupkg.targets
index d7287c8b7..07b7524cc 100644
--- a/build/package/Nupkg.targets
+++ b/build/package/Nupkg.targets
@@ -11,7 +11,7 @@
         <ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
         <Version>$(SdkNugetVersion)</Version>
       </ProjectsToPack>
-      <ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver" >
+      <ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.MSBuildSdkResolver" Condition="'$(IncludeMSBuildSdkResolver)' == 'true'" >
         <ProjectName>Microsoft.DotNet.MSBuildSdkResolver</ProjectName>
         <Version>$(SdkNugetVersion)</Version>
       </ProjectsToPack>