From 41f02e23388ef302f9fb91eae4283f2fdc437b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Thu, 5 Apr 2018 23:53:33 +0100
Subject: [PATCH] Fixed referenced assembly resolution for kernel projects.

---
 Tests/TestKernels/TestKernels.csproj                 | 5 ++---
 source/Cosmos.Build.Tasks/build/Cosmos.Build.targets | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Tests/TestKernels/TestKernels.csproj b/Tests/TestKernels/TestKernels.csproj
index c052fcc0a..c82870ff3 100644
--- a/Tests/TestKernels/TestKernels.csproj
+++ b/Tests/TestKernels/TestKernels.csproj
@@ -21,17 +21,16 @@
         <ProjectReference Include="..\Cosmos.Kernel.Tests.Fat2\Cosmos.Kernel.Tests.Fat2.csproj" />
         <ProjectReference Include="..\Cosmos.Kernel.Tests.Fat\Cosmos.Kernel.Tests.Fat.csproj" />
         <ProjectReference Include="..\Cosmos.Kernel.Tests.IO\Cosmos.Kernel.Tests.IO.csproj" />
-        <ProjectReference Include="..\Cosmos.TestRunner.TestController\Cosmos.TestRunner.TestController.csproj" />
         <ProjectReference Include="..\GraphicTest\GraphicTest.csproj" />
         <ProjectReference Include="..\SimpleStructsAndArraysTest\SimpleStructsAndArraysTest.csproj" />
     </ItemGroup>
 
-    <Target Name="WriteReferenceAssembliesToFile" DependsOnTargets="RunResolvePublishAssemblies">
+    <Target Name="WriteReferenceAssembliesToFile" DependsOnTargets="ResolveReferences;_ComputeNetPublishAssets">
 
         <Error Condition="'$(ReferencesFile)' == ''" Text="References file path is empty!" />
 
         <ItemGroup>
-            <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' != 'native'" />
+            <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(ResolvedAssembliesToPublish.AssetType)' != 'native'" />
         </ItemGroup>
 
         <WriteLinesToFile File="$(ReferencesFile)" Lines="@(_Il2cpuAssemblies)" Overwrite="True" />
diff --git a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
index c7c82fc7e..dbd8d3026 100644
--- a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
+++ b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
@@ -131,10 +131,10 @@
     <Target Name="IL2CPU"
             Inputs="$(TargetPath);@(PlugsReference)"
             Outputs="$(Il2cpuOutput)"
-            DependsOnTargets="RunResolvePublishAssemblies">
+            DependsOnTargets="ResolveReferences;_ComputeNetPublishAssets">
 
         <ItemGroup>
-            <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' != 'native'" />
+            <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(ResolvedAssembliesToPublish.AssetType)' != 'native'" />
         </ItemGroup>
 
         <IL2CPU KernelPkg="$(KernelPkg)"