Skip to content
Permalink
Browse files

[Build] Package build improvements

  • Loading branch information
xen2 committed Nov 28, 2018
1 parent f3b6781 commit badb44c405fecc63fae347361b69b8e3327b3ba7
Showing with 1,692 additions and 4,128 deletions.
  1. +8 −0 build/Xenko.Android.PreSettings.Local.targets
  2. +0 −2 build/Xenko.Android.bat
  3. +457 −0 build/Xenko.Android.sln
  4. +5 −0 build/Xenko.Android.sln.DotSettings
  5. +1 −1 build/Xenko.Linux.bat
  6. +7 −0 build/Xenko.Runtime.PreSettings.Local.targets
  7. +356 −0 build/Xenko.Runtime.sln
  8. +5 −0 build/Xenko.Runtime.sln.DotSettings
  9. +1 −1 build/Xenko.UWP.bat
  10. +31 −26 build/Xenko.build
  11. +8 −0 build/Xenko.iOS.PreSettings.Local.targets
  12. +0 −2 build/Xenko.iOS.bat
  13. +675 −0 build/Xenko.iOS.sln
  14. +5 −0 build/Xenko.iOS.sln.DotSettings
  15. +0 −2,358 build/Xenko.sln
  16. +4 −64 build/update_solutions.bat
  17. +17 −9 deps/Xenko.GitVersioning/GenerateVersionFile.cs
  18. +5 −13 sources/core/Xenko.Core.Tests/Xenko.Core.Tests.Android.csproj
  19. +5 −13 sources/core/Xenko.Core.Tests/Xenko.Core.Tests.iOS.csproj
  20. +0 −32 sources/engine/Xenko.Assets/Tasks/PackageGetVersionTask.cs
  21. +2 −93 sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Android.csproj
  22. +2 −93 sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.iOS.csproj
  23. +4 −96 sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Android.csproj
  24. +4 −96 sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.iOS.csproj
  25. +4 −96 sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Android.csproj
  26. +4 −96 sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.iOS.csproj
  27. +4 −100 sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Android.csproj
  28. +4 −100 sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.iOS.csproj
  29. +5 −23 sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Android.csproj
  30. +5 −23 sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.iOS.csproj
  31. +5 −96 sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Android.csproj
  32. +5 −96 sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.iOS.csproj
  33. +5 −96 sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Android.csproj
  34. +5 −96 sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.iOS.csproj
  35. +5 −96 sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Android.csproj
  36. +5 −96 sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.iOS.csproj
  37. +5 −96 sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.Android.csproj
  38. +5 −96 sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.iOS.csproj
  39. +0 −1 sources/tools/Xenko.ProjectGenerator/PackageUnitTestGenerator.cs
  40. +10 −10 sources/tools/Xenko.ProjectGenerator/Program.cs
  41. +14 −12 sources/tools/Xenko.ProjectGenerator/SynchronizeProjectProcessor.cs
@@ -0,0 +1,8 @@
<!-- Build file pre-included by all Xenko projects -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<XenkoCommonPreSettingsName>Xenko</XenkoCommonPreSettingsName>
<XenkoPlatforms Condition="'$(XenkoPlatforms)' == ''">Windows;Android</XenkoPlatforms>
</PropertyGroup>
</Project>

This file was deleted.

Large diffs are not rendered by default.

@@ -0,0 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A96ED9924B3760C758AE4B2F40058EC5/RelativePath/@EntryValue">..\Xenko.sln.DotSettings</s:String>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A96ED9924B3760C758AE4B2F40058EC5/@KeyIndexDefined">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA96ED9924B3760C758AE4B2F40058EC5/@KeyIndexDefined">True</s:Boolean>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA96ED9924B3760C758AE4B2F40058EC5/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
@@ -1,2 +1,2 @@
set XenkoPlatforms=Windows;iOS
set XenkoPlatforms=Windows;Linux
Xenko.sln
@@ -0,0 +1,7 @@
<!-- Build file pre-included by all Xenko projects -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<XenkoCommonPreSettingsName>Xenko</XenkoCommonPreSettingsName>
</PropertyGroup>
</Project>

