Skip to content
Permalink
Browse files

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

  • Loading branch information
Eideren committed May 24, 2019
2 parents 0cc07bd + e2c44d3 commit 755810da258037454076782eb19911c8e5a4b63c
Showing with 71 additions and 68 deletions.
  1. +2 −2 deps/AssemblyProcessor/Mono.Cecil.Mdb.dll
  2. +2 −2 deps/AssemblyProcessor/Mono.Cecil.Pdb.dll
  3. +1 −1 deps/AssemblyProcessor/Mono.Cecil.Rocks.dll
  4. +2 −2 deps/AssemblyProcessor/Mono.Cecil.dll
  5. +2 −2 deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe
  6. +2 −2 deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.pdb
  7. +1 −1 deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe
  8. +1 −1 deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb
  9. 0 deps/{monolinker → Mono.Cecil}/.gitignore
  10. 0 deps/{monolinker → Mono.Cecil}/License.txt
  11. 0 deps/{monolinker → Mono.Cecil}/Mono.Cecil.Mdb.dll
  12. 0 deps/{monolinker → Mono.Cecil}/Mono.Cecil.Pdb.dll
  13. +3 −0 deps/Mono.Cecil/Mono.Cecil.Rocks.dll
  14. 0 deps/{monolinker → Mono.Cecil}/Mono.Cecil.dll
  15. +3 −0 deps/Mono.Cecil/build.bat
  16. +2 −0 deps/Mono.Cecil/checkout.bat
  17. 0 deps/{monolinker → Mono.Cecil}/monolinker.exe
  18. +1 −1 deps/OpenTK/iOS/link.bat
  19. +3 −0 sources/core/Xenko.Core.AssemblyProcessor.Tests/Xenko.Core.AssemblyProcessor.Tests.csproj
  20. +13 −2 sources/core/Xenko.Core.AssemblyProcessor/Xenko.Core.AssemblyProcessor.csproj
  21. +0 −17 sources/core/Xenko.Core.Design/Windows/AppHelper.cs
  22. +1 −1 sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj
  23. +1 −1 sources/core/Xenko.Core.Yaml/Xenko.Core.Yaml.csproj
  24. +4 −1 sources/editor/Xenko.GameStudio/Xenko.GameStudio.csproj
  25. +7 −9 sources/native/WindowsProjects/UWP/UWP.vcxproj
  26. +5 −7 sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj
  27. +0 −1 sources/native/Xenko.Native.targets
  28. +1 −1 sources/presentation/Xenko.Core.Quantum/Xenko.Core.Quantum.csproj
  29. +0 −6 sources/targets/Xenko.Core.GlobalSettings.targets
  30. +3 −2 sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj
  31. +3 −2 sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj
  32. +3 −2 sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj
  33. +2 −1 sources/tools/Xenko.Importer.FBX/Xenko.Importer.FBX.vcxproj
  34. +3 −1 sources/tools/Xenko.PublicApiCheck/Xenko.PublicApiCheck.csproj
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Git LFS file not shown
File renamed without changes.
@@ -0,0 +1,3 @@
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
msbuild ..\..\externals\il-repack\cecil\Mono.Cecil.sln /Property:Configuration=net_4_0_Release;Platform="Any CPU"
copy ..\..\externals\il-repack\cecil\bin\net_4_0_Release\*.* .
@@ -0,0 +1,2 @@
echo "Checking out ILRepack which contains Cecil"
..\ILRepack\checkout.bat
File renamed without changes.
@@ -1,5 +1,5 @@
pushd ..\..\..\bin\iOS-OpenGLES
..\..\deps\monolinker\monolinker -a Xenko.Engine.dll -a Xenko.Games.dll -a Xenko.Input.dll -a Xenko.Graphics.dll -p link OpenTK-1.1 -u copy -b true -d "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Xamarin.iOS\v1.0"
..\..\deps\Mono.Cecil\monolinker -a Xenko.Engine.dll -a Xenko.Games.dll -a Xenko.Input.dll -a Xenko.Graphics.dll -p link OpenTK-1.1 -u copy -b true -d "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Xamarin.iOS\v1.0"
popd

copy ..\..\..\bin\iOS-OpenGLES\output\OpenTK-1.1.dll .
@@ -20,6 +20,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="nunit.core.interfaces">
<HintPath>..\..\..\deps\NUnit\addins\nunit.core.interfaces.dll</HintPath>
</Reference>
@@ -24,8 +24,19 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<Reference Include="Mono.Cecil">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Pdb">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Rocks">
<HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
</ItemGroup>
<ItemGroup>
@@ -73,7 +84,7 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ILRepack" Version="2.0.15" />
<PackageReference Include="ILRepack" Version="2.0.15"/>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
@@ -5,7 +5,6 @@
using System.Linq;
using System.Management;
using System.Text;
using System.Windows.Forms;
using Xenko.Core.Annotations;
using Xenko.Core.Extensions;

