Skip to content
Permalink
Browse files

[Build] Properly include install-prerequisites.exe next to Xenko.Game…

…Studio packageinstall.exe
  • Loading branch information
xen2 committed Jan 23, 2019
1 parent d2b09f9 commit 59c6713145dcacf86ee4f51c62662acc0f09a8e8
@@ -47,7 +47,6 @@ Example of use:
<Target Name="PrerequisitesInstaller">
<Delete Files="$(XenkoRoot)Bin\Prerequisites\install-prerequisites.exe"/>
<Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(XenkoRoot)sources\prerequisites\prerequisites.aip"'/>
<Copy SourceFiles="$(XenkoRoot)sources\prerequisites\install-prerequisites.exe" DestinationFolder="$(XenkoRoot)Bin\Prerequisites"/>
</Target>

<!--
@@ -56,7 +55,6 @@ Example of use:
<Target Name="FullBuild">
<CallTarget Targets="Build"/>
<CallTarget Targets="Package"/>
<CallTarget Targets="PrerequisitesInstaller"/>
<CallTarget Targets="VSIXPlugin"/>
</Target>

@@ -122,7 +120,7 @@ Example of use:
<Message Text="Done preparing build for version $(XenkoPackageVersion)"/>
<TeamCitySetBuildNumber BuildNumber="$(XenkoPackageVersion)" Condition="'$(TEAMCITY_BUILD_PROPERTIES_FILE)' != '' " />
</Target>
<Target Name="Package" DependsOnTargets="PreparePackageBuild;Build;VSIXPlugin;PrerequisitesInstaller"/>
<Target Name="Package" DependsOnTargets="PreparePackageBuild;PrerequisitesInstaller;Build;VSIXPlugin"/>

<Target Name="CopyXenkoKey">
<Copy Condition="'$(XenkoSign)' == 'true' And Exists('$(LOCALAPPDATA)\Xenko\XenkoBuildKey\xenko.snk')" SourceFiles="$(LOCALAPPDATA)\Xenko\XenkoBuildKey\xenko.snk" DestinationFolder="$(MSBuildThisFileDirectory)"/>
@@ -34,7 +34,7 @@ static int Main(string[] args)
case "/repair":
{
// Run prerequisites installer (if it exists)
var prerequisitesInstallerPath = @"..\Bin\Prerequisites\install-prerequisites.exe";
var prerequisitesInstallerPath = @"install-prerequisites.exe";
if (File.Exists(prerequisitesInstallerPath))
{
var prerequisitesInstalled = false;
@@ -38,5 +38,9 @@
<Link>vs_buildtools.exe</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\prerequisites\install-prerequisites.exe" Condition="Exists('..\..\prerequisites\install-prerequisites.exe')">
<Link>install-prerequisites.exe</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

0 comments on commit 59c6713

Please sign in to comment.
You can’t perform that action at this time.