Large diffs are not rendered by default.

@@ -0,0 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=8AAB7F6D236DAED50A351DC3CEC363B2/RelativePath/@EntryValue">..\Xenko.sln.DotSettings</s:String>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=8AAB7F6D236DAED50A351DC3CEC363B2/@KeyIndexDefined">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File8AAB7F6D236DAED50A351DC3CEC363B2/@KeyIndexDefined">True</s:Boolean>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File8AAB7F6D236DAED50A351DC3CEC363B2/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
@@ -1,2 +1,2 @@
set XenkoPlatforms=Windows;UWP
Xenko.sln
Xenko.Runtime.sln
@@ -21,8 +21,6 @@ Example of use:
</PropertyGroup>

<UsingTask TaskName="Xenko.GitVersioning.GenerateVersionFile" AssemblyFile="$(XenkoRoot)deps\Xenko.GitVersioning\bin\Debug\net472\Xenko.GitVersioning.dll" />
<!-- TODO: those tasks will work only if the Direct3D11 files have been copied to top folder (currently works thanks to BuildEditorShaders being run before) -->
<UsingTask TaskName="Xenko.Assets.Tasks.PackageGetVersionTask" AssemblyFile="$(XenkoRootBin)Xenko.Assets.dll" />

<Target Name="Help">
<Message Importance="high" Text="TODO"/>
@@ -100,11 +98,17 @@ Example of use:
<MSBuild Targets="Build" Projects="$(XenkoRoot)deps\Xenko.GitVersioning\Xenko.GitVersioning.csproj"/>

<!-- Create SharedAssemblyInfo.NuGet.cs with Git information (different between official build and internal builds) -->
<GenerateVersionFile Condition="'$(XenkoOfficialBuild)' == 'true'" RootDirectory="$(XenkoRoot)" VersionFile="sources\shared\SharedAssemblyInfo.cs" GeneratedVersionFile="sources\shared\SharedAssemblyInfo.NuGet.cs" SpecialVersionGitCommit="true" />
<GenerateVersionFile Condition="'$(XenkoOfficialBuild)' != 'true'" RootDirectory="$(XenkoRoot)" VersionFile="sources\shared\SharedAssemblyInfo.cs" GeneratedVersionFile="sources\shared\SharedAssemblyInfo.NuGet.cs" SpecialVersion="beta" SpecialVersionGitHeight="true" SpecialVersionGitCommit="true" />
<GenerateVersionFile Condition="'$(XenkoOfficialBuild)' == 'true'" RootDirectory="$(XenkoRoot)" VersionFile="sources\shared\SharedAssemblyInfo.cs" GeneratedVersionFile="sources\shared\SharedAssemblyInfo.NuGet.cs">
<Output TaskParameter="NuGetVersion" PropertyName="XenkoPackageVersion"/>
</GenerateVersionFile>
<GenerateVersionFile Condition="'$(XenkoOfficialBuild)' != 'true'" RootDirectory="$(XenkoRoot)" VersionFile="sources\shared\SharedAssemblyInfo.cs" GeneratedVersionFile="sources\shared\SharedAssemblyInfo.NuGet.cs" SpecialVersion="beta" SpecialVersionGitHeight="true" SpecialVersionGitCommit="true">
<Output TaskParameter="NuGetVersion" PropertyName="XenkoPackageVersion"/>
</GenerateVersionFile>

<Message Text="Done preparing build for version $(XenkoPackageVersion)"/>
<TeamCitySetBuildNumber BuildNumber="$(XenkoPackageVersion)" Condition="'$(TEAMCITY_BUILD_PROPERTIES_FILE)' != '' " />
</Target>
<Target Name="BuildForPackage" DependsOnTargets="PreparePackageBuild;BuildWindows;BuildEditorShaders;VSIXPlugin"/>
<Target Name="GeneratePackage" DependsOnTargets="PreparePackageBuild;PrerequisitesInstaller;Package;WritePackageVersionToFile"/>
<Target Name="Package" DependsOnTargets="PreparePackageBuild;Build;BuildEditorShaders;VSIXPlugin;PrerequisitesInstaller"/>