@@ -38,22 +37,6 @@ public static string BuildErrorMessage([NotNull] Exception exception, string hea
return body.ToString();
}

[NotNull]
public static string BuildErrorToClipboard([NotNull] Exception exception, string header = null)
{
var errorMessage = BuildErrorMessage(exception, header);
try
{
Clipboard.SetText(errorMessage);
}
catch (Exception e)
{
e.Ignore();
}

return errorMessage;
}

internal static void WriteMemoryInfo(StringBuilder writer)
{
// Not used yet, but we might want to include some of these info
@@ -8,7 +8,7 @@
<XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
<XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
<XenkoPlatformDependent>true</XenkoPlatformDependent>
<TargetFramework>$(TargetFrameworkTool)</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<XenkoBuildTags>WindowsTools</XenkoBuildTags>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
<RestorePackages>true</RestorePackages>
@@ -7,7 +7,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
<XenkoPlatformDependent>true</XenkoPlatformDependent>
<TargetFramework>$(TargetFrameworkTool)</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<XenkoBuildTags>WindowsTools</XenkoBuildTags>
</PropertyGroup>
<Choose>
@@ -43,7 +43,10 @@
<PackageReference Include="EnvDTE" Version="8.0.1" />
<PackageReference Include="Xenko.Metrics" Version="1.0.0" />
<PackageReference Include="Xenko.CrashReport" Version="1.0.1" />
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<Reference Include="Mono.Cecil">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(XenkoCommonDependenciesDir)Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<PackageReference Include="QuickGraph" Version="3.6.61119.7" />
<Reference Include="Renci.SshNet, Version=2016.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -35,45 +35,43 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
<!-- If not there, it will ask user to install 8.1 if nothing is installed, so provide a better fallback -->
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.16299.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -22,34 +22,32 @@
<ProjectGuid>{75C5F896-0E36-4348-9E80-5E9EFE494D94}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>$(XenkoNativeOutputName)</RootNamespace>
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
<!-- If not there, it will ask user to install 8.1 if nothing is installed, so provide a better fallback -->
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
@@ -209,7 +209,6 @@

<Target Name="CompileNativeClang_Android" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'Android' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
<Error Text="The AndroidNdkDirectory environment variable is not set!" Condition="'$(AndroidNdkDirectory)' == ''" />
<Error Text="The installed NDK version is outdated, please install a r10+! ($(AndroidNdkDirectory))" Condition="'$([System.Text.RegularExpressions.Regex]::Match(`$(AndroidNdkDirectory)`, `.*r\d\d[a-z]?$`).Success)' == 'false'" />

<MakeDir Directories="$(XenkoNativeOutputPath)\armeabi-v7a"/>
<Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armeabi-v7a.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target armv7-none-android" />
@@ -6,7 +6,7 @@
<PropertyGroup>
<XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
<XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
<TargetFramework>$(TargetFrameworkTool)</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
@@ -119,12 +119,6 @@
</When>
</Choose>

<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
<!-- If not there, it will ask user to install 8.1 if nothing is installed, so provide a better fallback -->
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>

<!-- Create empty project platform configuration so that MSBuild and Visual Studio Configuration Manager know about it -->
<PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Debug|iPhone' "/>
<PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Release|iPhone' "/>
@@ -29,19 +29,20 @@
<ProjectGuid>{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}</ProjectGuid>
<RootNamespace>Xenko.AssimpNet.NetTranslation</RootNamespace>
<ProjectName>Xenko.Assimp.Translation</ProjectName>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<CLRSupport>true</CLRSupport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<CLRSupport>true</CLRSupport>
@@ -40,19 +40,20 @@
<ProjectGuid>{C2306552-6C42-464C-8981-32FEF4F9458D}</ProjectGuid>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>Xenko.Importer.Assimp</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -40,19 +40,20 @@
<ProjectGuid>{43A6E62E-1B1C-4630-ABB8-C3F716004645}</ProjectGuid>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>Xenko.Importer.Common</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>true</CLRSupport>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -11,7 +11,7 @@
<FbxSdkVersion>2019.0</FbxSdkVersion>
<FbxSdkUrl>https://www.autodesk.com/developer-network/platform-technologies/fbx-sdk-2019-0</FbxSdkUrl>
<FbxSdkDir>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Autodesk FBX SDK $(FbxSdkVersion)', 'Install_Dir', null, RegistryView.Registry32))</FbxSdkDir>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<FbxLibVersionDir>vs2015\</FbxLibVersionDir>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
@@ -36,6 +36,7 @@
<ProjectGuid>{0467D515-FD66-4B8A-A128-CB642C2ED03F}</ProjectGuid>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>Xenko.Importer.FBX</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -18,7 +18,9 @@
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.10.3" />
<Reference Include="Mono.Cecil">
<HintPath>$(XenkoCommonDependenciesDir)Mono.Cecil\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

0 comments on commit 755810d

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