diff options
| author | Amy Yu <amycmyu@gmail.com> | 2018-07-03 12:13:51 -0700 |
|---|---|---|
| committer | Amy Yu <amycmyu@gmail.com> | 2018-07-09 11:50:19 -0700 |
| commit | a7358133ec2544de4c4ddce5a1f75a8f449cb2ef (patch) | |
| tree | 7421dd1a827dc1b514cbe517a8f4eb0e00bd88f9 | |
| parent | a5fbfa57fe7c9dc83d7f7bd4b464b97ffeed35d4 (diff) | |
| download | coreclr-a7358133ec2544de4c4ddce5a1f75a8f449cb2ef.tar.gz coreclr-a7358133ec2544de4c4ddce5a1f75a8f449cb2ef.tar.bz2 coreclr-a7358133ec2544de4c4ddce5a1f75a8f449cb2ef.zip | |
Use BuildManagedTools argument instead of environment variable, removed unneeded flags
| -rw-r--r-- | build.cmd | 4 | ||||
| -rw-r--r-- | build.proj | 1 | ||||
| -rw-r--r-- | config.json | 6 | ||||
| -rw-r--r-- | src/build.proj | 4 | ||||
| -rw-r--r-- | src/tools/r2rdump/R2RDump.csproj | 7 |
5 files changed, 15 insertions, 7 deletions
@@ -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/build.proj b/build.proj index 1a633a65b4..3af8010944 100644 --- a/build.proj +++ b/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/config.json b/config.json index 65ebfa1c7d..32cd726387 100644 --- a/config.json +++ b/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/build.proj b/src/build.proj index a207114d0f..0f60058a92 100644 --- a/src/build.proj +++ b/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/tools/r2rdump/R2RDump.csproj b/src/tools/r2rdump/R2RDump.csproj index f86ef6c713..5344edd470 100644 --- a/src/tools/r2rdump/R2RDump.csproj +++ b/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> |