Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into onecsproj_onexkpkg2

# Conflicts:
#	Xenko.xkpkg
#	sources/shared/SharedAssemblyInfo.cs
  • Loading branch information
xen2 committed Oct 2, 2018
2 parents 335b653 + f2740cf commit f8ca24d1dff7926840acb06f3d0259e02c5eeb4f
Showing 346 changed files with 275,710 additions and 4,055 deletions.
@@ -41,6 +41,7 @@ Thank you everybody for your generous contributions!
* Ryan Galkowski
* Jon Stelly
* Jean-Baptiste Perrier
* Antony K. Jones

## Mini Backers

@@ -40,10 +40,13 @@ Ask for help or report issues:

1. [Git](https://git-scm.com/downloads) (recent version that includes LFS, or install [Git LFS](https://git-lfs.github.com/) separately).
2. [Visual Studio 2017](https://www.visualstudio.com/downloads/) with the following workloads:
* .NET desktop development (with .NET Framework 4.6.2 development tools)
* Desktop development with C++
* Optional: Universal Windows Platform development
* Optional: Mobile development with .NET
* `.NET desktop development`
* If your OS is Windows 10: add `.NET Framework 4.6.2 development tools` in optional components of `.NET desktop development`
* If your OS is Windows 7: [.NET 4.6.2 Developer Pack](https://www.microsoft.com/net/download/thank-you/net462-developer-pack))
* `Desktop development with C++`
* `.NET Core cross-platform development`
* Optional (to target UWP): `Universal Windows Platform development`
* Optional (to target iOS/Android): `Mobile development with .NET` and `Android NDK R13B+` individual component
3. [FBX SDK 2019.0 VS2015](https://www.autodesk.com/developer-network/platform-technologies/fbx-sdk-2019-0)

### Build Xenko
@@ -47,7 +47,7 @@ Xenko uses the following open-source products.
* [DocFX](https://dotnet.github.io/docfx/) (MIT License)
* [ffmpeg](https://ffmpeg.org/) (GPL 3)
* [FreeImage](http://freeimage.sourceforge.net/) (FreeImage Public License - Version 1.0)
* [Gettext.NET](https://sourceforge.net/projects/gettextnet/) (LGPL 2.1, unmodified binaries)
* [Gettext.NET](https://sourceforge.net/projects/gettextnet/) (LGPL 2.1, [modified binaries](https://github.com/xenko3d/gettextnet))
* [ILRepack](https://github.com/gluck/il-repack) (Apache License 2.0)
* [ImageMagick](http://www.imagemagick.org/)
* [Markdown.XAML](https://github.com/theunrepentantgeek/Markdown.XAML) (MIT License)
@@ -310,6 +310,11 @@ Example of use:
<UnitTestPrerequisites Include="@(UnitTestGame)"/>
<UnitTest Include="@(UnitTestGameAndroid)"><Solution>$(XenkoSolution).Android.sln</Solution></UnitTest>
</ItemGroup>

<!-- Samples unit tests -->
<ItemGroup Condition="$(XenkoTestCategories.Contains(';Samples;'))">
<UnitTest Include="72-XenkoSamples\Xenko.Samples.Tests"/>
</ItemGroup>

<!-- Compute TargetName and default Solution -->
<ItemGroup>
@@ -446,6 +446,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Video", "..\sources\e
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Editor.CrashReport", "..\sources\editor\Xenko.Editor.CrashReport\Xenko.Editor.CrashReport.shproj", "{AB574F65-1402-4476-9314-74DCDAF19097}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "72-XenkoSamples", "72-XenkoSamples", "{75608B5C-1C03-4B38-810E-14EED5165E59}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Samples.Tests", "..\samples\Tests\Xenko.Samples.Tests.csproj", "{2FC40214-A4AA-45DC-9C93-72ED800C40B0}"
ProjectSection(ProjectDependencies) = postProject
{75D71310-ECF7-4592-9E35-3FE540040982} = {75D71310-ECF7-4592-9E35-3FE540040982}
{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
EndProjectSection
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems*{0bd41add-2704-4a77-a9ab-15460a2abdc6}*SharedItemsImports = 4
@@ -3879,6 +3887,42 @@ Global
{DA355C86-866F-4843-9B4D-63A173C750FB}.Testing|Mixed Platforms.Build.0 = Release|Any CPU
{DA355C86-866F-4843-9B4D-63A173C750FB}.Testing|Win32.ActiveCfg = Release|Any CPU
{DA355C86-866F-4843-9B4D-63A173C750FB}.Testing|Win32.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.AppStore|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.AppStore|Mixed Platforms.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.AppStore|Win32.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.AppStore|Win32.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Debug|Any CPU.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Debug|Win32.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Debug|Win32.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Release|Any CPU.ActiveCfg = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Release|Any CPU.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Release|Mixed Platforms.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Release|Win32.ActiveCfg = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.CoreCLR_Release|Win32.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Win32.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Win32.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Any CPU.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Win32.ActiveCfg = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Win32.Build.0 = Release|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Testing|Any CPU.ActiveCfg = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Testing|Any CPU.Build.0 = Debug|Any CPU
{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Testing|Mixed Platforms.ActiveCfg = Debug|Any CPU
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -3999,6 +4043,7 @@ Global
{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
{DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209}
{AB574F65-1402-4476-9314-74DCDAF19097} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
{2FC40214-A4AA-45DC-9C93-72ED800C40B0} = {75608B5C-1C03-4B38-810E-14EED5165E59}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
@@ -0,0 +1,4 @@
## Sources

Compiled from [custom repository](https://github.com/xenko3d/gettextnet)
Original fork from [Gettext.NET](https://sourceforge.net/projects/gettextnet/) (LGPL 2.1)
@@ -0,0 +1 @@
Sources for Xenko.Metrics are located in sources/metrics folder

This file was deleted.

This file was deleted.

@@ -7,24 +7,23 @@
using Xenko.Input;
using Xenko.Games.Testing;

namespace FPSTest
namespace Xenko.Samples.Tests
{
public class FPSTest
public class FPSTest : IClassFixture<FPSTest.Fixture>
{
private const string Path = "samplesGenerated\\FirstPersonShooter\\Bin\\Windows\\Debug\\FirstPersonShooter.exe";
private const string Path = "..\\..\\..\\..\\samplesGenerated\\FirstPersonShooter";

#if TEST_ANDROID
private const PlatformType TestPlatform = PlatformType.Android;
#elif TEST_IOS
private const PlatformType TestPlatform = PlatformType.iOS;
#else
private const PlatformType TestPlatform = PlatformType.Windows;
#endif
public class Fixture : SampleTestFixture
{
public Fixture() : base(Path, new Guid("B12AF970-1F11-4BC8-9571-3B4DA9E20F05"))
{
}
}

[Fact]
public void TestLaunch()
{
using (var game = new GameTestingClient(Path, TestPlatform))
using (var game = new GameTestingClient(Path, SampleTestsData.TestPlatform))
{
game.Wait(TimeSpan.FromMilliseconds(2000));
}
@@ -33,7 +32,7 @@ public void TestLaunch()
[Fact]
public void TestInputs()
{
using (var game = new GameTestingClient(Path, TestPlatform))
using (var game = new GameTestingClient(Path, SampleTestsData.TestPlatform))
{
game.Wait(TimeSpan.FromMilliseconds(2000));
game.Tap(new Vector2(0.5f, 0.7f), TimeSpan.FromMilliseconds(500));
@@ -7,24 +7,23 @@
using Xenko.Input;
using Xenko.Games.Testing;

namespace JumpyJetTest
namespace Xenko.Samples.Tests
{
public class JumpyJetTest
public class JumpyJetTest : IClassFixture<JumpyJetTest.Fixture>
{
private const string Path = "samplesGenerated\\JumpyJet\\Bin\\Windows\\Debug\\JumpyJet.exe";
private const string Path = "..\\..\\..\\..\\samplesGenerated\\JumpyJet";

#if TEST_ANDROID
private const PlatformType TestPlatform = PlatformType.Android;
#elif TEST_IOS
private const PlatformType TestPlatform = PlatformType.iOS;
#else
private const PlatformType TestPlatform = PlatformType.Windows;
#endif
public class Fixture : SampleTestFixture
{
public Fixture() : base(Path, new Guid("1C9E733A-16BB-48C3-A4DE-722B61EED994"))
{
}
}

[Fact]
public void TestLaunch()
{
using (var game = new GameTestingClient(Path, TestPlatform))
using (var game = new GameTestingClient(Path, SampleTestsData.TestPlatform))
{
game.Wait(TimeSpan.FromMilliseconds(2000));
}
@@ -33,7 +32,7 @@ public void TestLaunch()
[Fact]
public void TestInputs()
{
using (var game = new GameTestingClient(Path, TestPlatform))
using (var game = new GameTestingClient(Path, SampleTestsData.TestPlatform))
{
game.Wait(TimeSpan.FromMilliseconds(2000));
game.Tap(new Vector2(0.5f, 0.7f), TimeSpan.FromMilliseconds(500));

0 comments on commit f8ca24d

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