Skip to content
Permalink
Browse files

[Build] Removed Xenko.SamplesBootstrapper and fixed Xenko.Samples.Tests

  • Loading branch information
xen2 committed Nov 30, 2018
1 parent 1fcbd1d commit 53ce6d3433cf02c51921e673afd3430177c2bbcc
Showing with 60 additions and 288 deletions.
  1. +0 −15 build/Xenko.sln
  2. +0 −72 build/XenkoSamples.build
  3. +1 −1 samples/Tests/Games/FPStest.cs
  4. +1 −1 samples/Tests/Games/JumpyJetTest.cs
  5. +1 −1 samples/Tests/Games/RPGTest.cs
  6. +1 −1 samples/Tests/Games/SpaceEscapeTest.cs
  7. +1 −1 samples/Tests/Games/TPPTest.cs
  8. +1 −1 samples/Tests/Graphics/AnimatedModelTest.cs
  9. +1 −1 samples/Tests/Graphics/CustomEffectTest.cs
  10. +1 −1 samples/Tests/Graphics/MaterialShaderTest.cs
  11. +1 −1 samples/Tests/Graphics/SpriteFontsTest.cs
  12. +1 −1 samples/Tests/Graphics/SpriteStudioDemoTest.cs
  13. +1 −1 samples/Tests/Input/GravitySensorTest.cs
  14. +1 −1 samples/Tests/Input/TouchInputsTest.cs
  15. +1 −1 samples/Tests/LocalConnectionRouterInitializer.cs
  16. +1 −1 samples/Tests/Particles/ParticlesSampleTest.cs
  17. +1 −1 samples/Tests/Physics/PhysicsSampleTest.cs
  18. +9 −6 samples/Tests/SampleTestFixture.cs
  19. +1 −1 samples/Tests/UI/GameMenuTest.cs
  20. +1 −1 samples/Tests/UI/UIParticlesTest.cs
  21. +5 −0 samples/Tests/Xenko.Samples.Tests.csproj
  22. +1 −1 sources/core/Xenko.Core/PropertyContainer.cs
  23. +17 −1 sources/editor/Xenko.Assets.Presentation/Templates/TemplateSampleGenerator.cs
  24. +9 −4 sources/editor/Xenko.Assets.Presentation/XenkoDefaultAssetsPlugin.cs
  25. +0 −81 sources/editor/Xenko.SamplesBootstrapper/Program.cs
  26. +0 −18 sources/editor/Xenko.SamplesBootstrapper/Properties/AssemblyInfo.cs
  27. +0 −37 sources/editor/Xenko.SamplesBootstrapper/Xenko.SamplesBootstrapper.csproj
  28. +0 −34 sources/editor/Xenko.SamplesBootstrapper/app.config
  29. +1 −1 sources/engine/Xenko.Games.Testing/GameTestingClient.cs
  30. +1 −1 sources/engine/Xenko.Games.Testing/GameTestingSystem.cs
