Skip to content
Permalink
Browse files

[Build] Renamed XenkoRuntime into XenkoNETRuntime

  • Loading branch information
xen2 committed Oct 30, 2018
1 parent 29d24fe commit 3c71596cf7bca49511eb7d3c7458d7742fe2bbd0
@@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<None Condition="'$(XenkoRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\CoreCLRSetup.sh">
<None Condition="'$(XenkoNETRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\CoreCLRSetup.sh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="'$(XenkoRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\runtimeconfig.json">
<None Condition="'$(XenkoNETRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\runtimeconfig.json">
<Link>%(RecursiveDir)$(AssemblyName).runtimeconfig.json</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -9,10 +9,10 @@
<XenkoEmbeddedNativeLibrary Include="$(XenkoPackageXenkoPlatformBin)\*.config"/>
<XenkoEmbeddedNativeLibrary Include="$(XenkoPackageXenkoPlatformBin)\libSDL2-2.0.0"/>

<None Condition="'$(XenkoRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\CoreCLRSetup.sh">
<None Condition="'$(XenkoNETRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\CoreCLRSetup.sh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Condition="'$(XenkoRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\runtimeconfig.json">
<None Condition="'$(XenkoNETRuntime)' == 'CoreCLR'" Include="$(XenkoPackageXenkoPlatformBin)\runtimeconfig.json">
<Link>%(RecursiveDir)$(AssemblyName).runtimeconfig.json</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -156,8 +156,8 @@
<!-- Include platform specific targets -->
<Import Condition="Exists('$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).$(XenkoPlatform).targets')"
Project="$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).$(XenkoPlatform).targets"/>
<Import Condition="('$(XenkoRuntime)' != '') and Exists('$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).$(XenkoRuntime).targets')"
Project="$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).$(XenkoRuntime).targets"/>
<Import Condition="('$(XenkoNETRuntime)' != '') and Exists('$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).$(XenkoNETRuntime).targets')"
Project="$(MSBuildThisFileDirectory)\$(MSBuildThisFileName).$(XenkoNETRuntime).targets"/>
<!--
*****************************************************************************************************************************
Assembly Processor
@@ -8,7 +8,7 @@

<!-- Defines the platform used by Xenko - Values are Windows/Android/iOS...etc. -->
<XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">Windows</XenkoPlatform>
<XenkoRuntime Condition=" '$(XenkoRuntime)' == '' ">CoreCLR</XenkoRuntime>
<XenkoNETRuntime Condition=" '$(XenkoNETRuntime)' == '' ">CoreCLR</XenkoNETRuntime>
<XenkoBuildDirExtension Condition=" '$(XenkoBuildDirExtension)' == '' ">CoreCLR</XenkoBuildDirExtension>
<XenkoUI Condition=" '$(XenkoUI)' == '' ">SDL</XenkoUI>
</PropertyGroup>
@@ -8,7 +8,7 @@

<!-- Defines the platform used by Xenko - Values are Windows/Android/iOS...etc. -->
<XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">Linux</XenkoPlatform>
<XenkoRuntime Condition=" '$(XenkoRuntime)' == '' ">CoreCLR</XenkoRuntime>
<XenkoNETRuntime Condition=" '$(XenkoNETRuntime)' == '' ">CoreCLR</XenkoNETRuntime>
<XenkoBuildDirExtension Condition=" '$(XenkoBuildDirExtension)' == '' ">CoreCLR</XenkoBuildDirExtension>
<XenkoUI Condition=" '$(XenkoUI)' == '' ">SDL;OPENTK</XenkoUI>
</PropertyGroup>
@@ -8,7 +8,7 @@

<!-- Defines the platform used by Xenko - Values are Windows/Android/iOS...etc. -->
<XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">Linux</XenkoPlatform>
<XenkoRuntime Condition=" '$(XenkoRuntime)' == '' ">CoreCLR</XenkoRuntime>
<XenkoNETRuntime Condition=" '$(XenkoNETRuntime)' == '' ">CoreCLR</XenkoNETRuntime>
<XenkoBuildDirExtension Condition=" '$(XenkoBuildDirExtension)' == '' ">CoreCLR</XenkoBuildDirExtension>
<XenkoUI Condition=" '$(XenkoUI)' == '' ">SDL</XenkoUI>
</PropertyGroup>
@@ -8,7 +8,7 @@

<!-- Defines the platform used by Xenko - Values are Windows/Android/iOS...etc. -->
<XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">Windows</XenkoPlatform>
<XenkoRuntime Condition=" '$(XenkoRuntime)' == '' ">CoreCLR</XenkoRuntime>
<XenkoNETRuntime Condition=" '$(XenkoNETRuntime)' == '' ">CoreCLR</XenkoNETRuntime>
<XenkoBuildDirExtension Condition=" '$(XenkoBuildDirExtension)' == '' ">CoreCLR</XenkoBuildDirExtension>
<XenkoUI Condition=" '$(XenkoUI)' == '' ">SDL;OPENTK</XenkoUI>
</PropertyGroup>
@@ -8,7 +8,7 @@

