Ensure MSBuild properties get persisted to child MSBuild tasks, fixes…

… a race condition in the build (#8404)
dotnet · Dec 5, 2016 · b51bcf1 · b51bcf1
1 parent a0a055b
commit b51bcf1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
@@ -3,7 +3,6 @@
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
  <PropertyGroup>
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <BuildingForReliabilityFramework>true</BuildingForReliabilityFramework>
  <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
  <AssemblyName>ReliabilityFramework</AssemblyName>
  <SchemaVersion>2.0</SchemaVersion>
@@ -53,6 +52,6 @@
  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
  <Target Name="AfterBuild">
- <MSBuild Projects="@(StressTests)" Properties="OutputPath=$(OutDir)\Tests" />
+ <MSBuild Projects="@(StressTests)" Properties="OutputPath=$(OutDir)\Tests;BuildingForReliabilityFramework=true" />
  </Target>
 </Project>
diff --git a/tests/src/GC/Stress/Tests/dir.targets b/tests/src/GC/Stress/Tests/dir.targets
@@ -1,6 +1,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
- <DisableProjectBuild Condition="'$(BuildingForReliabilityFramework)' == 'true'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildingForReliabilityFramework)' != 'true'">true</DisableProjectBuild>
  </PropertyGroup>
  <Import Project="..\..\..\dir.targets" />
 </Project>