Skip to content
Permalink
Browse files

[Graphics] Updated SharpDX to 4.2.0

  • Loading branch information
xen2 committed Oct 17, 2019
1 parent c5c2a64 commit d1f18836d6221acc8f79ac38075c95078e53b214
@@ -34,7 +34,7 @@
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="NuGet.Configuration" Version="5.0.0" />
<PackageReference Include="SharpDX" Version="4.0.1" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
@@ -34,7 +34,7 @@
<ProjectReference Include="..\Xenko.Core\Xenko.Core.csproj">
<PrivateAssets>contentfiles;analyzers</PrivateAssets>
</ProjectReference>
<PackageReference Include="SharpDX" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'UWP'" />
</ItemGroup>

<Import Project="$(XenkoPostSettingsTargets)" />
@@ -39,7 +39,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SharpDX" Version="4.0.1" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="EnvDTE" Version="8.0.1" />
<PackageReference Include="Xenko.Metrics" Version="1.0.0" />
<PackageReference Include="Xenko.CrashReport" Version="1.0.1" />
@@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.0.1" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
<!--PackageReference Include="Esent.Interop" Version="1.9.4" /-->
<PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" />
@@ -198,9 +198,9 @@
<ProjectReference Include="..\Xenko.Native\Xenko.Native.csproj" />
<ProjectReference Include="..\Xenko.Shaders\Xenko.Shaders.csproj" />
<ProjectReference Include="..\Xenko\Xenko.csproj" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D12" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D12" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="Xenko.OpenTK" Version="1.0.2" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'Linux' Or '$(XenkoPlatform)' == 'iOS' Or '$(XenkoPlatform)' == 'Android'" />
</ItemGroup>
<ItemGroup>
@@ -33,9 +33,9 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xenko.Games\Xenko.Games.csproj" />
<PackageReference Include="SharpDX.RawInput" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' And $(TargetFramework.StartsWith('net4'))" />
<PackageReference Include="SharpDX.DirectInput" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
<PackageReference Include="SharpDX.XInput" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
<PackageReference Include="SharpDX.RawInput" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' And $(TargetFramework.StartsWith('net4'))" />
<PackageReference Include="SharpDX.DirectInput" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
<PackageReference Include="SharpDX.XInput" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
</ItemGroup>
<ItemGroup />
<Import Project="$(XenkoPostSettingsTargets)" />
@@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xenko.Shaders.Parser\Xenko.Shaders.Parser.csproj" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
</ItemGroup>
<ItemGroup Condition="'$(XenkoPlatform)' == 'Windows'">
<XenkoNativeLib Include="$(WindowsSdkDir_10)\Redist\D3D\**\d3dcompiler_47.dll">
@@ -33,9 +33,9 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
<PackageReference Include="SharpDX.MediaFoundation" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D12" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
<PackageReference Include="SharpDX.MediaFoundation" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D12" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
</ItemGroup>
<Choose>
<When Condition="$(DefineConstants.Contains(XENKO_VIDEO_FFMPEG))">
@@ -39,7 +39,7 @@
<ProjectReference Include="..\..\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj" />
<ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj" />
<!-- SharpDX is needed for WIC -->
<PackageReference Include="SharpDX.Direct2D1" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'Linux'" />
</ItemGroup>

@@ -13,7 +13,7 @@
<ItemGroup>
<ProjectReference Include="..\..\engine\Xenko.Graphics\Xenko.Graphics.csproj" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
</ItemGroup>
<Import Project="$(XenkoPostSettingsTargets)" />
<Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />

0 comments on commit d1f1883

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