Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-03 16:41:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

include splash and xe into xenadmin build, because the installer only packages the files located in the xenadmin bin directory

Browse Source 
(cherry picked from commit fbe3c54aad)
This commit is contained in:
Alexander Schulz 2019-05-11 18:16:38 +02:00
parent fba9b7ae45
commit 789f153118
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
XenAdmin/XenAdmin.csproj
View File

@ -6814,6 +6814,10 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\splash-xcp-ng\splash-xcp-ng.csproj">
<Project>{cd563857-6159-4415-b7b2-a21991f572e3}</Project>
<Name>splash-xcp-ng</Name>
</ProjectReference>
<ProjectReference Include="..\XenCenterLib\XenCenterLib.csproj"> <ProjectReference Include="..\XenCenterLib\XenCenterLib.csproj">
<Project>{9861DFA1-B41F-432D-A43F-226257DEBBB9}</Project> <Project>{9861DFA1-B41F-432D-A43F-226257DEBBB9}</Project>
<Name>XenCenterLib</Name> <Name>XenCenterLib</Name>
@ -6834,6 +6838,10 @@
<Project>{9F7E6285-5CBF-41B4-8CB9-AB06DFF90DC0}</Project> <Project>{9F7E6285-5CBF-41B4-8CB9-AB06DFF90DC0}</Project>
<Name>XenOvfTransport</Name> <Name>XenOvfTransport</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\xe\Xe.csproj">
<Project>{727e885d-14be-40f0-9d0b-3853d44d3984}</Project>
<Name>Xe</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5"> <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

6
installer-xcp-ng/installer-xcp-ng.wixproj
View File

@ -43,9 +43,9 @@
<Content Include="license.txt" /> <Content Include="license.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\splash-xcp-ng\splash-xcp-ng.csproj"> <ProjectReference Include="..\XenAdmin\XenAdmin.csproj">
<Name>splash-xcp-ng</Name> <Name>XenAdmin</Name>
<Project>{cd563857-6159-4415-b7b2-a21991f572e3}</Project> <Project>{70bda4bc-f062-4302-8acd-a15d8bf31d65}</Project>
<Private>True</Private> <Private>True</Private>
<DoNotHarvest>True</DoNotHarvest> <DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups> <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>

6
splash-xcp-ng/splash-xcp-ng.csproj
View File

@ -88,11 +88,5 @@
<ItemGroup> <ItemGroup>
<Content Include="Resources\AppIcon.ico" /> <Content Include="Resources\AppIcon.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\XenAdmin\XenAdmin.csproj">
<Project>{70bda4bc-f062-4302-8acd-a15d8bf31d65}</Project>
<Name>XenAdmin</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>