Skip to content
Permalink
Browse files

[Build] Switching unit tests to new targets

  • Loading branch information
xen2 committed Dec 6, 2018
1 parent 8ab5690 commit 79740098ab6fe979bb1eeabad8e03a7b095a92a6
@@ -45,7 +45,8 @@
<!--asset OutputPath for other platforms. Note: this is overridden for UnitTests projects. -->
<XenkoCompileAssetOutputPath Condition="'$(XenkoCompileAssetOutputPath)' == ''">$(TargetDir)data</XenkoCompileAssetOutputPath>

<XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == ''">$(MSBuildThisFileDirectory)..\lib\net472\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
<XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\lib\net472\Xenko.Core.Assets.CompilerApp.exe')">$(MSBuildThisFileDirectory)..\lib\net472\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
<XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net472\Xenko.Core.Assets.CompilerApp.exe')">$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net472\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>

<!--<XenkoCompileAssetCommandProxy Condition="'$(DisableAssetCompilerExecServerProxy)' == 'true' Or '$(XenkoDisableAssetCompilerExecServerProxy)' == 'true'">&quot;$(XenkoCompileAssetCommand)&quot;</XenkoCompileAssetCommandProxy>
<XenkoCompileAssetCommandProxy Condition="'$(XenkoCompileAssetCommandProxy)' == ''">&quot;$(XenkoPackageXenkoSdkBin)\Xenko.Core.Assets.CompilerClient.exe&quot;</XenkoCompileAssetCommandProxy>-->
@@ -55,7 +55,8 @@
<PropertyGroup>
<!--By default, turn on assembly processor-->
<XenkoAssemblyProcessor Condition="'$(XenkoAssemblyProcessor)' == ''">true</XenkoAssemblyProcessor>
<XenkoAssemblyProcessorPath>$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe</XenkoAssemblyProcessorPath>
<XenkoAssemblyProcessorPath Condition="Exists('$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe')">$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe</XenkoAssemblyProcessorPath>
<XenkoAssemblyProcessorPath Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe')">$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe</XenkoAssemblyProcessorPath>
</PropertyGroup>
<UsingTask TaskName="AssemblyProcessorTask" AssemblyFile="$(XenkoAssemblyProcessorPath)" Condition=" '$(XenkoAssemblyProcessorPath)' != '' And '$(XenkoAssemblyProcessorDev)' != 'true' "/>
<Target Name="XenkoRunAssemblyProcessor" DependsOnTargets="ResolveAssemblyReferences">
@@ -4,6 +4,8 @@
<Import Project="$(SolutionDir)$(SolutionName).PreSettings.Local.targets" Condition="Exists('$(SolutionDir)$(SolutionName).PreSettings.Local.targets')" />
<Import Project="$(SolutionDir)Xenko.Core.PreSettings.Local.targets" Condition="Exists('$(SolutionDir)Xenko.Core.PreSettings.Local.targets')" />

<Import Project="$(MSBuildThisDirectory)..\..\sources\core\Xenko.Core\build\Xenko.Core.props"/>

<PropertyGroup>
<XenkoPlatformFullName>$(XenkoPlatform)</XenkoPlatformFullName>
<XenkoPlatformFullName Condition="'$(XenkoBuildDirExtension)' != ''">$(XenkoPlatformFullName)-$(XenkoBuildDirExtension)</XenkoPlatformFullName>
@@ -37,7 +37,8 @@
<AssemblyOriginatorKeyFile Condition="'$(XenkoOpenSourceSign)' == 'true'">$(SolutionDir)xenko.public.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)\..\..\Targets\Xenko.Common.targets"/>
<Import Project="$(MSBuildThisDirectory)..\..\sources\core\Xenko.Core\build\Xenko.Core.targets"/>
<Import Project="$(MSBuildThisDirectory)..\..\sources\assets\Xenko.Core.Assets.CompilerApp\build\Xenko.Core.Assets.CompilerApp.targets"/>

<!-- Add Default targets used by Msbuild for undefined Platforms / or when skipping compilation under a platform -->
<Import Condition="'$(XenkoCompilerTargetsEnable)' == 'false'" Project="$(MSBuildThisFileDirectory)Xenko.UnitTests.DisableBuild.targets"/>

0 comments on commit 7974009

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