Skip to content

Commit

Permalink
[Samples] Moved samples from Xenko.Assets.Presentation to a dedicated…
Browse files Browse the repository at this point in the history
… project to have faster rebuild
  • Loading branch information
xen2 committed Nov 18, 2018
1 parent cee640d commit 5015242
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 24 deletions.
42 changes: 42 additions & 0 deletions build/Xenko.sln
Expand Up @@ -459,6 +459,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Samples.Tests", "..\s
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.NuGetResolver", "..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.shproj", "{00B72ED7-00E9-47F7-868D-8162027CD068}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Samples.Templates", "..\sources\editor\Xenko.Samples.Templates\Xenko.Samples.Templates.csproj", "{040F754C-17F4-4B5F-B974-93F1E39D107F}"
ProjectSection(ProjectDependencies) = postProject
{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47} = {1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}
EndProjectSection
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems*{00b72ed7-00e9-47f7-868d-8162027cd068}*SharedItemsImports = 13
Expand Down Expand Up @@ -3929,6 +3934,42 @@ Global
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Testing|Mixed Platforms.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Testing|Win32.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Testing|Win32.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.AppStore|Mixed Platforms.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.AppStore|Mixed Platforms.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.AppStore|Win32.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.AppStore|Win32.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Debug|Any CPU.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Debug|Win32.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Debug|Win32.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Release|Any CPU.ActiveCfg = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Release|Any CPU.Build.0 = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Release|Mixed Platforms.Build.0 = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Release|Win32.ActiveCfg = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.CoreCLR_Release|Win32.Build.0 = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Win32.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Win32.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Any CPU.Build.0 = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Win32.ActiveCfg = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Win32.Build.0 = Release|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Testing|Any CPU.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Testing|Any CPU.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Testing|Mixed Platforms.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Testing|Mixed Platforms.Build.0 = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Testing|Win32.ActiveCfg = Debug|Any CPU
{040F754C-17F4-4B5F-B974-93F1E39D107F}.Testing|Win32.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -4051,6 +4092,7 @@ Global
{AB574F65-1402-4476-9314-74DCDAF19097} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
{2FC40214-A4AA-45DC-9C93-72ED800C40B0} = {75608B5C-1C03-4B38-810E-14EED5165E59}
{00B72ED7-00E9-47F7-868D-8162027CD068} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
{040F754C-17F4-4B5F-B974-93F1E39D107F} = {75608B5C-1C03-4B38-810E-14EED5165E59}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
Expand Down
Expand Up @@ -355,6 +355,7 @@
<ProjectReference Include="..\..\tools\Xenko.TextureConverter\Xenko.TextureConverter.csproj" />
<ProjectReference Include="..\Xenko.Core.Assets.Editor\Xenko.Core.Assets.Editor.csproj" />
<ProjectReference Include="..\Xenko.Editor\Xenko.Editor.csproj" />
<ProjectReference Include="..\Xenko.Samples.Templates\Xenko.Samples.Templates.csproj" />
</ItemGroup>
<ItemGroup>
<Page Include="AssetEditors\GraphicsCompositorEditor\Views\GraphicsCompositorEditorView.xaml">
Expand Down
Expand Up @@ -77,26 +77,3 @@ TemplateFolders:
- !file Templates/Assets/Textures/DefaultRenderTexture.xktpl
- !file Templates/Assets/UI/Library.xktpl
- !file Templates/Assets/UI/Page.xktpl
- Path: !dir ../../../samples
Group: Samples
Exclude: "**/Testing/**;**/.git/**;**/_ReSharper.*/**;**/Bin/**;**/obj/**;**/*.sln;**/*.suo;**/*.GhostDoc.xml;**/samples2/readme.md;**/samples2/.gitignore;**/*.psess;**/*.vspx;**/*.userprefs"
Files:
- !file ..\..\..\samples\Audio\SimpleAudio\SimpleAudio.xktpl
- !file ..\..\..\samples\Games\JumpyJet\JumpyJet.xktpl
- !file ..\..\..\samples\Games\SpaceEscape\SpaceEscape.xktpl
- !file ..\..\..\samples\Graphics\AnimatedModel\AnimatedModel.xktpl
- !file ..\..\..\samples\Graphics\CustomEffect\CustomEffect.xktpl
- !file ..\..\..\samples\Graphics\MaterialShader\MaterialShader.xktpl
- !file ..\..\..\samples\Graphics\SpriteFonts\SpriteFonts.xktpl
- !file ..\..\..\samples\Graphics\SpriteStudioDemo\SpriteStudioDemo.xktpl
- !file ..\..\..\samples\Input\TouchInputs\TouchInputs.xktpl
- !file ..\..\..\samples\Input\GravitySensor\GravitySensor.xktpl
- !file ..\..\..\samples\Particles\ParticlesSample\ParticlesSample.xktpl
- !file ..\..\..\samples\Physics\PhysicsSample\PhysicsSample.xktpl
- !file ..\..\..\samples\UI\GameMenu\GameMenu.xktpl
- !file ..\..\..\samples\UI\UIParticles\UIParticles.xktpl
- !file ..\..\..\samples\UI\UIElementLink\UIElementLink.xktpl
- !file ..\..\..\samples\Templates\FirstPersonShooter\FirstPersonShooter\FirstPersonShooter.xktpl
- !file ..\..\..\samples\Templates\ThirdPersonPlatformer\ThirdPersonPlatformer\ThirdPersonPlatformer.xktpl
- !file ..\..\..\samples\Templates\TopDownRPG\TopDownRPG\TopDownRPG.xktpl
- !file ..\..\..\samples\Templates\VRSandbox\VRSandbox\VRSandbox.xktpl
Expand Up @@ -83,7 +83,7 @@ public XenkoDefaultAssetsPlugin()

