Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit 5677dc6

Browse files
xoofxxoofx
authored
Merge pull request #1047 from jkoritzinsky/UpdateDependencies
Update dependencies
2 parents 1f89381 + 720988b commit 5677dc6

50 files changed

Lines changed: 241 additions & 386 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/Directory.build.props‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,12 @@
4040
<DelaySign>true</DelaySign>
4141
</PropertyGroup>
4242

43-
<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
44-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.14393.0</TargetPlatformVersion>
45-
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
46-
</PropertyGroup>
47-
4843
<ItemGroup>
49-
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.0" PrivateAssets="All" />
50-
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.0.0" PrivateAssets="All" />
44+
<PackageReference Include="SharpGenTools.Sdk" Version="1.1.0" PrivateAssets="All" />
45+
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.1.0" PrivateAssets="All" />
5146
<SharpGenGlobalNamespaceOverrides Include="InterfaceArray" Override="ComArray" />
5247
<SharpGenGlobalNamespaceOverrides Include="MemoryHelpers" Override="Utilities" />
5348
<SharpGenGlobalNamespaceOverrides Include="BooleanHelpers" Override="Utilities" />
5449
<SharpGenGlobalNamespaceOverrides Include="StringHelpers" Override="Utilities" />
5550
</ItemGroup>
56-
57-
58-
<!-- Special packages and imports for UWP support -->
59-
<ItemGroup>
60-
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="all" />
61-
</ItemGroup>
62-
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
63-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.4.0" />
64-
</ItemGroup>
6551
</Project>

