Use BuildManagedTools argument instead of environment variable, removed unneeded...

Commit migrated from https://github.com/dotnet/coreclr/commit/a7358133ec2544de4c4ddce5a1f75a8f449cb2ef

diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
index 06d81cf..ebc789b 100644 (file)
--- a/src/coreclr/build.cmd
+++ b/src/coreclr/build.cmd
@@ -594,6 +594,10 @@ if %__BuildCoreLib% EQU 1 (
         set __ExtraBuildArgs=!__ExtraBuildArgs! -SkipSOS=true
     )
 
+    if "%__BuildManagedTools%" == "1" (
+        set __ExtraBuildArgs=!__ExtraBuildArgs! -BuildManagedTools=true
+    )
+
     if /i "%__BuildArch%" == "arm64" (
         set __nugetBuildArgs=-buildNugetPackage=false
     ) else if "%__SkipNugetPackage%" == "1" (

diff --git a/src/coreclr/build.proj b/src/coreclr/build.proj
index 1a633a6..3af8010 100644 (file)
--- a/src/coreclr/build.proj
+++ b/src/coreclr/build.proj
@@ -24,6 +24,7 @@
     <Delete Files="$(BinDir)SOS.NETCore.*" />
     <Delete Files="$(BinDir)mscorlib.*" />
     <Delete Files="$(BinDir)System.Private.CoreLib.*" />
+    <Delete Files="$(BinDir)netcoreapp2.0/R2RDump.*" />
   </Target>
 
   <!--

diff --git a/src/coreclr/config.json b/src/coreclr/config.json
index 65ebfa1..32cd726 100644 (file)
--- a/src/coreclr/config.json
+++ b/src/coreclr/config.json
@@ -312,6 +312,12 @@
       "values": [ true, false ],
       "defaultValue": false
     },
+    "BuildManagedTools": {
+      "description": "",
+      "valueType": "property",
+      "values": [ true, false ],
+      "defaultValue": true
+    },
     "SignType": {
       "description": "Sets the SignType.",
       "valueType": "property",

diff --git a/src/coreclr/src/build.proj b/src/coreclr/src/build.proj
index a207114..0f60058 100644 (file)
--- a/src/coreclr/src/build.proj
+++ b/src/coreclr/src/build.proj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <Project Condition="$(SkipSOS) != 'true'" Include="ToolBox\SOS\NETCore\SOS.NETCore.csproj" />
     <Project Include="System.Private.CoreLib\System.Private.CoreLib.csproj" />
-    <Project Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(__BuildManagedTools)' == '1'" Include="tools/r2rdump/R2RDump.csproj" />
+    <Project Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(BuildManagedTools)' == 'true'" Include="tools/r2rdump/R2RDump.csproj" />
   </ItemGroup>
 
   <Import Project="..\dir.targets" />
@@ -27,7 +27,7 @@
     <CoreLibPDBPath>$(BinDir)System.Private.CoreLib.pdb</CoreLibPDBPath>
   </PropertyGroup>
 
-  <Target Name="RestoreR2RDumpPackages" Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(__BuildManagedTools)' == '1'" BeforeTargets="Build">
+  <Target Name="RestoreR2RDumpPackages" Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(BuildManagedTools)' == 'true'" BeforeTargets="Build">
     <Exec Command="$(DotnetRestoreCommand) tools/r2rdump/R2RDump.csproj"
           StandardOutputImportance="Low" />
   </Target>

diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj
index f86ef6c..5344edd 100644 (file)
--- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj
+++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj
@@ -7,11 +7,8 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <OutputType>Exe</OutputType>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <NoStdLib>true</NoStdLib>
-    <NoCompilerStandardLib>true</NoCompilerStandardLib>
-    <IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
-    <AssemblyKey>Open</AssemblyKey>
-    <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade>
+       <AssemblyKey>Open</AssemblyKey>
+       <IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
   </PropertyGroup>
 
   <PropertyGroup>