From c346796a61de2363a27563a06426fe19500f8b17 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain@microsoft.com>
Date: Thu, 2 Aug 2018 01:45:42 -0400
Subject: [PATCH] [mono] Build tasks: S.Collections.Immutable,
 S.Reflection.Metadata

Instead of referencing the assemblies from Roslyn which can differ from
what msbuild uses, use a PackageReference with the same versions as rest
of msbuild.

This fixes a warning:

`/Users/ankit/dev/msbuild/artifacts/Release-MONO/bootstrap/net471/MSBuild/15.0/Bin/Microsoft.Common.CurrentVersion.targets(2130,5): warning MSB3277: Found conflicts between different versions of "System.Collections.Immutable" that could not be resolved. These reference conflicts a re listed in the build log when log verbosity is set to detailed. [/Users/ankit/dev/msbuild/mono/tasks/build.csproj]`
---
 mono/targets/MSBuild.Bootstrap.Mono.targets |  3 ++-
 mono/tasks/build.csproj                     | 13 +++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mono/targets/MSBuild.Bootstrap.Mono.targets b/mono/targets/MSBuild.Bootstrap.Mono.targets
index 6b2bb031b19..c44dedbb446 100644
--- a/mono/targets/MSBuild.Bootstrap.Mono.targets
+++ b/mono/targets/MSBuild.Bootstrap.Mono.targets
@@ -42,7 +42,8 @@
 	<Target Name="BuildMonoTasks" AfterTargets="Bootstrap" Condition="'$(TargetFramework)' != ''">
 		<MSBuild
 			Projects="$(RepoRoot)\mono\tasks\build.csproj"
-			Properties="OutputPath=$(OutputPath);OutDir=$(OutDir);TargetFramework=$(TargetFramework);MonoBuild=true" />
+			Properties="OutputPath=$(OutputPath);OutDir=$(OutDir);TargetFramework=$(TargetFramework);MonoBuild=true"
+			Targets="Restore;Build" />
 
 		<!-- Copy to the MSBuildExtensionsPath for bootstrap -->
 		<Copy
diff --git a/mono/tasks/build.csproj b/mono/tasks/build.csproj
index 7b364c3e0fa..f104fe5fae4 100644
--- a/mono/tasks/build.csproj
+++ b/mono/tasks/build.csproj
@@ -6,19 +6,16 @@
         <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     </PropertyGroup>
 
-   <ItemGroup>
+    <Import Project="..\..\build\Versions.props" />
+    <ItemGroup>
         <Compile Include="FilterDeniedAssemblies.cs" />
 
         <Reference Include="Microsoft.Build.Framework" HintPath="$(OutDir)\Microsoft.Build.Framework.dll" />
         <Reference Include="Microsoft.Build.Utilities.Core" HintPath="$(OutDir)\Microsoft.Build.Utilities.Core.dll" />
 
-        <Reference Include="System.Reflection.Metadata">
-            <HintPath>$(OutDir)\Roslyn\System.Reflection.Metadata.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Collections.Immutable">
-            <HintPath>$(OutDir)\Roslyn\System.Collections.Immutable.dll</HintPath>
-        </Reference>
-   </ItemGroup>
+        <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
+        <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
+    </ItemGroup>
 
     <Target Name="Test" />