‎Source/DocumentationCache.xml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75928,5 +75928,116 @@ hr = pInfoQueue-&amp;gt;GetMessage({{DXGI_DEBUG_ALL}}, 0, pMessage, &amp;amp;mes
7592875928
&lt;/p&gt;</summary>
7592975929
<Items />
7593075930
</doc-item>
75931+
<doc-item name="D3D11_UNORDERED_ACCESS_VIEW_DESC_INNER_0">
75932+
<Items />
75933+
</doc-item>
75934+
<doc-item name="D3D12_RENDER_TARGET_VIEW_DESC_INNER_0">
75935+
<Items />
75936+
</doc-item>
75937+
<doc-item name="D3D12_DEPTH_STENCIL_VIEW_DESC_INNER_0">
75938+
<Items />
75939+
</doc-item>
75940+
<doc-item name="D3D12_UNORDERED_ACCESS_VIEW_DESC_INNER_0">
75941+
<Items />
75942+
</doc-item>
75943+
<doc-item name="D3D12_ROOT_PARAMETER_INNER_0">
75944+
<Items />
75945+
</doc-item>
75946+
<doc-item name="D2D_MATRIX_4X4_F_INNER_0_INNER_0">
75947+
<Items />
75948+
</doc-item>
75949+
<doc-item name="D3D11_SHADER_RESOURCE_VIEW_DESC1_INNER_0">
75950+
<Items />
75951+
</doc-item>
75952+
<doc-item name="D2D_MATRIX_3X2_F_INNER_0_INNER_1">
75953+
<Items />
75954+
</doc-item>
75955+
<doc-item name="D2D_MATRIX_4X3_F_INNER_0">
75956+
<Items />
75957+
</doc-item>
75958+
<doc-item name="D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC_INNER_0">
75959+
<Items />
75960+
</doc-item>
75961+
<doc-item name="D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC_INNER_0">
75962+
<Items />
75963+
</doc-item>
75964+
<doc-item name="D2D_MATRIX_3X2_F_INNER_0">
75965+
<Items />
75966+
</doc-item>
75967+
<doc-item name="D2D_MATRIX_4X4_F_INNER_0">
75968+
<Items />
75969+
</doc-item>
75970+
<doc-item name="D3D11_VIDEO_COLOR_INNER_0">
75971+
<Items />
75972+
</doc-item>
75973+
<doc-item name="D3D11_UNORDERED_ACCESS_VIEW_DESC1_INNER_0">
75974+
<Items />
75975+
</doc-item>
75976+
<doc-item name="D2D_MATRIX_5X4_F_INNER_0">
75977+
<Items />
75978+
</doc-item>
75979+
<doc-item name="D2D_MATRIX_5X4_F_INNER_0_INNER_0">
75980+
<Items />
75981+
</doc-item>
75982+
<doc-item name="D2D_MATRIX_4X3_F_INNER_0_INNER_0">
75983+
<Items />
75984+
</doc-item>
75985+
<doc-item name="D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC_INNER_0">
75986+
<Items />
75987+
</doc-item>
75988+
<doc-item name="D3D11_BUFFER_RTV_INNER_1">
75989+
<Items />
75990+
</doc-item>
75991+
<doc-item name="D3D11_RENDER_TARGET_VIEW_DESC1_INNER_0">
75992+
<Items />
75993+
</doc-item>
75994+
<doc-item name="D3D11_BUFFER_SRV_INNER_1">
75995+
<Items />
75996+
</doc-item>
75997+
<doc-item name="D3D12_SHADER_RESOURCE_VIEW_DESC_INNER_0">
75998+
<Items />
75999+
</doc-item>
76000+
<doc-item name="RID_DEVICE_INFO_INNER_0">
76001+
<Items />
76002+
</doc-item>
76003+
<doc-item name="D3D11_RENDER_TARGET_VIEW_DESC_INNER_0">
76004+
<Items />
76005+
</doc-item>
76006+
<doc-item name="D3D12_VERSIONED_ROOT_SIGNATURE_DESC_INNER_0">
76007+
<Items />
76008+
</doc-item>
76009+
<doc-item name="D3D12_CLEAR_VALUE_INNER_0">
76010+
<Items />
76011+
</doc-item>
76012+
<doc-item name="D3D11_DEPTH_STENCIL_VIEW_DESC_INNER_0">
76013+
<Items />
76014+
</doc-item>
76015+
<doc-item name="D3D12_INDIRECT_ARGUMENT_DESC_INNER_0">
76016+
<Items />
76017+
</doc-item>
76018+
<doc-item name="MFTOPONODE_ATTRIBUTE_UPDATE_INNER_0">
76019+
<Items />
76020+
</doc-item>
76021+
<doc-item name="D2D_MATRIX_3X2_F_INNER_0_INNER_0">
76022+
<Items />
76023+
</doc-item>
76024+
<doc-item name="D3D11_SHADER_RESOURCE_VIEW_DESC_INNER_0">
76025+
<Items />
76026+
</doc-item>
76027+
<doc-item name="D3D12_TEXTURE_COPY_LOCATION_INNER_0">
76028+
<Items />
76029+
</doc-item>
76030+
<doc-item name="D3D11_BUFFER_RTV_INNER_0">
76031+
<Items />
76032+
</doc-item>
76033+
<doc-item name="D3D11_BUFFER_SRV_INNER_0">
76034+
<Items />
76035+
</doc-item>
76036+
<doc-item name="D3D12_ROOT_PARAMETER1_INNER_0">
76037+
<Items />
76038+
</doc-item>
76039+
<doc-item name="D3D12_RESOURCE_BARRIER_INNER_0">
76040+
<Items />
76041+
</doc-item>
7593176042
</DocItems>
7593276043
</documentation>

‎Source/Mapping.Direct3D1x.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
<map field="D3DX?(\d+)_PASS_DESC::BlendFactor" type="SHARPDX_COLOR4" pointer="" array="0" override-native-type="true" />
262262
<map field="D3DX?(\d+)_PASS_DESC::StencilRef" name="StencilReference" />
263263
<map field="D3DX?(\d+)_PASS_SHADER_DESC::pShaderVariable" visibility="internal" />
264-
<map field="D3DX?(\d+)_PASS_SHADER_DESC::pShaderVariable" name="VariablePointer" />
264+
<map field="D3DX?(\d+)_PASS_SHADER_DESC::pShaderVariable" name="VariablePointer" type="void" />
265265
<map field="D3DX?(\d+)_PASS_SHADER_DESC::ShaderIndex" name="Index" />
266266
<map field="D3DX?(\d+)_EFFECT_SHADER_DESC::pInputSignature" visibility="internal" name="InputSignaturePointer" />
267267
<map field="D3DX?(\d+)_EFFECT_SHADER_DESC::pBytecode" visibility="internal" name="BytecodePointer" />
@@ -338,8 +338,8 @@
338338
<map method="ID3D(\d+)DeviceContext::SetVertexBuffers" visibility="internal" />
339339
<map method="ID3D(\d+)DeviceContext::SetTargets" visibility="internal" />
340340
<map method="ID3D(\d+)DeviceContext::SetRenderTargetsAndUnorderedAccessViews" visibility="internal" />
341-
<map param="ID3D(\d+)DeviceContext::ClearRenderTargetView::ColorRGBA" type="SHARPDX_COLOR4" pointer="*" array="0" />
342-
<map param="ID3D(\d+)DeviceContext1::ClearView::Color" type="SHARPDX_COLOR4" pointer="*" array="0"/>
341+
<map param="ID3D(\d+)DeviceContext::ClearRenderTargetView::ColorRGBA" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0" />
342+
<map param="ID3D(\d+)DeviceContext1::ClearView::Color" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0"/>
343343
<map method="ID3D\d+DeviceContext::IA(.*)" name="$1" />
344344
<map method="ID3D\d+DeviceContext::VS(.*)" name="$1" />
345345
<map method="ID3D\d+DeviceContext::PS(.*)" name="$1" />
@@ -390,8 +390,8 @@
390390
<map param="ID3D(\d+)DeviceContext::RSGetViewports::pViewports" type="void" />
391391
<map method="ID3D(\d+)DeviceContext::RSSetViewports" visibility="internal" />
392392
<map param="ID3D(\d+)DeviceContext::RSSetViewports::pViewports" type="void" />
393-
<map param="ID3D(\d+)DeviceContext::OMGetBlendState::BlendFactor" type="SHARPDX_COLOR4" pointer="*" array="0" />
394-
<map param="ID3D(\d+)DeviceContext::OMSetBlendState::BlendFactor" type="SHARPDX_COLOR4" pointer="*" array="0" default="null"/>
393+
<map param="ID3D(\d+)DeviceContext::OMGetBlendState::BlendFactor" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0" />
394+
<map param="ID3D(\d+)DeviceContext::OMSetBlendState::BlendFactor" type="SHARPDX_COLOR4" override-native-type="true" pointer="*" array="0" default="null"/>
395395
<map param="ID3D(\d+)DeviceContext::OMSetBlendState::SampleMask" default="-1"/>
396396
<map param="ID3D(\d+)DeviceContext::OMSetDepthStencilState::StencilRef" default="0"/>
397397
<map param="ID3D(\d+)DeviceContext::[A-Z][A-Z]GetShader::pNumClassInstances" attribute="inout" />
@@ -407,8 +407,8 @@
407407
<map method="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewFloat" name="ClearUnorderedAccessView" />
408408
<map method="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewUint" name="ClearUnorderedAccessView" />
409409

410-
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewFloat::Values" type="SHARPDX_VECTOR4" />
411-
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewUint::Values" type="SHARPDX_INT4" />
410+
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewFloat::Values" type="SHARPDX_VECTOR4" override-native-type="true" pointer="*" array="0" />
411+
<map param="ID3D(\d+)DeviceContext::ClearUnorderedAccessViewUint::Values" type="SHARPDX_INT4" override-native-type="true" pointer="*" array="0" />
412412

413413
<map param="ID3D(\d+)DeviceContext::ClearDepthStencilView::ClearFlags" type="D3D11_CLEAR_FLAG" />
414414
<remove interface="ID3DX(\d+)ThreadPump" />
@@ -445,14 +445,14 @@
445445
<map method="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTranspose" visibility="internal" />
446446
<map method="ID3DX?(\d+)EffectMatrixVariable::SetMatrix" visibility="public" />
447447
<map method="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTranspose" visibility="public" />
448-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrix::pData" type="SHARPDX_MATRIX" attribute="in" />
449-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTranspose::pData" type="SHARPDX_MATRIX" attribute="in" />
450-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixArray::pData" type="SHARPDX_MATRIX" attribute="in buffer" />
451-
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" attribute="in buffer" />
452-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrix::pData" type="SHARPDX_MATRIX" attribute="out" />
453-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixArray::pData" type="SHARPDX_MATRIX" attribute="out buffer" />
454-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTranspose::pData" type="SHARPDX_MATRIX" attribute="out"/>
455-
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" attribute="out buffer" />
448+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrix::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in" />
449+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTranspose::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in" />
450+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in buffer" />
451+
<map param="ID3DX?(\d+)EffectMatrixVariable::SetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="in buffer" />
452+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrix::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out" />
453+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out buffer" />
454+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTranspose::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out"/>
455+
<map param="ID3DX?(\d+)EffectMatrixVariable::GetMatrixTransposeArray::pData" type="SHARPDX_MATRIX" override-native-type="true" attribute="out buffer" />
456456

457457
<map param="ID3DX?(\d+)EffectPass::GetDesc::pDesc" attribute="out" />
458458
<map param="ID3DX?(\d+)EffectPass::GetVertexShaderDesc::pDesc" attribute="out" />
@@ -504,18 +504,18 @@
504504
<map method="ID3DX?(\d+)EffectVectorVariable::SetIntVector" visibility="public" />
505505
<map method="ID3DX?(\d+)EffectVectorVariable::SetFloatVector" visibility="public" />
506506
<map method="ID3DX?(\d+)EffectVectorVariable::SetBoolVector" visibility="public" />
507-
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVector::pData" type="SHARPDX_INT4" attribute="out" />
508-
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVector::pData" type="SHARPDX_VECTOR4" attribute="out" />
509-
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVectorArray::pData" type="SHARPDX_INT4" attribute="out buffer" />
510-
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVectorArray::pData" type="SHARPDX_VECTOR4" attribute="out buffer" />
511-
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVectorArray::pData" type="SHARPDX_INT4" attribute="in buffer" />
512-
<map param="ID3DX?(\d+)EffectVectorVariable::SetFloatVectorArray::pData" type="SHARPDX_VECTOR4" attribute="in buffer" />
513-
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVector::pData" type="SHARPDX_INT4" attribute="in" />
507+
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVector::pData" type="SHARPDX_INT4" override-native-type="true" attribute="out" />
508+
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVector::pData" type="SHARPDX_VECTOR4" override-native-type="true" attribute="out" />
509+
<map param="ID3DX?(\d+)EffectVectorVariable::GetIntVectorArray::pData" type="SHARPDX_INT4" override-native-type="true" attribute="out buffer" />
510+
<map param="ID3DX?(\d+)EffectVectorVariable::GetFloatVectorArray::pData" type="SHARPDX_VECTOR4" override-native-type="true" attribute="out buffer" />
511+
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVectorArray::pData" type="SHARPDX_INT4" override-native-type="true" attribute="in buffer" />
512+
<map param="ID3DX?(\d+)EffectVectorVariable::SetFloatVectorArray::pData" type="SHARPDX_VECTOR4" override-native-type="true" attribute="in buffer" />
513+
<map param="ID3DX?(\d+)EffectVectorVariable::SetIntVector::pData" type="SHARPDX_INT4" override-native-type="true" attribute="in" />
514514
<map method="ID3DX?(\d+)EffectVectorVariable::Set.*" name="Set" />
515-
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVector::pData" type="SHARPDX_BOOL4" attribute="out" />
516-
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVectorArray::pData" type="SHARPDX_BOOL4" attribute="out buffer" />
517-
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVector::pData" type="SHARPDX_BOOL4" attribute="in" />
518-
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVectorArray::pData" type="SHARPDX_BOOL4" attribute="in buffer" />
515+
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVector::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="out" />
516+
<map param="ID3DX?(\d+)EffectVectorVariable::GetBoolVectorArray::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="out buffer" />
517+
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVector::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="in" />
518+
<map param="ID3DX?(\d+)EffectVectorVariable::SetBoolVectorArray::pData" type="SHARPDX_BOOL4" override-native-type="true" attribute="in buffer" />
519519

520520
<map param="ID3DX?(\d+)EffectTechnique::GetDesc::pDesc" attribute="out" />
521521
<map param="ID3DX?(\d+)Effect::GetDevice::ppDevice" attribute="out" />

‎Source/Mapping.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,12 @@
508508
</extension>
509509

510510
<bindings>
511-
<!-- Primitive bindings -->
511+
<!-- Primitive bindings -->
512512
<bind from="void" to="System.Void" />
513513
<bind from="int" to="System.Int32" />
514514
<bind from="unsigned int" to="System.Int32" />
515+
<bind from="long" to="System.Int32" />
516+
<bind from="unsigned long" to="System.Int32" />
515517
<bind from="short" to="System.Int16" />
516518
<bind from="unsigned short" to="System.Int16" />
517519
<bind from="unsigned char" to="System.Byte" />

‎Source/SharpDX.Animation/SharpDX.Animation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1</TargetFrameworks>

‎Source/SharpDX.Animation/Storyboard.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Storyboard(Manager manager)
3939
/// <unmanaged>HRESULT IUIAnimationStoryboard::RepeatBetweenKeyframes([In] __MIDL___MIDL_itf_UIAnimation_0000_0002_0003* startKeyframe,[In] __MIDL___MIDL_itf_UIAnimation_0000_0002_0003* endKeyframe,[In] int repetitionCount)</unmanaged>
4040
public void RepeatBetweenKeyframes(SharpDX.Animation.KeyFrame startKeyframe, SharpDX.Animation.KeyFrame endKeyframe, RepeatCount repetitionCount)
4141
{
42-
RepeatBetweenKeyframes(ref startKeyframe, ref endKeyframe, (int)repetitionCount);
42+
RepeatBetweenKeyframes(startKeyframe, endKeyframe, (int)repetitionCount);
4343
}
4444

4545
/// <summary>

‎Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -19,6 +19,4 @@
1919
<ItemGroup>
2020
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
2121
</ItemGroup>
22-
23-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2422
</Project>

‎Source/SharpDX.DXGI/SharpDX.DXGI.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -20,6 +20,4 @@
2020
<ItemGroup>
2121
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
2222
</ItemGroup>
23-
24-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2523
</Project>

‎Source/SharpDX.Desktop/SharpDX.Desktop.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45</TargetFrameworks>

‎Source/SharpDX.Direct2D1/BitmapProperties1.cs‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,5 @@ public BitmapProperties1(PixelFormat pixelFormat, float dpiX, float dpiY, Bitmap
7777
BitmapOptions = bitmapOptions;
7878
ColorContext = colorContext;
7979
}
80-
81-
/// <summary>
82-
/// Gets or sets the color context.
83-
/// </summary>
84-
/// <value>
85-
/// The color context.
86-
/// </value>
87-
public ColorContext ColorContext
88-
{
89-
get
90-
{
91-
return colorContext;
92-
}
93-
set
94-
{
95-
colorContext = value;
96-
ColorContextPointer = colorContext == null ? IntPtr.Zero : colorContext.NativePointer;
97-
}
98-
}
9980
}
10081
}

0 commit comments

Comments
 (0)