Move the capability workaround out of the SDK (it will be in the desi…

…gn time targets) and add the InferredFromUsage workaround back.
JulianoCristian · Mar 16, 2017 · 523c055 · 523c055
1 parent fcee9ac
commit 523c055
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.props
@@ -119,6 +119,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     <GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime>
   </PropertyGroup>
 
+  <!-- Workaround: https://github.com/Microsoft/msbuild/issues/1878 -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
+
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.CSharp.props" Condition="'$(MSBuildProjectExtension)' == '.csproj'" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.VisualBasic.props" Condition="'$(MSBuildProjectExtension)' == '.vbproj'" />
 </Project>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.targets
@@ -434,11 +434,4 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
-
-  <!-- Remove the ProjectConfigurationsInferredFromUsage included in the C#/VB targets so that it doesn't
-       collides with ProjectConfigurationsDeclaredDimensions. This should be removed from those targets
-       directly but those come from a different repo so until all changes meet remove the capability here-->
-  <ItemGroup>
-    <ProjectCapability Remove="ProjectConfigurationsInferredFromUsage" />
-  </ItemGroup>
 </Project>