FB

Author: LakshanF

src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs

@@ -99,10 +99,10 @@ public class ProcessFrameworkReferences : TaskBase
         public ITaskItem[] Crossgen2Packs { get; set; }
 
         [Output]
-        public ITaskItem[] ILCompilerPacks { get; set; }
+        public ITaskItem[] HostILCompilerPacks { get; set; }
 
         [Output]
-        public ITaskItem[] ILCompilerPacks2 { get; set; }
+        public ITaskItem[] TargetILCompilerPacks { get; set; }
 
         //  Runtime packs which aren't available for the specified RuntimeIdentifier
         [Output]
@@ -620,20 +620,28 @@ private bool AddAotOrR2RRuntimePackage(AotPackageType packageType, Version norma
             }
             else
             {
-                ILCompilerPacks = new[] { newItem };
+                HostILCompilerPacks = new[] { newItem };
                 // ILCompiler supports cross target compilation. If there is a cross-target request, we need to download that package as well
-                var targetsRuntimeIdentifier = NuGetUtils.GetBestMatchingRid(runtimeGraph, RuntimeIdentifier, packSupportedRuntimeIdentifiers, out bool wasInGraph2);
-                if (!hostRuntimeIdentifier.Equals(targetsRuntimeIdentifier))
-                {
-                    var runtimeIlcPackName = packPattern.Replace("**RID**", targetsRuntimeIdentifier);
-                    TaskItem runtime2PackToDownload = new TaskItem(runtimeIlcPackName);
-                    runtime2PackToDownload.SetMetadata(MetadataKeys.Version, packVersion);
-                    packagesToDownload.Add(runtime2PackToDownload);
-
-                    var newItem2 = new TaskItem(runtimeIlcPackName);
-                    newItem2.SetMetadata(MetadataKeys.NuGetPackageId, runtimeIlcPackName);
-                    newItem2.SetMetadata(MetadataKeys.NuGetPackageVersion, packVersion);
-                    ILCompilerPacks2 = new[] { newItem2 };
+                // We expect RuntimeIdentifier to be defined during publish but can allow during build
+                if (RuntimeIdentifier != null)
+                {
+                    var targetsRuntimeIdentifier = NuGetUtils.GetBestMatchingRid(runtimeGraph, RuntimeIdentifier, packSupportedRuntimeIdentifiers, out bool wasInGraph2);
+                    if (targetsRuntimeIdentifier == null)
+                    {
+                        return false;
+                    }
+                    if (!hostRuntimeIdentifier.Equals(targetsRuntimeIdentifier))
+                    {
+                        var runtimeIlcPackName = packPattern.Replace("**RID**", targetsRuntimeIdentifier);
+                        TaskItem runtime2PackToDownload = new TaskItem(runtimeIlcPackName);
+                        runtime2PackToDownload.SetMetadata(MetadataKeys.Version, packVersion);
+                        packagesToDownload.Add(runtime2PackToDownload);
+
+                        var newItem2 = new TaskItem(runtimeIlcPackName);
+                        newItem2.SetMetadata(MetadataKeys.NuGetPackageId, runtimeIlcPackName);
+                        newItem2.SetMetadata(MetadataKeys.NuGetPackageVersion, packVersion);
+                        TargetILCompilerPacks = new[] { newItem2 };
+                    }
                 }
             }            
 

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets

@@ -120,8 +120,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="TargetingPacks" ItemName="TargetingPack" />
       <Output TaskParameter="RuntimePacks" ItemName="RuntimePack" />
       <Output TaskParameter="Crossgen2Packs" ItemName="Crossgen2Pack" />
-      <Output TaskParameter="ILCompilerPacks" ItemName="ILCompilerPack" />
-      <Output TaskParameter="ILCompilerPacks2" ItemName="ILCompilerPack2" />
+      <Output TaskParameter="HostILCompilerPacks" ItemName="HostILCompilerPack" />
+      <Output TaskParameter="TargetILCompilerPacks" ItemName="TargetILCompilerPack" />
       <Output TaskParameter="UnavailableRuntimePacks" ItemName="UnavailableRuntimePack" />
 
     </ProcessFrameworkReferences>
@@ -253,17 +253,17 @@ Copyright (c) .NET Foundation. All rights reserved.
     </GetPackageDirectory>
 
     <GetPackageDirectory
-      Items="@(ILCompilerPack)"
+      Items="@(HostILCompilerPack)"
       PackageFolders="@(AssetsFilePackageFolder)">
 
       <Output TaskParameter="Output" ItemName="ResolvedILCompilerPack" />
     </GetPackageDirectory>
 
     <GetPackageDirectory
-      Items="@(ILCompilerPack2)"
+      Items="@(TargetILCompilerPack)"
       PackageFolders="@(AssetsFilePackageFolder)">
 
-      <Output TaskParameter="Output" ItemName="ResolvedILCompilerPack2" />
+      <Output TaskParameter="Output" ItemName="ResolvedTargetILCompilerPack" />
     </GetPackageDirectory>
 
     <GetPackageDirectory

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs

@@ -280,7 +280,6 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                    testProject.AdditionalProperties["StripSymbols"] = "true";
-                   testProject.AdditionalProperties["ObjCopyName"] = "objcopy";
                 }
                 var testAsset = _testAssetsManager.CreateTestProject(testProject);
 
@@ -328,7 +327,6 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_empty(string t
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
                     testProject.AdditionalProperties["StripSymbols"] = "true";
-                    testProject.AdditionalProperties["ObjCopyName"] = "objcopy";
                 }
                 var testAsset = _testAssetsManager.CreateTestProject(testProject);