<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)' == 'true'" Include="tools/r2rdump/R2RDump.csproj" />
</ItemGroup>
<Import Project="..\dir.targets" />
<CoreLibPDBPath>$(BinDir)System.Private.CoreLib.pdb</CoreLibPDBPath>
</PropertyGroup>
- <Target Name="RestoreR2RDumpPackages" Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(BuildManagedTools)' == 'true'" BeforeTargets="Build">
+ <Target Name="RestoreAndBuildR2RDumpPackages" Condition="'$(DotNetBuildFromSource)' != 'true' AND '$(BuildManagedTools)' == 'true'" BeforeTargets="Build">
<Exec Command="$(DotnetRestoreCommand) tools/r2rdump/R2RDump.csproj"
StandardOutputImportance="Low" />
+ <Exec Command="$(DotnetToolCommand) build tools/r2rdump/R2RDump.csproj"
+ StandardOutputImportance="Low" />
</Target>
<Target Name="CopyCoreLib" AfterTargets="Build">
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<AssemblyKey>Open</AssemblyKey>
<IsDotNetFrameworkProductAssembly>true</IsDotNetFrameworkProductAssembly>
- </PropertyGroup>
-
- <PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
+ <TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.NETCore.CoreDisTools" Version="1.0.1-prerelease-00003" />
- <PackageReference Include="System.CommandLine" Version="0.1.0-e160119-1" />
- <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+ <PackageReference Include="Microsoft.NETCore.CoreDisTools">
+ <Version>1.0.1-prerelease-00003</Version>
+ </PackageReference>
+ <PackageReference Include="System.CommandLine">
+ <Version>0.1.0-e160119-1</Version>
+ </PackageReference>
+ <PackageReference Include="System.Reflection.Metadata">
+ <Version>1.6.0</Version>
+ </PackageReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />