Browse Source

Update to SharpDX 4.0.1 to keep strong naming and fix some broken project files

pull/1040/head
Jeremy Koritzinsky 9 years ago
parent
commit
7734fcb660
  1. 13
      build/SharpDX.props
  2. 4
      samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
  3. 1
      src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
  4. 4
      src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs

13
build/SharpDX.props

@ -1,9 +1,12 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SharpDXVersion>4.0.1</SharpDXVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SharpDX" Version="4.0.0" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.0.0" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.0.0" />
<PackageReference Include="SharpDX.DXGI" Version="4.0.0" />
<PackageReference Include="SharpDX.Direct3D9" Version="4.0.0" Condition="'$(UseDirect3D9)' == 'true'" />
<PackageReference Include="SharpDX" Version="$(SharpDXVersion)" />
<PackageReference Include="SharpDX.Direct2D1" Version="$(SharpDXVersion)" />
<PackageReference Include="SharpDX.Direct3D11" Version="$(SharpDXVersion)" />
<PackageReference Include="SharpDX.DXGI" Version="$(SharpDXVersion)" />
<PackageReference Include="SharpDX.Direct3D9" Version="$(SharpDXVersion)" Condition="'$(UseDirect3D9)' == 'true'" />
</ItemGroup>
</Project>

4
samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj

@ -4,8 +4,8 @@
<TargetFramework>net461</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SharpDX.Mathematics" Version="4.0.0" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.0" />
<PackageReference Include="SharpDX.Mathematics" Version="4.0.1" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" />
<Compile Update="**\*.paml.cs">
<DependentUpon>%(Filename)</DependentUpon>
</Compile>

1
src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj

@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>

4
src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs

@ -811,7 +811,7 @@ namespace Avalonia.Win32.Interop
return SetClassLong64(hWnd, nIndex, dwNewLong);
}
#if !NETSTANDARD
#if !NETSTANDARD && !NETSTANDARD1_3
[ComImport, ClassInterface(ClassInterfaceType.None), TypeLibType(TypeLibTypeFlags.FCanCreate), Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")]
internal class FileOpenDialogRCW { }
@ -1155,7 +1155,7 @@ namespace Avalonia.Win32.Interop
public int flagsEx;
}
}
#if !NETSTANDARD
#if !NETSTANDARD && !NETSTANDARD1_3
[ComImport(), Guid("42F85136-DB7E-439C-85F1-E4075D135FC8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
internal interface IFileDialog
{

Loading…
Cancel
Save