dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-27 14:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed referenced assembly resolution for kernel projects.

Browse source
This commit is contained in:
José Pedro 2018-04-05 23:53:33 +01:00
parent 047678ae47
commit 41f02e2338
No known key found for this signature in database
GPG key ID: B8247B9301707B83
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Tests/TestKernels/TestKernels.csproj
View file

@ -21,17 +21,16 @@
<ProjectReference Include="..\Cosmos.Kernel.Tests.Fat2\Cosmos.Kernel.Tests.Fat2.csproj" /> <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.Fat\Cosmos.Kernel.Tests.Fat.csproj" />
<ProjectReference Include="..\Cosmos.Kernel.Tests.IO\Cosmos.Kernel.Tests.IO.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="..\GraphicTest\GraphicTest.csproj" />
<ProjectReference Include="..\SimpleStructsAndArraysTest\SimpleStructsAndArraysTest.csproj" /> <ProjectReference Include="..\SimpleStructsAndArraysTest\SimpleStructsAndArraysTest.csproj" />
</ItemGroup> </ItemGroup>
<Target Name="WriteReferenceAssembliesToFile" DependsOnTargets="RunResolvePublishAssemblies"> <Target Name="WriteReferenceAssembliesToFile" DependsOnTargets="ResolveReferences;_ComputeNetPublishAssets">
<Error Condition="'$(ReferencesFile)' == ''" Text="References file path is empty!" /> <Error Condition="'$(ReferencesFile)' == ''" Text="References file path is empty!" />
<ItemGroup> <ItemGroup>
<_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' != 'native'" /> <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(ResolvedAssembliesToPublish.AssetType)' != 'native'" />
</ItemGroup> </ItemGroup>
<WriteLinesToFile File="$(ReferencesFile)" Lines="@(_Il2cpuAssemblies)" Overwrite="True" /> <WriteLinesToFile File="$(ReferencesFile)" Lines="@(_Il2cpuAssemblies)" Overwrite="True" />

4
source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
View file

@ -131,10 +131,10 @@
<Target Name="IL2CPU" <Target Name="IL2CPU"
Inputs="$(TargetPath);@(PlugsReference)" Inputs="$(TargetPath);@(PlugsReference)"
Outputs="$(Il2cpuOutput)" Outputs="$(Il2cpuOutput)"
DependsOnTargets="RunResolvePublishAssemblies"> DependsOnTargets="ResolveReferences;_ComputeNetPublishAssets">
<ItemGroup> <ItemGroup>
<_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(AssetType)' != 'native'" /> <_Il2cpuAssemblies Include="@(ResolvedAssembliesToPublish)" Condition="'%(ResolvedAssembliesToPublish.AssetType)' != 'native'" />
</ItemGroup> </ItemGroup>
<IL2CPU KernelPkg="$(KernelPkg)" <IL2CPU KernelPkg="$(KernelPkg)"