Merge pull request #5963 from dotnet-bot/from-tfs

Merge changes from TFS

Author: adityamandaleeka

src/mscorlib/System.Private.CoreLib.csproj

@@ -174,7 +174,11 @@
     </SplitTextStringResource>
   </ItemGroup>
 
-  <Target Name="CDefineChecker" BeforeTargets="Build">
+  <PropertyGroup>
+    <CheckCDefines Condition="'$(CheckCDefines)'==''">true</CheckCDefines>
+  </PropertyGroup>
+
+  <Target Name="CDefineChecker" BeforeTargets="Build" Condition="'$(CheckCDefines)'=='true'">
     <!-- Compiler Definition Verification -->
     <Message Importance="High" Text="============" />
     <PropertyGroup>