<!-- Defines the platform used by Xenko - Values are Windows/Android/iOS...etc. -->
<XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">macOS</XenkoPlatform>
<XenkoRuntime Condition=" '$(XenkoRuntime)' == '' ">CoreCLR</XenkoRuntime>
<XenkoNETRuntime Condition=" '$(XenkoNETRuntime)' == '' ">CoreCLR</XenkoNETRuntime>
<XenkoBuildDirExtension Condition=" '$(XenkoBuildDirExtension)' == '' ">CoreCLR</XenkoBuildDirExtension>
<XenkoUI Condition=" '$(XenkoUI)' == '' ">SDL;OPENTK</XenkoUI>
</PropertyGroup>
@@ -15,7 +15,7 @@
<XenkoOutputFolder>Tests\$(AssemblyName)</XenkoOutputFolder>
<XenkoCompilerTargetsEnable Condition="'$(XenkoPackageBuild)' == 'true'">false</XenkoCompilerTargetsEnable>
<XenkoCompilerTargetsEnable Condition="'$(XenkoSkipUnitTests)' == 'true'">false</XenkoCompilerTargetsEnable>
<XenkoCompilerTargetsEnable Condition="'$(XenkoRuntime)' == 'CoreCLR'">false</XenkoCompilerTargetsEnable>
<XenkoCompilerTargetsEnable Condition="'$(XenkoNETRuntime)' == 'CoreCLR'">false</XenkoCompilerTargetsEnable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" Version="2.3.1" />
@@ -1,7 +1,7 @@
<Project>

<Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
<Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="1.6.55" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<Description>Core assembly for all Xenko assemblies.</Description>
@@ -34,7 +34,7 @@
</When>
</Choose>
<Choose>
<When Condition=" '$(XenkoRuntime)' == 'CoreCLR' ">
<When Condition=" '$(XenkoNETRuntime)' == 'CoreCLR' ">
<ItemGroup>
<None Include="..\..\data\Linux\runtimeconfig.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -22,8 +22,8 @@
<ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Condition="'$(XenkoRuntime)' == ''" Include="System" />
<Reference Condition="'$(XenkoRuntime)' == ''" Include="System.Core" />
<Reference Condition="'$(XenkoNETRuntime)' == ''" Include="System" />
<Reference Condition="'$(XenkoNETRuntime)' == ''" Include="System.Core" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\<#= Properties.ProjectGameRelativePath #>">
@@ -38,7 +38,7 @@
<ItemGroup>
<Content Include="Resources\Icon.ico" />
</ItemGroup>
<Import Condition="'$(XenkoRuntime)' == ''" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Condition="'$(XenkoNETRuntime)' == ''" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<#@ include file="..\Common.Imports.targets.t4" #>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -10,7 +10,7 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition="('$(XenkoPlatform)' == 'Windows') and ('$(XenkoRuntime)' != 'CoreCLR')">
<PropertyGroup Condition="('$(XenkoPlatform)' == 'Windows') and ('$(XenkoNETRuntime)' != 'CoreCLR')">
<DefineConstants>XENKO_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
@@ -17,7 +17,7 @@
<PropertyGroup Condition="'$(XenkoPlatform)' == 'Android'">
<DefineConstants>XENKO_VIDEO_MEDIACODEC;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="('$(XenkoPlatform)' == 'Windows') and ('$(XenkoRuntime)' != 'CoreCLR')">
<PropertyGroup Condition="('$(XenkoPlatform)' == 'Windows') and ('$(XenkoNETRuntime)' != 'CoreCLR')">
<DefineConstants>XENKO_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
@@ -21,10 +21,10 @@
</Reference>
</ItemGroup>
</When>
<When Condition="'$(XenkoRuntime)' != ''">
<When Condition="'$(XenkoNETRuntime)' != ''">
<ItemGroup>
<Reference Include="CppNet">
<HintPath>..\..\..\deps\CppNet\$(XenkoRuntime)\CppNet.dll</HintPath>
<HintPath>..\..\..\deps\CppNet\$(XenkoNETRuntime)\CppNet.dll</HintPath>
</Reference>
</ItemGroup>
</When>
@@ -128,15 +128,15 @@
<PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "/>

<!--
Settings XenkoRuntime specific
Settings XenkoNETRuntime specific
-->
<PropertyGroup Condition=" '$(XenkoRuntime)' == 'CoreCLR' ">
<PropertyGroup Condition=" '$(XenkoNETRuntime)' == 'CoreCLR' ">
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>$(XenkoPlatformDefines);$(DefineConstants)</DefineConstants>
<DefineConstants Condition="'$(XenkoRuntimeDefines)' != ''">$(DefineConstants);$(XenkoRuntimeDefines)</DefineConstants>
<DefineConstants Condition="'$(XenkoNETRuntimeDefines)' != ''">$(DefineConstants);$(XenkoNETRuntimeDefines)</DefineConstants>
</PropertyGroup>

<!-- Signing -->
@@ -115,8 +115,8 @@
<XenkoEffectCompiler>true</XenkoEffectCompiler>
</PropertyGroup>

<PropertyGroup Condition=" '$(XenkoRuntime)' == 'CoreCLR' ">
<XenkoRuntimeDefines>XENKO_RUNTIME_CORECLR</XenkoRuntimeDefines>
<PropertyGroup Condition=" '$(XenkoNETRuntime)' == 'CoreCLR' ">
<XenkoNETRuntimeDefines>XENKO_RUNTIME_CORECLR</XenkoNETRuntimeDefines>
<AutoIncludeSystemAssembly>true</AutoIncludeSystemAssembly>
</PropertyGroup>

@@ -84,7 +84,7 @@ var needSigning = true;
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<# } else { #>
<Import Condition="'$(XenkoRuntime)' == ''" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Condition="'$(XenkoNETRuntime)' == ''" Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<# } #>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

0 comments on commit 3c71596

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