Build target fixes.

Mael76700 · Dec 5, 2018 · 482ef83 · 482ef83
1 parent 990a375
commit 482ef83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Tests/Kernels/Directory.Build.targets b/Tests/Kernels/Directory.Build.targets
@@ -52,14 +52,14 @@
     </PropertyGroup>
 
     <Target Name="WriteReferenceAssembliesToFile"
-            DependsOnTargets="ResolveReferences;_ComputeNetPublishAssets"
+            DependsOnTargets="ResolveReferences;ComputeFilesToPublish"
             Inputs="$(TargetPath)"
             Outputs="$(_ReferencesFile)">
 
         <ItemGroup>
-            <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)"
-                               Condition="'%(ResolvedAssembliesToPublish.AssetType)' != 'native'
-                                      AND '%(ResolvedAssembliesToPublish.Extension)' == '.dll'" />
+            <_Il2cpuAssemblies Include="@(ResolvedFileToPublish)"
+                               Condition="'%(ResolvedFileToPublish.AssetType)' != 'native'
+                                      AND '%(ResolvedFileToPublish.Extension)' == '.dll'" />
         </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
@@ -158,12 +158,12 @@
     <Target Name="IL2CPU"
             Inputs="$(TargetPath);@(PlugsReference)"
             Outputs="$(Il2cpuOutput)"
-            DependsOnTargets="ResolveReferences;_ComputeNetPublishAssets">
+            DependsOnTargets="ResolveReferences;ComputeFilesToPublish">
 
         <ItemGroup>
-            <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)"
-                               Condition="'%(ResolvedAssembliesToPublish.AssetType)' != 'native'
-                                      AND '%(ResolvedAssembliesToPublish.Extension)' == '.dll'" />
+            <_Il2cpuAssemblies Include="@(ResolvedFileToPublish->'%(FullPath)')"
+                               Condition="'%(ResolvedFileToPublish.AssetType)' != 'native'
+                                      AND '%(ResolvedFileToPublish.Extension)' == '.dll'" />
         </ItemGroup>
 
         <IL2CPU KernelPkg="$(KernelPkg)"