From 3863dbaf4f7512e8040141e46cc67780ebb1ca8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Tue, 9 Oct 2018 08:50:41 -0700
Subject: [PATCH] Move ILAsm publishing to ILAsmDeploy project (#30346)

* Move ILAsm publishing to ILAsmDeploy project

* BuildBoss: recognize ReferenceOutputAssembly attribute

* Add GlobalPropertiesToRemove
---
 build/Targets/BeforeCommonTargets.targets     |  2 +-
 .../Portable/Roslyn.Test.Utilities.csproj     | 20 ++++----
 src/Tools/BuildBoss/ProjectUtil.cs            |  6 +--
 src/Tools/ILAsm/DeployILAsm.targets           | 48 -------------------
 src/Tools/ILAsm/IlAsmDeploy.csproj            | 45 ++++++++++++++++-
 5 files changed, 60 insertions(+), 61 deletions(-)
 delete mode 100644 src/Tools/ILAsm/DeployILAsm.targets

diff --git a/build/Targets/BeforeCommonTargets.targets b/build/Targets/BeforeCommonTargets.targets
index 8d4d767ad65..ea264a8c645 100644
--- a/build/Targets/BeforeCommonTargets.targets
+++ b/build/Targets/BeforeCommonTargets.targets
@@ -65,7 +65,7 @@
          identifier to the end of the output path
          https://github.com/dotnet/roslyn/issues/23547
     -->
-    <PublishDir Condition="'$(PublishDir)' != '' AND '$(RuntimeIdentifier)' != ''">$(OutputPath)$(RuntimeIdentifier)\$(PublishDirName)\</PublishDir>
+    <PublishDir Condition="'$(PublishDir)' != '' AND '$(RuntimeIdentifier)' != '' AND '$(MSBuildProjectName)' != 'IlAsmDeploy'">$(OutputPath)$(RuntimeIdentifier)\$(PublishDirName)\</PublishDir>
     <PublishDir Condition="'$(PublishDir)' != '' AND '$(RuntimeIdentifier)' == ''">$(OutputPath)$(TargetFramework)\$(PublishDirName)\</PublishDir>
 
     <DocumentationFile Condition="'$(GenerateDocumentationFile)' == 'true' AND '$(Language)' == 'VB'">$(AssemblyName).xml</DocumentationFile>
diff --git a/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj b/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
index 378d4d5b822..ff0ea37b572 100644
--- a/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
+++ b/src/Test/Utilities/Portable/Roslyn.Test.Utilities.csproj
@@ -12,18 +12,24 @@
     <RootNamespace></RootNamespace>
     <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
     <IsShipping>false</IsShipping>
-
-    <!-- 
-      Directory where to deploy ILAsm when targeting .NET Core app.
-      IlasmUtilities relies on ILAsm being deployed to this location.
-    -->
-    <IlasmPublishDir>$(ArtifactsDir)Tools\ILAsm\</IlasmPublishDir>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Compilers\Test\Resources\Core\Microsoft.CodeAnalysis.Compiler.Test.Resources.csproj" />
     <ProjectReference Include="..\..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
     <ProjectReference Include="..\..\..\Compilers\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.vbproj" />
+
+    <!-- 
+      Reference ILAsm deploy project to make sure it's built since we need its outputs, but not reference the outputs themselves.
+      Note SkipGetTargetFrameworkProperties makes it possible to reference project with incompatible TFM.
+      GlobalPropertiesToRemove makes sure TargetFramework isn't set as a global property for the target project.
+    -->
+    <ProjectReference Include="..\..\..\Tools\ILAsm\IlAsmDeploy.csproj" 
+       ReferenceOutputAssembly="false"
+       SkipGetTargetFrameworkProperties="true"
+       GlobalPropertiesToRemove="TargetFramework" 
+       Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
+
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
@@ -111,6 +117,4 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
     <PackageReference Include="ICSharpCode.Decompiler" Version="$(ICSharpCodeDecompilerVersion)" />
   </ItemGroup>
-
-  <Import Project="..\..\..\Tools\ILAsm\DeployILAsm.targets"/>
 </Project>
\ No newline at end of file
diff --git a/src/Tools/BuildBoss/ProjectUtil.cs b/src/Tools/BuildBoss/ProjectUtil.cs
index db0bf162012..009fa0a2d35 100644
--- a/src/Tools/BuildBoss/ProjectUtil.cs
+++ b/src/Tools/BuildBoss/ProjectUtil.cs
@@ -184,10 +184,10 @@ internal List<ProjectReferenceEntry> GetDeclaredProjectReferences()
             {
                 // Make sure to check for references that exist only for ordering purposes.  They don't count as 
                 // actual references.
-                var refOutputAssembly = r.Element(Namespace.GetName("ReferenceOutputAssembly"));
-                if (refOutputAssembly != null)
+                var referenceOutputAssemblyValue = r.Element(Namespace.GetName("ReferenceOutputAssembly"))?.Value ?? r.Attribute(XName.Get("ReferenceOutputAssembly"))?.Value;
+                if (referenceOutputAssemblyValue != null)
                 {
-                    if (bool.TryParse(refOutputAssembly.Value.Trim().ToLower(), out var isRealReference) && !isRealReference)
+                    if (bool.TryParse(referenceOutputAssemblyValue.Trim().ToLower(), out var isRealReference) && !isRealReference)
                     {
                         continue;
                     }
diff --git a/src/Tools/ILAsm/DeployILAsm.targets b/src/Tools/ILAsm/DeployILAsm.targets
deleted file mode 100644
index d53fcb7ac9f..00000000000
--- a/src/Tools/ILAsm/DeployILAsm.targets
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-<Project>
-  <Choose>
-    <When Condition="'$(OS)' == 'Windows_NT'">
-      <PropertyGroup>
-        <_IlasmRid>win-x64</_IlasmRid>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-      <PropertyGroup>
-        <_IlasmRid>osx-x64</_IlasmRid>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
-      <PropertyGroup>
-        <_IlasmRid>linux-x64</_IlasmRid>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <_IlasmRid />
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-
-  <PropertyGroup>
-    <_IlasmDeployProj>$(MSBuildThisFileDirectory)IlAsmDeploy.csproj</_IlasmDeployProj>
-    <_IlasmIncrementalBuildMarker>$(IlasmPublishDir).v$(MicrosoftNETCoreILAsmVersion)</_IlasmIncrementalBuildMarker>
-  </PropertyGroup>
-
-  <Target Name="_PublishILAsm"
-          AfterTargets="Build"
-          Inputs="$(MSBuildThisFileFullPath);$(_IlasmDeployProj)"
-          Outputs="$(_IlasmIncrementalBuildMarker)"
-          Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-
-    <Error Text="Unknown OS" Condition="'$(_IlasmRid)' == ''" />
-
-    <MSBuild Projects="$(_IlasmDeployProj)"
-             Targets="Publish"
-             Properties="SelfContained=true;RuntimeIdentifier=$(_IlasmRid);PublishDir=$(IlasmPublishDir)" />
-
-    <Touch Files="$(_IlasmIncrementalBuildMarker)" AlwaysCreate="true">
-      <Output TaskParameter="TouchedFiles" ItemName="FileWrites"/>
-    </Touch>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/Tools/ILAsm/IlAsmDeploy.csproj b/src/Tools/ILAsm/IlAsmDeploy.csproj
index 60ae51cbce0..eee21d9f804 100644
--- a/src/Tools/ILAsm/IlAsmDeploy.csproj
+++ b/src/Tools/ILAsm/IlAsmDeploy.csproj
@@ -3,15 +3,58 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
+
     <!-- 
       When the project is published as a self-contained app do not require the latest runtime patch. 
       This is ok since the app is only used for testing.
     -->
     <TargetLatestRuntimePatch>false</TargetLatestRuntimePatch>
+    <SelfContained>true</SelfContained>
+
+    <!-- Do not build again when publishing -->
+    <NoBuild>true</NoBuild>
+
+    <PublishDir>$(ArtifactsDir)Tools\ILAsm\</PublishDir>
   </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(OS)' == 'Windows_NT'">
+      <PropertyGroup>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
+      <PropertyGroup>
+        <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
+      <PropertyGroup>
+        <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+      </PropertyGroup>
+    </When>
+  </Choose>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <_IlasmIncrementalBuildMarker>$(PublishDir).v$(MicrosoftNETCoreILAsmVersion)</_IlasmIncrementalBuildMarker>
+  </PropertyGroup>
+
+  <Target Name="_PublishILAsm"
+          AfterTargets="Build"
+          Inputs="$(MSBuildThisFileFullPath)"
+          Outputs="$(_IlasmIncrementalBuildMarker)">
+
+    <Error Text="Unknown OS" Condition="'$(RuntimeIdentifier)' == ''" />
+
+    <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="Publish"/>
+
+    <Touch Files="$(_IlasmIncrementalBuildMarker)" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites"/>
+    </Touch>
+  </Target>
 </Project>
\ No newline at end of file
-- 
GitLab