@@ -332,8 +332,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles", "..\sourc
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games.Testing", "..\sources\engine\Xenko.Games.Testing\Xenko.Games.Testing.csproj", "{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.SamplesBootstrapper", "..\sources\editor\Xenko.SamplesBootstrapper\Xenko.SamplesBootstrapper.csproj", "{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Native", "..\sources\engine\Xenko.Native\Xenko.Native.csproj", "{1DBBC150-F085-43EF-B41D-27C72D133770}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assets.Tests2", "..\sources\engine\Xenko.Assets.Tests2\Xenko.Assets.Tests2.csproj", "{370ADF53-DFFA-461E-B72A-1302C0A0DE00}"
@@ -1243,18 +1241,6 @@ Global
{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Win32.ActiveCfg = Release|Any CPU
{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Win32.Build.0 = Release|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Debug|Win32.ActiveCfg = Debug|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Debug|Win32.Build.0 = Debug|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Release|Any CPU.Build.0 = Release|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Release|Win32.ActiveCfg = Release|Any CPU
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6}.Release|Win32.Build.0 = Release|Any CPU
{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1678,7 +1664,6 @@ Global
{75D71310-ECF7-4592-9E35-3FE540040982} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
{F32FDA80-B6DD-47A8-8681-437E2C0D3F31} = {4C142567-C42B-40F5-B092-798882190209}
{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
{FF2A1FBB-3AB3-4CE5-AA81-A10E68232CD6} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
{1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209}
{370ADF53-DFFA-461E-B72A-1302C0A0DE00} = {A47B451D-3162-410F-BAF7-C650C4B7A4B0}
{33CC6216-3F30-4B5A-BB29-C5B47EFFA713} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}

This file was deleted.

@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class FPSTest : IClassFixture<FPSTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\FirstPersonShooter";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\FirstPersonShooter";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class JumpyJetTest : IClassFixture<JumpyJetTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\JumpyJet";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\JumpyJet";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class RPGTest : IClassFixture<RPGTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\TopDownRPG";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\TopDownRPG";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class SpaceEscapeTest : IClassFixture<SpaceEscapeTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\SpaceEscape";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\SpaceEscape";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class TPPTest : IClassFixture<TPPTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\ThirdPersonPlatformer";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\ThirdPersonPlatformer";

public class Fixture : SampleTestFixture
{
@@ -10,7 +10,7 @@ namespace Xenko.Samples.Tests
{
public class AnimatedModelTest : IClassFixture<AnimatedModelTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\AnimatedModel";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\AnimatedModel";

public class Fixture : SampleTestFixture
{
@@ -10,7 +10,7 @@ namespace Xenko.Samples.Tests
{
public class CustomEffectTest : IClassFixture<CustomEffectTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\CustomEffect";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\CustomEffect";

public class Fixture : SampleTestFixture
{
@@ -10,7 +10,7 @@ namespace Xenko.Samples.Tests
{
public class MaterialShaderTest : IClassFixture<MaterialShaderTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\MaterialShader";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\MaterialShader";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class SpriteFontsTest : IClassFixture<SpriteFontsTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\SpriteFonts";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\SpriteFonts";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class SpriteStudioDemoTest : IClassFixture<SpriteStudioDemoTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\SpriteStudioDemo";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\SpriteStudioDemo";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class GravitySensorTest : IClassFixture<GravitySensorTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\GravitySensor";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\GravitySensor";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class TouchInputsTest : IClassFixture<TouchInputsTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\TouchInputs";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\TouchInputs";

public class Fixture : SampleTestFixture
{
@@ -18,7 +18,7 @@ internal class LocalConnectionRouterInitializer
public static void Initialize()
{
// Locate connection router
var connectionRouterPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\..\Bin\Windows\Xenko.ConnectionRouter.exe");
var connectionRouterPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Xenko.ConnectionRouter.exe");
if (!File.Exists(connectionRouterPath))
throw new InvalidOperationException("Connection router not found");

@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class ParticlesSampleTest : IClassFixture<ParticlesSampleTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\ParticlesSample";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\ParticlesSample";

public class Fixture : SampleTestFixture
{
@@ -11,7 +11,7 @@ namespace Xenko.Samples.Tests
{
public class PhysicsSampleTest : IClassFixture<PhysicsSampleTest.Fixture>
{
private const string Path = "..\\..\\..\\..\\samplesGenerated\\PhysicsSample";
private const string Path = "..\\..\\..\\..\\..\\samplesGenerated\\PhysicsSample";

public class Fixture : SampleTestFixture
{
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Xenko.Assets.Presentation;
using Xenko.Assets.Presentation.Templates;
using Xenko.Assets.Templates;
using Xenko.Core.Assets;
@@ -47,18 +48,17 @@ private static PackageSession GenerateSample(UDirectory outputPath, Guid templat
Console.WriteLine(@"Bootstrapping: " + sampleName);

var session = new PackageSession();
var xenkoPkg = PackageStore.Instance.DefaultPackage;
Console.WriteLine("Using Xenko from " + xenkoPkg.FullPath + "...");
var xenkoDir = Path.GetDirectoryName(xenkoPkg.FullPath);

var generator = TemplateSampleGenerator.Default;

// Ensure progress is shown while it is happening.
logger.MessageLogged += (sender, eventArgs) => Console.WriteLine(eventArgs.Message.Text);

var parameters = new SessionTemplateGeneratorParameters { Session = session };
parameters.Unattended = true;
TemplateSampleGenerator.SetParameters(parameters, AssetRegistry.SupportedPlatforms.Where(x => x.Type == Core.PlatformType.Windows).Select(x => new SelectedSolutionPlatform(x, x.Templates.FirstOrDefault())).ToList());
TemplateSampleGenerator.SetParameters(
parameters,
AssetRegistry.SupportedPlatforms.Where(x => x.Type == Core.PlatformType.Windows).Select(x => new SelectedSolutionPlatform(x, x.Templates.FirstOrDefault())).ToList(),
addGamesTesting: true);

session.SolutionPath = UPath.Combine<UFile>(outputPath, sampleName + ".sln");

@@ -75,7 +75,10 @@ private static PackageSession GenerateSample(UDirectory outputPath, Guid templat
}
}

var xenkoTemplates = xenkoPkg.Templates;
// Load templates
XenkoDefaultAssetsPlugin.LoadDefaultTemplates();
var xenkoTemplates = TemplateManager.FindTemplates(session);

parameters.Description = xenkoTemplates.First(x => x.Id == templateGuid);
parameters.Name = sampleName;
parameters.Namespace = sampleName;

0 comments on commit 53ce6d3

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