// Load templates
// Currently hardcoded, this will need to change with plugin system
foreach (var packageName in new[] { "Xenko.Assets.Presentation", "Xenko.SpriteStudio.Offline" })
foreach (var packageName in new[] { "Xenko.Assets.Presentation", "Xenko.SpriteStudio.Offline", "Xenko.Samples.Templates" })
{
var logger = new LoggerResult();
var packageFile = PackageStore.Instance.GetPackageFileName(packageName, new PackageVersionRange(new PackageVersion(XenkoVersion.NuGetVersion)));
Expand Down
@@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\targets\Xenko.PreSettings.targets" />

<PropertyGroup>
<XenkoPackAssets>true</XenkoPackAssets>
<TargetFramework>$(TargetFrameworkTool)</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
</PropertyGroup>

<Import Project="$(XenkoPostSettingsTargets)" />
</Project>
@@ -0,0 +1,26 @@
!Package
SerializedVersion: {Assets: 3.1.0.0}
TemplateFolders:
- Path: !dir ../../../samples
Group: Samples
Exclude: "**/Testing/**;**/.git/**;**/_ReSharper.*/**;**/Bin/**;**/obj/**;**/*.sln;**/*.suo;**/*.GhostDoc.xml;**/samples2/readme.md;**/samples2/.gitignore;**/*.psess;**/*.vspx;**/*.userprefs"
Files:
- !file ..\..\..\samples\Audio\SimpleAudio\SimpleAudio.xktpl
- !file ..\..\..\samples\Games\JumpyJet\JumpyJet.xktpl
- !file ..\..\..\samples\Games\SpaceEscape\SpaceEscape.xktpl
- !file ..\..\..\samples\Graphics\AnimatedModel\AnimatedModel.xktpl
- !file ..\..\..\samples\Graphics\CustomEffect\CustomEffect.xktpl
- !file ..\..\..\samples\Graphics\MaterialShader\MaterialShader.xktpl
- !file ..\..\..\samples\Graphics\SpriteFonts\SpriteFonts.xktpl
- !file ..\..\..\samples\Graphics\SpriteStudioDemo\SpriteStudioDemo.xktpl
- !file ..\..\..\samples\Input\TouchInputs\TouchInputs.xktpl
- !file ..\..\..\samples\Input\GravitySensor\GravitySensor.xktpl
- !file ..\..\..\samples\Particles\ParticlesSample\ParticlesSample.xktpl
- !file ..\..\..\samples\Physics\PhysicsSample\PhysicsSample.xktpl
- !file ..\..\..\samples\UI\GameMenu\GameMenu.xktpl
- !file ..\..\..\samples\UI\UIParticles\UIParticles.xktpl
- !file ..\..\..\samples\UI\UIElementLink\UIElementLink.xktpl
- !file ..\..\..\samples\Templates\FirstPersonShooter\FirstPersonShooter\FirstPersonShooter.xktpl
- !file ..\..\..\samples\Templates\ThirdPersonPlatformer\ThirdPersonPlatformer\ThirdPersonPlatformer.xktpl
- !file ..\..\..\samples\Templates\TopDownRPG\TopDownRPG\TopDownRPG.xktpl
- !file ..\..\..\samples\Templates\VRSandbox\VRSandbox\VRSandbox.xktpl

0 comments on commit 5015242

Please sign in to comment.