<Target Name="CopyXenkoKey">
<Copy Condition="'$(XenkoSign)' == 'true' And Exists('$(LOCALAPPDATA)\Xenko\XenkoBuildKey\xenko.snk')" SourceFiles="$(LOCALAPPDATA)\Xenko\XenkoBuildKey\xenko.snk" DestinationFolder="$(MSBuildThisFileDirectory)"/>
@@ -123,39 +127,48 @@ Example of use:
</PropertyGroup>
<Exec Command="$(RestoreExec)" />
</Target>

<Target Name="BuildWindows" DependsOnTargets="CopyXenkoKey;RestoreWindows">

<Target Name="Build" DependsOnTargets="CopyXenkoKey">
<CallTarget Targets="Restore"/>
<MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
</Target>

<Target Name="BuildRuntime" DependsOnTargets="CopyXenkoKey">
<PropertyGroup>
<XenkoSolution>$(XenkoSolution).Runtime</XenkoSolution>
</PropertyGroup>
<CallTarget Targets="Restore"/>
<MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties)"/>
</Target>

<Target Name="BuildWindowsDirect3D11" DependsOnTargets="CopyXenkoKey">
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Direct3D.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Direct3D.sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Runtime.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties)"/>
</Target>

<Target Name="BuildWindowsDirect3D12" DependsOnTargets="CopyXenkoKey">
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Direct3D12.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Direct3D12.sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Runtime.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=Direct3D12"/>
</Target>

<Target Name="BuildWindowsOpenGL" DependsOnTargets="CopyXenkoKey">
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).OpenGL.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).OpenGL.sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Runtime.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=OpenGL"/>
</Target>

<Target Name="BuildWindowsOpenGLES" DependsOnTargets="CopyXenkoKey">
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).OpenGLES.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).OpenGLES.sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Runtime.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=OpenGLES"/>
</Target>

<Target Name="BuildAndroid" DependsOnTargets="CopyXenkoKey">
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Android.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).Android.sln" Properties="$(BuildProperties);Platform=Android"/>
<MSBuild Targets="Build" Projects="$(XenkoSolution).Android.sln" Properties="$(BuildProperties);XenkoPlatform=Android"/>
</Target>

<Target Name="BuildiOS" DependsOnTargets="CopyXenkoKey">
<Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).iOS.sln"' />
<MSBuild Targets="Build" Projects="$(XenkoSolution).iOS.sln" Properties="$(BuildProperties);Platform=iPhone"/>
<MSBuild Targets="Build" Projects="$(XenkoSolution).iOS.sln" Properties="$(BuildProperties);XenkoPlatform=iOS"/>
</Target>

<Target Name="BuildWindowsStore" DependsOnTargets="CopyXenkoKey">
@@ -195,14 +208,6 @@ Example of use:
<MSBuild Targets="Build" Projects="$(XenkoSolution).macOS.sln" Properties="$(BuildProperties);Platform=macOS"/>
</Target>

<Target Name="WritePackageVersionToFile">
<PackageGetVersionTask>
<Output TaskParameter="NuGetVersion" PropertyName="XenkoPackageVersion"/>
</PackageGetVersionTask>
<Delete Files="$(MSBuildThisFileDirectory)Xenko.version"/>
<WriteLinesToFile File="$(MSBuildThisFileDirectory)Xenko.version" Lines="$(XenkoPackageVersion)" />
</Target>

<Target Name="DownloadXunitRunnerConsole">
<MakeDir Directories="$(MSBuildThisFileDirectory)packages"/>
<PropertyGroup>
@@ -0,0 +1,8 @@
<!-- Build file pre-included by all Xenko projects -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<XenkoCommonPreSettingsName>Xenko</XenkoCommonPreSettingsName>
<XenkoPlatforms Condition="'$(XenkoPlatforms)' == ''">Windows;iOS</XenkoPlatforms>
</PropertyGroup>
</Project>

This file was deleted.

0 comments on commit badb44c

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