From 22dc77a82389cacaf73f2f2cdf8852451684fbb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Juan=20Rico=20Mendoza?= Date: Sat, 11 Aug 2018 16:20:21 -0300 Subject: [PATCH 1/2] Update Desktop projects to use nuget dependencies --- Desktop/Common/SharpDX.Samples.csproj | 35 +++++++------- Desktop/Common/packages.config | 10 ++++ .../AdvancedTextRenderingApp.csproj | 38 ++++++++------- .../AdvancedTextRenderingApp/app.config | 3 ++ .../AdvancedTextRenderingApp/packages.config | 10 ++++ Desktop/Direct2D1/BitmapApp/BitmapApp.csproj | 28 ++++++----- Desktop/Direct2D1/BitmapApp/app.config | 3 ++ Desktop/Direct2D1/BitmapApp/packages.config | 8 ++++ Desktop/Direct2D1/MiniRect/MiniRect.csproj | 38 +++++++-------- Desktop/Direct2D1/MiniRect/app.config | 3 ++ Desktop/Direct2D1/MiniRect/packages.config | 9 ++++ .../OfflineImageProcessingApp/App.config | 7 +-- .../OfflineImageProcessingApp.csproj | 35 ++++++++------ .../OfflineImageProcessingApp/Program.cs | 3 +- .../OfflineImageProcessingApp/packages.config | 9 ++++ .../RenderToWicApp/RenderToWicApp.csproj | 27 ++++++----- Desktop/Direct2D1/RenderToWicApp/app.config | 3 ++ .../Direct2D1/RenderToWicApp/packages.config | 7 +++ .../TessellateApp/TessellateApp.csproj | 34 ++++++++------ Desktop/Direct2D1/TessellateApp/app.config | 3 ++ .../Direct2D1/TessellateApp/packages.config | 9 ++++ Desktop/Direct2D1/TextRenderingApp/Program.cs | 4 +- .../TextRenderingApp/TextRenderingApp.csproj | 34 ++++++++------ Desktop/Direct2D1/TextRenderingApp/app.config | 3 ++ .../TextRenderingApp/packages.config | 9 ++++ .../ScreenCapture/ScreenCapture.csproj | 35 +++++++------- Desktop/Direct3D11.1/ScreenCapture/app.config | 3 ++ .../ScreenCapture/packages.config | 9 ++++ Desktop/Direct3D11/MiniCube/MiniCube.csproj | 38 +++++++-------- Desktop/Direct3D11/MiniCube/app.config | 3 ++ Desktop/Direct3D11/MiniCube/packages.config | 9 ++++ Desktop/Direct3D11/MiniTri/MiniTri.csproj | 35 +++++++------- Desktop/Direct3D11/MiniTri/app.config | 3 ++ Desktop/Direct3D11/MiniTri/packages.config | 9 ++++ .../MiniTriEffects11/MiniTriEffects11.csproj | 47 +++++++++---------- .../Direct3D11/MiniTriEffects11/app.config | 3 ++ .../MiniTriEffects11/packages.config | 10 ++++ Desktop/Direct3D11/MultiCube/MultiCube.csproj | 35 +++++++------- Desktop/Direct3D11/MultiCube/app.config | 3 ++ Desktop/Direct3D11/MultiCube/packages.config | 9 ++++ Desktop/Direct3D12/HelloBundles/App.config | 7 +-- .../HelloBundles/HelloBundles.csproj | 30 ++++++------ .../Direct3D12/HelloBundles/packages.config | 9 ++++ .../Direct3D12/HelloConstBuffers/App.config | 6 +-- .../HelloConstBuffers.csproj | 30 ++++++------ .../HelloConstBuffers/packages.config | 9 ++++ Desktop/Direct3D12/HelloTexture/App.config | 7 +-- .../HelloTexture/HelloTexture.csproj | 30 ++++++------ .../Direct3D12/HelloTexture/packages.config | 9 ++++ Desktop/Direct3D12/HelloTriangle/App.config | 6 +-- .../HelloTriangle/HelloTriangle.csproj | 36 +++++++------- .../Direct3D12/HelloTriangle/packages.config | 9 ++++ Desktop/Direct3D12/HelloWindow/App.config | 6 +-- .../Direct3D12/HelloWindow/HelloWindow.csproj | 36 +++++++------- .../Direct3D12/HelloWindow/packages.config | 9 ++++ .../Direct3D12/HelloWorld/HelloWorld.csproj | 39 ++++++++------- Desktop/Direct3D12/HelloWorld/app.config | 3 ++ Desktop/Direct3D12/HelloWorld/packages.config | 9 ++++ .../DisplayFontApp/DisplayFontApp.csproj | 27 ++++++----- Desktop/Direct3D9/DisplayFontApp/app.config | 3 ++ .../Direct3D9/DisplayFontApp/packages.config | 7 +++ Desktop/Direct3D9/MiniCube/MiniCube.csproj | 27 ++++++----- Desktop/Direct3D9/MiniCube/app.config | 3 ++ Desktop/Direct3D9/MiniCube/packages.config | 7 +++ Desktop/Direct3D9/MiniTri/MiniTri.csproj | 27 ++++++----- Desktop/Direct3D9/MiniTri/app.config | 3 ++ Desktop/Direct3D9/MiniTri/packages.config | 7 +++ .../MinMaxGPUApp/MinMaxGPUApp.csproj | 35 +++++++------- Desktop/DirectCompute/MinMaxGPUApp/app.config | 3 ++ .../MinMaxGPUApp/packages.config | 9 ++++ .../JoystickApp/JoystickApp.csproj | 19 ++++---- Desktop/DirectInput/JoystickApp/app.config | 3 ++ .../DirectInput/JoystickApp/packages.config | 5 ++ .../DirectSound/PlaySound/PlaySound.csproj | 19 ++++---- Desktop/DirectSound/PlaySound/app.config | 3 ++ Desktop/DirectSound/PlaySound/packages.config | 5 ++ .../ColorDrawingEffect.csproj | 28 ++++++----- .../ColorDrawingEffectForm.cs | 8 ++-- .../DirectWrite/ColorDrawingEffect/app.config | 3 ++ .../ColorDrawingEffect/packages.config | 8 ++++ Desktop/DirectWrite/CustomFont/CustomFont.cs | 8 ++-- .../DirectWrite/CustomFont/CustomFont.csproj | 32 +++++++------ Desktop/DirectWrite/CustomFont/app.config | 3 ++ .../DirectWrite/CustomFont/packages.config | 8 ++++ .../CustomLayout/CustomLayout.csproj | 33 ++++++------- .../CustomLayout/CustomLayoutForm.cs | 2 +- Desktop/DirectWrite/CustomLayout/app.config | 3 ++ .../DirectWrite/CustomLayout/packages.config | 8 ++++ .../FontEnumeration/FontEnumeration.csproj | 24 +++++----- .../DirectWrite/FontEnumeration/app.config | 3 ++ .../FontEnumeration/packages.config | 6 +++ .../DirectWrite/SimpleHelloWorld/Program.cs | 4 +- .../SimpleHelloWorld/SimpleHelloWorld.csproj | 31 ++++++------ .../DirectWrite/SimpleHelloWorld/app.config | 3 ++ .../SimpleHelloWorld/packages.config | 8 ++++ Desktop/DirectWrite/TextDialog/TextDialog.cs | 10 ++-- .../DirectWrite/TextDialog/TextDialog.csproj | 32 +++++++------ Desktop/DirectWrite/TextDialog/app.config | 3 ++ .../DirectWrite/TextDialog/packages.config | 8 ++++ .../MediaEngineApp/MediaEngineApp.csproj | 26 +++++++--- .../MediaFoundation/MediaEngineApp/Program.cs | 2 +- .../MediaFoundation/MediaEngineApp/app.config | 3 ++ .../MediaEngineApp/packages.config | 8 ++++ .../MediaEngineAppVideo.csproj | 37 +++++++++------ .../MediaEngineAppVideo/app.config | 3 ++ .../MediaEngineAppVideo/packages.config | 10 ++++ .../RawInputTrackApp/RawInputTrackApp.csproj | 19 ++++---- Desktop/RawInput/RawInputTrackApp/app.config | 3 ++ .../RawInput/RawInputTrackApp/packages.config | 5 ++ Desktop/WIC/EncodeDecode/EncodeDecode.csproj | 24 +++++----- Desktop/WIC/EncodeDecode/app.config | 3 ++ Desktop/WIC/EncodeDecode/packages.config | 6 +++ .../X3DAudio/BipBounceApp/BipBounceApp.csproj | 21 +++++---- Desktop/X3DAudio/BipBounceApp/app.config | 3 ++ Desktop/X3DAudio/BipBounceApp/packages.config | 6 +++ .../AudioPlayerApp/AudioPlayerApp.csproj | 28 +++++++---- Desktop/XAudio2/AudioPlayerApp/app.config | 3 ++ .../XAudio2/AudioPlayerApp/packages.config | 9 ++++ .../PlayDynamicSound/PlayDynamicSound.csproj | 19 ++++---- Desktop/XAudio2/PlayDynamicSound/app.config | 3 ++ .../XAudio2/PlayDynamicSound/packages.config | 5 ++ Desktop/XAudio2/PlaySound/PlaySound.csproj | 20 ++++---- Desktop/XAudio2/PlaySound/app.config | 3 ++ Desktop/XAudio2/PlaySound/packages.config | 5 ++ .../PlaySoundCustomXAPO.csproj | 19 ++++---- .../XAudio2/PlaySoundCustomXAPO/app.config | 3 ++ .../PlaySoundCustomXAPO/packages.config | 5 ++ Desktop/XInput/XGamepadApp/XGamepadApp.csproj | 19 ++++---- Desktop/XInput/XGamepadApp/app.config | 3 ++ Desktop/XInput/XGamepadApp/packages.config | 5 ++ 130 files changed, 1137 insertions(+), 592 deletions(-) create mode 100644 Desktop/Common/packages.config create mode 100644 Desktop/Direct2D1/AdvancedTextRenderingApp/app.config create mode 100644 Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config create mode 100644 Desktop/Direct2D1/BitmapApp/app.config create mode 100644 Desktop/Direct2D1/BitmapApp/packages.config create mode 100644 Desktop/Direct2D1/MiniRect/app.config create mode 100644 Desktop/Direct2D1/MiniRect/packages.config create mode 100644 Desktop/Direct2D1/OfflineImageProcessingApp/packages.config create mode 100644 Desktop/Direct2D1/RenderToWicApp/app.config create mode 100644 Desktop/Direct2D1/RenderToWicApp/packages.config create mode 100644 Desktop/Direct2D1/TessellateApp/app.config create mode 100644 Desktop/Direct2D1/TessellateApp/packages.config create mode 100644 Desktop/Direct2D1/TextRenderingApp/app.config create mode 100644 Desktop/Direct2D1/TextRenderingApp/packages.config create mode 100644 Desktop/Direct3D11.1/ScreenCapture/app.config create mode 100644 Desktop/Direct3D11.1/ScreenCapture/packages.config create mode 100644 Desktop/Direct3D11/MiniCube/app.config create mode 100644 Desktop/Direct3D11/MiniCube/packages.config create mode 100644 Desktop/Direct3D11/MiniTri/app.config create mode 100644 Desktop/Direct3D11/MiniTri/packages.config create mode 100644 Desktop/Direct3D11/MiniTriEffects11/app.config create mode 100644 Desktop/Direct3D11/MiniTriEffects11/packages.config create mode 100644 Desktop/Direct3D11/MultiCube/app.config create mode 100644 Desktop/Direct3D11/MultiCube/packages.config create mode 100644 Desktop/Direct3D12/HelloBundles/packages.config create mode 100644 Desktop/Direct3D12/HelloConstBuffers/packages.config create mode 100644 Desktop/Direct3D12/HelloTexture/packages.config create mode 100644 Desktop/Direct3D12/HelloTriangle/packages.config create mode 100644 Desktop/Direct3D12/HelloWindow/packages.config create mode 100644 Desktop/Direct3D12/HelloWorld/app.config create mode 100644 Desktop/Direct3D12/HelloWorld/packages.config create mode 100644 Desktop/Direct3D9/DisplayFontApp/app.config create mode 100644 Desktop/Direct3D9/DisplayFontApp/packages.config create mode 100644 Desktop/Direct3D9/MiniCube/app.config create mode 100644 Desktop/Direct3D9/MiniCube/packages.config create mode 100644 Desktop/Direct3D9/MiniTri/app.config create mode 100644 Desktop/Direct3D9/MiniTri/packages.config create mode 100644 Desktop/DirectCompute/MinMaxGPUApp/app.config create mode 100644 Desktop/DirectCompute/MinMaxGPUApp/packages.config create mode 100644 Desktop/DirectInput/JoystickApp/app.config create mode 100644 Desktop/DirectInput/JoystickApp/packages.config create mode 100644 Desktop/DirectSound/PlaySound/app.config create mode 100644 Desktop/DirectSound/PlaySound/packages.config create mode 100644 Desktop/DirectWrite/ColorDrawingEffect/app.config create mode 100644 Desktop/DirectWrite/ColorDrawingEffect/packages.config create mode 100644 Desktop/DirectWrite/CustomFont/app.config create mode 100644 Desktop/DirectWrite/CustomFont/packages.config create mode 100644 Desktop/DirectWrite/CustomLayout/app.config create mode 100644 Desktop/DirectWrite/CustomLayout/packages.config create mode 100644 Desktop/DirectWrite/FontEnumeration/app.config create mode 100644 Desktop/DirectWrite/FontEnumeration/packages.config create mode 100644 Desktop/DirectWrite/SimpleHelloWorld/app.config create mode 100644 Desktop/DirectWrite/SimpleHelloWorld/packages.config create mode 100644 Desktop/DirectWrite/TextDialog/app.config create mode 100644 Desktop/DirectWrite/TextDialog/packages.config create mode 100644 Desktop/MediaFoundation/MediaEngineApp/app.config create mode 100644 Desktop/MediaFoundation/MediaEngineApp/packages.config create mode 100644 Desktop/MediaFoundation/MediaEngineAppVideo/app.config create mode 100644 Desktop/MediaFoundation/MediaEngineAppVideo/packages.config create mode 100644 Desktop/RawInput/RawInputTrackApp/app.config create mode 100644 Desktop/RawInput/RawInputTrackApp/packages.config create mode 100644 Desktop/WIC/EncodeDecode/app.config create mode 100644 Desktop/WIC/EncodeDecode/packages.config create mode 100644 Desktop/X3DAudio/BipBounceApp/app.config create mode 100644 Desktop/X3DAudio/BipBounceApp/packages.config create mode 100644 Desktop/XAudio2/AudioPlayerApp/app.config create mode 100644 Desktop/XAudio2/AudioPlayerApp/packages.config create mode 100644 Desktop/XAudio2/PlayDynamicSound/app.config create mode 100644 Desktop/XAudio2/PlayDynamicSound/packages.config create mode 100644 Desktop/XAudio2/PlaySound/app.config create mode 100644 Desktop/XAudio2/PlaySound/packages.config create mode 100644 Desktop/XAudio2/PlaySoundCustomXAPO/app.config create mode 100644 Desktop/XAudio2/PlaySoundCustomXAPO/packages.config create mode 100644 Desktop/XInput/XGamepadApp/app.config create mode 100644 Desktop/XInput/XGamepadApp/packages.config diff --git a/Desktop/Common/SharpDX.Samples.csproj b/Desktop/Common/SharpDX.Samples.csproj index 14be9dbb..ef4e712a 100644 --- a/Desktop/Common/SharpDX.Samples.csproj +++ b/Desktop/Common/SharpDX.Samples.csproj @@ -10,7 +10,7 @@ Properties SharpDX.Samples SharpDX.Samples - v4.5.1 + v4.6.1 512 ..\ @@ -34,26 +34,26 @@ 4 - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -70,6 +70,9 @@ + + + - \ No newline at end of file + diff --git a/Desktop/Common/packages.config b/Desktop/Common/packages.config new file mode 100644 index 00000000..386a86d5 --- /dev/null +++ b/Desktop/Common/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj b/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj index 2cf7bed9..7160575a 100644 --- a/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj +++ b/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj @@ -10,10 +10,9 @@ Properties AdvancedTextRenderingApp AdvancedTextRenderingApp - v4.5.1 - - + v4.6.1 512 + true @@ -34,23 +33,26 @@ true - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D10.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.Direct3D10.4.1.0\lib\net45\SharpDX.Direct3D10.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -62,6 +64,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config b/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config b/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config new file mode 100644 index 00000000..5f63e29e --- /dev/null +++ b/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj b/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj index 4c302086..4cfff8d4 100644 --- a/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj +++ b/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj @@ -10,7 +10,7 @@ Properties BitmapApp BitmapApp - v4.5.1 + v4.6.1 512 @@ -33,20 +33,20 @@ false - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -70,6 +70,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/BitmapApp/app.config b/Desktop/Direct2D1/BitmapApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct2D1/BitmapApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct2D1/BitmapApp/packages.config b/Desktop/Direct2D1/BitmapApp/packages.config new file mode 100644 index 00000000..4ee488be --- /dev/null +++ b/Desktop/Direct2D1/BitmapApp/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/MiniRect/MiniRect.csproj b/Desktop/Direct2D1/MiniRect/MiniRect.csproj index 129671f2..5112029d 100644 --- a/Desktop/Direct2D1/MiniRect/MiniRect.csproj +++ b/Desktop/Direct2D1/MiniRect/MiniRect.csproj @@ -10,10 +10,9 @@ Properties MiniRect MiniRect - v4.5.1 - - + v4.6.1 512 + true @@ -33,26 +32,23 @@ prompt - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -64,6 +60,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/MiniRect/app.config b/Desktop/Direct2D1/MiniRect/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct2D1/MiniRect/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct2D1/MiniRect/packages.config b/Desktop/Direct2D1/MiniRect/packages.config new file mode 100644 index 00000000..ff0d4cac --- /dev/null +++ b/Desktop/Direct2D1/MiniRect/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/App.config b/Desktop/Direct2D1/OfflineImageProcessingApp/App.config index 8e156463..3dbff35f 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/App.config +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/App.config @@ -1,6 +1,3 @@ - + - - - - \ No newline at end of file + diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj b/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj index b43e4792..ffaf6461 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,8 +9,9 @@ Properties OfflineImageProcessingApp OfflineImageProcessingApp - v4.5 + v4.6.1 512 + AnyCPU @@ -32,23 +33,23 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -63,6 +64,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs b/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs index 993d9412..07ab7fca 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs @@ -147,7 +147,8 @@ static void Main() // this is the trick to write D2D1 bitmap to WIC var imageEncoder = new wic.ImageEncoder(imagingFactory, d2dDevice); - imageEncoder.WriteFrame(d2dRenderTarget, bitmapFrameEncode, new wic.ImageParameters(d2PixelFormat, 96, 96, 0, 0, pixelWidth, pixelHeight)); + var imageParametersRef = new wic.ImageParameters(d2PixelFormat, 96, 96, 0, 0, pixelWidth, pixelHeight); + imageEncoder.WriteFrame(d2dRenderTarget, bitmapFrameEncode, ref imageParametersRef); bitmapFrameEncode.Commit(); encoder.Commit(); diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config b/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config new file mode 100644 index 00000000..0c880afe --- /dev/null +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj b/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj index 242456ac..a833ab93 100644 --- a/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj +++ b/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj @@ -10,10 +10,9 @@ Properties RenderToWicApp RenderToWicApp - v4.5.1 - - + v4.6.1 512 + true @@ -33,17 +32,17 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -55,6 +54,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/RenderToWicApp/app.config b/Desktop/Direct2D1/RenderToWicApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct2D1/RenderToWicApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct2D1/RenderToWicApp/packages.config b/Desktop/Direct2D1/RenderToWicApp/packages.config new file mode 100644 index 00000000..742eb226 --- /dev/null +++ b/Desktop/Direct2D1/RenderToWicApp/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj b/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj index d9837835..93b42a88 100644 --- a/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj +++ b/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj @@ -10,10 +10,9 @@ Properties TessellateApp TessellateApp - v4.5.1 - - + v4.6.1 512 + true @@ -32,20 +31,23 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D10.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.Direct3D10.4.1.0\lib\net45\SharpDX.Direct3D10.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -63,6 +65,10 @@ SharpDX.Samples + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/TessellateApp/app.config b/Desktop/Direct2D1/TessellateApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct2D1/TessellateApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct2D1/TessellateApp/packages.config b/Desktop/Direct2D1/TessellateApp/packages.config new file mode 100644 index 00000000..73893ffd --- /dev/null +++ b/Desktop/Direct2D1/TessellateApp/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/TextRenderingApp/Program.cs b/Desktop/Direct2D1/TextRenderingApp/Program.cs index a17a7908..5ba5c392 100644 --- a/Desktop/Direct2D1/TextRenderingApp/Program.cs +++ b/Desktop/Direct2D1/TextRenderingApp/Program.cs @@ -36,7 +36,9 @@ protected override void Initialize(DemoConfiguration demoConfiguration) base.Initialize(demoConfiguration); // Initialize a TextFormat - TextFormat = new TextFormat(FactoryDWrite, "Calibri", 128) {TextAlignment = TextAlignment.Center, ParagraphAlignment = ParagraphAlignment.Center}; + TextFormat = new TextFormat(FactoryDWrite, "Calibri", 128); + TextFormat.SetTextAlignment(TextAlignment.Center); + TextFormat.SetParagraphAlignment(ParagraphAlignment.Center); RenderTarget2D.TextAntialiasMode = TextAntialiasMode.Cleartype; diff --git a/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj b/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj index c2e26833..f826baad 100644 --- a/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj +++ b/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj @@ -10,10 +10,9 @@ Properties TextRenderingApp TextRenderingApp - v4.5.1 - - + v4.6.1 512 + true @@ -34,20 +33,23 @@ true - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D10.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.Direct3D10.4.1.0\lib\net45\SharpDX.Direct3D10.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -65,6 +67,10 @@ SharpDX.Samples + + + + - \ No newline at end of file + diff --git a/Desktop/Direct2D1/TextRenderingApp/app.config b/Desktop/Direct2D1/TextRenderingApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct2D1/TextRenderingApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct2D1/TextRenderingApp/packages.config b/Desktop/Direct2D1/TextRenderingApp/packages.config new file mode 100644 index 00000000..73893ffd --- /dev/null +++ b/Desktop/Direct2D1/TextRenderingApp/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj b/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj index b6880c20..b8cce9cb 100644 --- a/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj +++ b/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj @@ -10,10 +10,9 @@ Properties ScreenCapture ScreenCapture - v4.5.1 - - + v4.6.1 512 + true @@ -33,23 +32,23 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -60,6 +59,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D11.1/ScreenCapture/app.config b/Desktop/Direct3D11.1/ScreenCapture/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D11.1/ScreenCapture/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D11.1/ScreenCapture/packages.config b/Desktop/Direct3D11.1/ScreenCapture/packages.config new file mode 100644 index 00000000..f8e37644 --- /dev/null +++ b/Desktop/Direct3D11.1/ScreenCapture/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniCube/MiniCube.csproj b/Desktop/Direct3D11/MiniCube/MiniCube.csproj index eaf0c3eb..1364ace3 100644 --- a/Desktop/Direct3D11/MiniCube/MiniCube.csproj +++ b/Desktop/Direct3D11/MiniCube/MiniCube.csproj @@ -10,10 +10,9 @@ Properties MiniTri MiniTri - v4.5.1 - - + v4.6.1 512 + true @@ -33,23 +32,23 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -64,9 +63,10 @@ PreserveNewest - - PreserveNewest - + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D11/MiniCube/app.config b/Desktop/Direct3D11/MiniCube/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D11/MiniCube/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D11/MiniCube/packages.config b/Desktop/Direct3D11/MiniCube/packages.config new file mode 100644 index 00000000..f8e37644 --- /dev/null +++ b/Desktop/Direct3D11/MiniCube/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniTri/MiniTri.csproj b/Desktop/Direct3D11/MiniTri/MiniTri.csproj index 924b4b70..f81ad73d 100644 --- a/Desktop/Direct3D11/MiniTri/MiniTri.csproj +++ b/Desktop/Direct3D11/MiniTri/MiniTri.csproj @@ -10,10 +10,9 @@ Properties MiniTri MiniTri - v4.5.1 - - + v4.6.1 512 + true @@ -33,23 +32,23 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -63,6 +62,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D11/MiniTri/app.config b/Desktop/Direct3D11/MiniTri/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D11/MiniTri/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D11/MiniTri/packages.config b/Desktop/Direct3D11/MiniTri/packages.config new file mode 100644 index 00000000..f8e37644 --- /dev/null +++ b/Desktop/Direct3D11/MiniTri/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj b/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj index a7f0bf96..cca687ad 100644 --- a/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj +++ b/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj @@ -10,10 +10,9 @@ Properties MiniTriEffects11 MiniTriEffects11 - v4.5.1 - - + v4.6.1 512 + true @@ -55,26 +54,26 @@ false - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.Effects.dll + + ..\..\..\packages\SharpDX.Direct3D11.Effects.4.1.0\lib\net45\SharpDX.Direct3D11.Effects.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -87,18 +86,14 @@ - - sharpdx_direct3d11_1_effects_x64.dll - PreserveNewest - - - sharpdx_direct3d11_1_effects_x86.dll - PreserveNewest - PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D11/MiniTriEffects11/app.config b/Desktop/Direct3D11/MiniTriEffects11/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D11/MiniTriEffects11/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D11/MiniTriEffects11/packages.config b/Desktop/Direct3D11/MiniTriEffects11/packages.config new file mode 100644 index 00000000..7a7ad04b --- /dev/null +++ b/Desktop/Direct3D11/MiniTriEffects11/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MultiCube/MultiCube.csproj b/Desktop/Direct3D11/MultiCube/MultiCube.csproj index d451eb81..2784de05 100644 --- a/Desktop/Direct3D11/MultiCube/MultiCube.csproj +++ b/Desktop/Direct3D11/MultiCube/MultiCube.csproj @@ -10,10 +10,9 @@ Properties MultiCube MultiCube - v4.5.1 - - + v4.6.1 512 + true @@ -33,23 +32,23 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -65,6 +64,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D11/MultiCube/app.config b/Desktop/Direct3D11/MultiCube/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D11/MultiCube/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D11/MultiCube/packages.config b/Desktop/Direct3D11/MultiCube/packages.config new file mode 100644 index 00000000..f8e37644 --- /dev/null +++ b/Desktop/Direct3D11/MultiCube/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloBundles/App.config b/Desktop/Direct3D12/HelloBundles/App.config index fad249e4..d4050983 100644 --- a/Desktop/Direct3D12/HelloBundles/App.config +++ b/Desktop/Direct3D12/HelloBundles/App.config @@ -1,6 +1,3 @@ - + - - - - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj b/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj index 77fa4aa0..92c5ebe7 100644 --- a/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj +++ b/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj @@ -9,8 +9,9 @@ Properties HelloBundles HelloBundles - v4.5 + v4.6.1 512 + AnyCPU @@ -32,23 +33,23 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -76,6 +77,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -102,4 +104,4 @@ --> - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloBundles/packages.config b/Desktop/Direct3D12/HelloBundles/packages.config new file mode 100644 index 00000000..b9a01f4d --- /dev/null +++ b/Desktop/Direct3D12/HelloBundles/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloConstBuffers/App.config b/Desktop/Direct3D12/HelloConstBuffers/App.config index fad249e4..45437954 100644 --- a/Desktop/Direct3D12/HelloConstBuffers/App.config +++ b/Desktop/Direct3D12/HelloConstBuffers/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj b/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj index 09982043..0ec0b3d5 100644 --- a/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj +++ b/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj @@ -9,8 +9,9 @@ Properties HelloConstBuffers HelloConstBuffers - v4.5 + v4.6.1 512 + AnyCPU @@ -32,23 +33,23 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -76,6 +77,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -102,4 +104,4 @@ --> - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloConstBuffers/packages.config b/Desktop/Direct3D12/HelloConstBuffers/packages.config new file mode 100644 index 00000000..b9a01f4d --- /dev/null +++ b/Desktop/Direct3D12/HelloConstBuffers/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloTexture/App.config b/Desktop/Direct3D12/HelloTexture/App.config index fad249e4..d4050983 100644 --- a/Desktop/Direct3D12/HelloTexture/App.config +++ b/Desktop/Direct3D12/HelloTexture/App.config @@ -1,6 +1,3 @@ - + - - - - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj b/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj index 57c8e535..b93a71fc 100644 --- a/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj +++ b/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj @@ -9,8 +9,9 @@ Properties HelloTexture HelloTexture - v4.5 + v4.6.1 512 + AnyCPU @@ -33,23 +34,23 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -78,6 +79,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -104,4 +106,4 @@ --> - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloTexture/packages.config b/Desktop/Direct3D12/HelloTexture/packages.config new file mode 100644 index 00000000..b9a01f4d --- /dev/null +++ b/Desktop/Direct3D12/HelloTexture/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloTriangle/App.config b/Desktop/Direct3D12/HelloTriangle/App.config index fad249e4..45437954 100644 --- a/Desktop/Direct3D12/HelloTriangle/App.config +++ b/Desktop/Direct3D12/HelloTriangle/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj b/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj index 1d2c3ad1..5f03dfcd 100644 --- a/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj +++ b/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj @@ -9,8 +9,9 @@ Properties HelloTriangle HelloTriangle - v4.5 + v4.6.1 512 + AnyCPU @@ -33,29 +34,23 @@ 4 - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -83,6 +78,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -109,4 +105,4 @@ --> - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloTriangle/packages.config b/Desktop/Direct3D12/HelloTriangle/packages.config new file mode 100644 index 00000000..b9a01f4d --- /dev/null +++ b/Desktop/Direct3D12/HelloTriangle/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloWindow/App.config b/Desktop/Direct3D12/HelloWindow/App.config index fad249e4..45437954 100644 --- a/Desktop/Direct3D12/HelloWindow/App.config +++ b/Desktop/Direct3D12/HelloWindow/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj b/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj index 469428cb..7d1c83b2 100644 --- a/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj +++ b/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj @@ -9,8 +9,9 @@ Properties HelloWindow HelloWindow - v4.5 + v4.6.1 512 + AnyCPU @@ -33,29 +34,23 @@ 4 - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -83,6 +78,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs @@ -104,4 +100,4 @@ --> - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloWindow/packages.config b/Desktop/Direct3D12/HelloWindow/packages.config new file mode 100644 index 00000000..b9a01f4d --- /dev/null +++ b/Desktop/Direct3D12/HelloWindow/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj b/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj index 3f34e2d4..7e810515 100644 --- a/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj +++ b/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj @@ -9,8 +9,9 @@ Properties HelloWorld HelloWorld - v4.5 + v4.6.1 512 + x64 @@ -37,29 +38,23 @@ - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -72,6 +67,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D12/HelloWorld/app.config b/Desktop/Direct3D12/HelloWorld/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D12/HelloWorld/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D12/HelloWorld/packages.config b/Desktop/Direct3D12/HelloWorld/packages.config new file mode 100644 index 00000000..b9a01f4d --- /dev/null +++ b/Desktop/Direct3D12/HelloWorld/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj b/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj index 7cc6ece4..1daa9e16 100644 --- a/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj +++ b/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj @@ -10,10 +10,9 @@ Properties DisplayFontApp DisplayFontApp - v4.5.1 - - + v4.6.1 512 + true @@ -34,17 +33,17 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -55,6 +54,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D9/DisplayFontApp/app.config b/Desktop/Direct3D9/DisplayFontApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D9/DisplayFontApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D9/DisplayFontApp/packages.config b/Desktop/Direct3D9/DisplayFontApp/packages.config new file mode 100644 index 00000000..1c30479e --- /dev/null +++ b/Desktop/Direct3D9/DisplayFontApp/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D9/MiniCube/MiniCube.csproj b/Desktop/Direct3D9/MiniCube/MiniCube.csproj index 0e3c2795..ab5663d7 100644 --- a/Desktop/Direct3D9/MiniCube/MiniCube.csproj +++ b/Desktop/Direct3D9/MiniCube/MiniCube.csproj @@ -10,10 +10,9 @@ Properties MiniCube MiniCube - v4.5.1 - - + v4.6.1 512 + true @@ -35,17 +34,17 @@ false - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -61,6 +60,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D9/MiniCube/app.config b/Desktop/Direct3D9/MiniCube/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D9/MiniCube/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D9/MiniCube/packages.config b/Desktop/Direct3D9/MiniCube/packages.config new file mode 100644 index 00000000..1c30479e --- /dev/null +++ b/Desktop/Direct3D9/MiniCube/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D9/MiniTri/MiniTri.csproj b/Desktop/Direct3D9/MiniTri/MiniTri.csproj index 8ea5f75b..b6270a54 100644 --- a/Desktop/Direct3D9/MiniTri/MiniTri.csproj +++ b/Desktop/Direct3D9/MiniTri/MiniTri.csproj @@ -10,10 +10,9 @@ Properties MiniTri MiniTri - v4.5.1 - - + v4.6.1 512 + true @@ -34,17 +33,17 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -55,6 +54,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/Direct3D9/MiniTri/app.config b/Desktop/Direct3D9/MiniTri/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/Direct3D9/MiniTri/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/Direct3D9/MiniTri/packages.config b/Desktop/Direct3D9/MiniTri/packages.config new file mode 100644 index 00000000..1c30479e --- /dev/null +++ b/Desktop/Direct3D9/MiniTri/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj b/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj index 0552f303..95b120fe 100644 --- a/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj +++ b/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj @@ -10,10 +10,9 @@ Properties MinMaxGPUApp MinMaxGPUApp - v4.5.1 - - + v4.6.1 512 + true @@ -36,23 +35,23 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -71,6 +70,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/DirectCompute/MinMaxGPUApp/app.config b/Desktop/DirectCompute/MinMaxGPUApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectCompute/MinMaxGPUApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectCompute/MinMaxGPUApp/packages.config b/Desktop/DirectCompute/MinMaxGPUApp/packages.config new file mode 100644 index 00000000..f8e37644 --- /dev/null +++ b/Desktop/DirectCompute/MinMaxGPUApp/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/DirectInput/JoystickApp/JoystickApp.csproj b/Desktop/DirectInput/JoystickApp/JoystickApp.csproj index fbe87e3f..9df39307 100644 --- a/Desktop/DirectInput/JoystickApp/JoystickApp.csproj +++ b/Desktop/DirectInput/JoystickApp/JoystickApp.csproj @@ -10,10 +10,9 @@ Properties JoystickApp JoystickApp - v4.5.1 - - + v4.6.1 512 + true @@ -36,11 +35,11 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DirectInput.dll + + ..\..\..\packages\SharpDX.DirectInput.4.1.0\lib\net45\SharpDX.DirectInput.dll @@ -53,6 +52,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/DirectInput/JoystickApp/app.config b/Desktop/DirectInput/JoystickApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectInput/JoystickApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectInput/JoystickApp/packages.config b/Desktop/DirectInput/JoystickApp/packages.config new file mode 100644 index 00000000..0fa26e70 --- /dev/null +++ b/Desktop/DirectInput/JoystickApp/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Desktop/DirectSound/PlaySound/PlaySound.csproj b/Desktop/DirectSound/PlaySound/PlaySound.csproj index 3a43e779..6543e004 100644 --- a/Desktop/DirectSound/PlaySound/PlaySound.csproj +++ b/Desktop/DirectSound/PlaySound/PlaySound.csproj @@ -10,10 +10,9 @@ Properties PlaySound PlaySound - v4.5.1 - - + v4.6.1 512 + true @@ -39,11 +38,11 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DirectSound.dll + + ..\..\..\packages\SharpDX.DirectSound.4.1.0\lib\net45\SharpDX.DirectSound.dll @@ -54,6 +53,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/DirectSound/PlaySound/app.config b/Desktop/DirectSound/PlaySound/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectSound/PlaySound/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectSound/PlaySound/packages.config b/Desktop/DirectSound/PlaySound/packages.config new file mode 100644 index 00000000..481195eb --- /dev/null +++ b/Desktop/DirectSound/PlaySound/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj index a13c409a..0b21f47d 100644 --- a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj +++ b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj @@ -10,7 +10,7 @@ Properties ColorDrawingEffect ColorDrawingEffect - v4.5.1 + v4.6.1 512 @@ -35,20 +35,20 @@ true - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -72,6 +72,10 @@ ColorDrawingEffectForm.cs + + + + - \ No newline at end of file + diff --git a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs index f4336967..0afe97c3 100644 --- a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs +++ b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs @@ -151,7 +151,9 @@ private void InitTextFormatLayout() FontText = "Client Drawing Effect Example!"; // Initialize a TextFormat - CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, FontSize) { TextAlignment = TextAlignment.Center, ParagraphAlignment = ParagraphAlignment.Center }; + CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, FontSize); + CurrentTextFormat.SetTextAlignment(TextAlignment.Center); + CurrentTextFormat.SetParagraphAlignment(ParagraphAlignment.Center); CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, ClientRectangle.Width, ClientRectangle.Height); @@ -188,8 +190,8 @@ void RenderControlResize(object sender, System.EventArgs e) try { RenderTarget2D.Resize(new Size2(ClientRectangle.Size.Width, ClientRectangle.Size.Height)); - CurrentTextLayout.MaxWidth = ClientRectangle.Size.Width; - CurrentTextLayout.MaxHeight = ClientRectangle.Size.Height; + CurrentTextLayout.SetMaxWidth(ClientRectangle.Size.Width); + CurrentTextLayout.SetMaxHeight(ClientRectangle.Size.Height); } catch (Exception ex) { diff --git a/Desktop/DirectWrite/ColorDrawingEffect/app.config b/Desktop/DirectWrite/ColorDrawingEffect/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectWrite/ColorDrawingEffect/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectWrite/ColorDrawingEffect/packages.config b/Desktop/DirectWrite/ColorDrawingEffect/packages.config new file mode 100644 index 00000000..4ee488be --- /dev/null +++ b/Desktop/DirectWrite/ColorDrawingEffect/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/CustomFont/CustomFont.cs b/Desktop/DirectWrite/CustomFont/CustomFont.cs index 3534ba0d..0d46051a 100644 --- a/Desktop/DirectWrite/CustomFont/CustomFont.cs +++ b/Desktop/DirectWrite/CustomFont/CustomFont.cs @@ -130,8 +130,8 @@ void renderControl_Resize(object sender, EventArgs e) try { RenderTarget2D.Resize(new Size2(renderControl.Size.Width, renderControl.Size.Height)); - CurrentTextLayout.MaxWidth = renderControl.Size.Width; - CurrentTextLayout.MaxHeight = renderControl.Size.Height; + CurrentTextLayout.SetMaxWidth(renderControl.Size.Width); + CurrentTextLayout.SetMaxHeight(renderControl.Size.Height); Refresh(); } catch (Exception ex) @@ -188,7 +188,9 @@ private void UpdateTextFormatAndLayout() FontText = "SharpDX - This font was loaded from a resource"; // Initialize a TextFormat - CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, CurrentFontCollection, FontWeight.Normal, FontStyle.Normal, FontStretch.Normal, 64) { TextAlignment = TextAlignment.Center, ParagraphAlignment = ParagraphAlignment.Center }; + CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, CurrentFontCollection, FontWeight.Normal, FontStyle.Normal, FontStretch.Normal, 64); + CurrentTextFormat.SetTextAlignment(TextAlignment.Center); + CurrentTextFormat.SetParagraphAlignment(ParagraphAlignment.Center); CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, renderControl.ClientSize.Width, renderControl.ClientSize.Height); } diff --git a/Desktop/DirectWrite/CustomFont/CustomFont.csproj b/Desktop/DirectWrite/CustomFont/CustomFont.csproj index 1f9e8984..70cfa190 100644 --- a/Desktop/DirectWrite/CustomFont/CustomFont.csproj +++ b/Desktop/DirectWrite/CustomFont/CustomFont.csproj @@ -10,10 +10,9 @@ Properties CustomFont CustomFont - v4.5.1 - - + v4.6.1 512 + true @@ -36,21 +35,20 @@ true - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -76,6 +74,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/DirectWrite/CustomFont/app.config b/Desktop/DirectWrite/CustomFont/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectWrite/CustomFont/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectWrite/CustomFont/packages.config b/Desktop/DirectWrite/CustomFont/packages.config new file mode 100644 index 00000000..4ee488be --- /dev/null +++ b/Desktop/DirectWrite/CustomFont/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj b/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj index 485b7af7..a9459fcd 100644 --- a/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj +++ b/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj @@ -10,10 +10,9 @@ Properties CustomLayout CustomLayout - v4.5.1 - - + v4.6.1 512 + true @@ -32,22 +31,20 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -69,6 +66,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs b/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs index 04d84f90..4bdd43d8 100644 --- a/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs +++ b/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs @@ -317,7 +317,7 @@ private void SetLayoutText(LayoutText layoutText) try { textFormat = new TextFormat(FactoryDWrite, fontName, null, FontWeight.Normal, SharpDX.DirectWrite.FontStyle.Normal, FontStretch.Normal, 14, localeName); - textFormat.ReadingDirection = readingDirection; + textFormat.SetReadingDirection(readingDirection); } catch (Exception ex) { diff --git a/Desktop/DirectWrite/CustomLayout/app.config b/Desktop/DirectWrite/CustomLayout/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectWrite/CustomLayout/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectWrite/CustomLayout/packages.config b/Desktop/DirectWrite/CustomLayout/packages.config new file mode 100644 index 00000000..4ee488be --- /dev/null +++ b/Desktop/DirectWrite/CustomLayout/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj b/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj index 5d426177..883e13f5 100644 --- a/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj +++ b/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj @@ -10,10 +10,9 @@ Properties FontEnumeration FontEnumeration - v4.5.1 - - + v4.6.1 512 + true @@ -32,15 +31,14 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll @@ -51,6 +49,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/DirectWrite/FontEnumeration/app.config b/Desktop/DirectWrite/FontEnumeration/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectWrite/FontEnumeration/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectWrite/FontEnumeration/packages.config b/Desktop/DirectWrite/FontEnumeration/packages.config new file mode 100644 index 00000000..5fa5212f --- /dev/null +++ b/Desktop/DirectWrite/FontEnumeration/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/SimpleHelloWorld/Program.cs b/Desktop/DirectWrite/SimpleHelloWorld/Program.cs index 617060b7..f49a0f80 100644 --- a/Desktop/DirectWrite/SimpleHelloWorld/Program.cs +++ b/Desktop/DirectWrite/SimpleHelloWorld/Program.cs @@ -42,7 +42,9 @@ protected override void Initialize(DemoConfiguration demoConfiguration) base.Initialize(demoConfiguration); // Initialize a TextFormat - TextFormat = new TextFormat(FactoryDWrite, "Gabriola", 96) { TextAlignment = TextAlignment.Center, ParagraphAlignment = ParagraphAlignment.Center }; + TextFormat = new TextFormat(FactoryDWrite, "Gabriola", 96); + TextFormat.SetTextAlignment(TextAlignment.Center); + TextFormat.SetParagraphAlignment(ParagraphAlignment.Center); RenderTarget2D.TextAntialiasMode = TextAntialiasMode.Cleartype; diff --git a/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj b/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj index fc5b4442..0d6dc25b 100644 --- a/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj +++ b/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj @@ -10,10 +10,9 @@ Properties SimpleHelloWorld SimpleHelloWorld - v4.5.1 - - + v4.6.1 512 + true @@ -36,20 +35,20 @@ true - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -68,6 +67,10 @@ SharpDX.Samples + + + + - \ No newline at end of file + diff --git a/Desktop/DirectWrite/SimpleHelloWorld/app.config b/Desktop/DirectWrite/SimpleHelloWorld/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectWrite/SimpleHelloWorld/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectWrite/SimpleHelloWorld/packages.config b/Desktop/DirectWrite/SimpleHelloWorld/packages.config new file mode 100644 index 00000000..4ee488be --- /dev/null +++ b/Desktop/DirectWrite/SimpleHelloWorld/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/TextDialog/TextDialog.cs b/Desktop/DirectWrite/TextDialog/TextDialog.cs index fe8dca41..058a7001 100644 --- a/Desktop/DirectWrite/TextDialog/TextDialog.cs +++ b/Desktop/DirectWrite/TextDialog/TextDialog.cs @@ -147,9 +147,11 @@ private void UpdateTextFormatAndLayout() } // Initialize a TextFormat - CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, FontSize) { TextAlignment = TextAlignment.Center, ParagraphAlignment = ParagraphAlignment.Center }; + CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, FontSize); + CurrentTextFormat.SetTextAlignment(TextAlignment.Center); + CurrentTextFormat.SetParagraphAlignment(ParagraphAlignment.Center); - CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, renderControl.Width, renderControl.Height); + CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, renderControl.Width, renderControl.Height); // Set a stylistic typography var typo = new Typography(FactoryDWrite); @@ -245,8 +247,8 @@ void RenderControlResize(object sender, System.EventArgs e) try { RenderTarget2D.Resize(new Size2(renderControl.Size.Width, renderControl.Size.Height)); - CurrentTextLayout.MaxWidth = renderControl.Size.Width; - CurrentTextLayout.MaxHeight = renderControl.Size.Height; + CurrentTextLayout.SetMaxWidth(renderControl.Size.Width); + CurrentTextLayout.SetMaxHeight(renderControl.Size.Height); } catch (Exception ex) { diff --git a/Desktop/DirectWrite/TextDialog/TextDialog.csproj b/Desktop/DirectWrite/TextDialog/TextDialog.csproj index 4a8ad903..1eea922a 100644 --- a/Desktop/DirectWrite/TextDialog/TextDialog.csproj +++ b/Desktop/DirectWrite/TextDialog/TextDialog.csproj @@ -10,10 +10,9 @@ Properties TextDialog TextDialog - v4.5.1 - - + v4.6.1 512 + true @@ -36,21 +35,20 @@ false - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll @@ -72,6 +70,10 @@ TextDialog.cs + + + + - \ No newline at end of file + diff --git a/Desktop/DirectWrite/TextDialog/app.config b/Desktop/DirectWrite/TextDialog/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/DirectWrite/TextDialog/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/DirectWrite/TextDialog/packages.config b/Desktop/DirectWrite/TextDialog/packages.config new file mode 100644 index 00000000..4ee488be --- /dev/null +++ b/Desktop/DirectWrite/TextDialog/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj b/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj index a69a020c..2eb849f3 100644 --- a/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj +++ b/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj @@ -9,8 +9,9 @@ Properties MediaEngineApp MediaEngineApp - v4.5.1 + v4.6.1 512 + AnyCPU @@ -32,11 +33,20 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.MediaFoundation.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + + ..\..\..\packages\SharpDX.MediaFoundation.4.1.0\lib\net45\SharpDX.MediaFoundation.dll @@ -52,6 +62,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/MediaFoundation/MediaEngineApp/Program.cs b/Desktop/MediaFoundation/MediaEngineApp/Program.cs index a5cec6a7..f7dd18df 100644 --- a/Desktop/MediaFoundation/MediaEngineApp/Program.cs +++ b/Desktop/MediaFoundation/MediaEngineApp/Program.cs @@ -120,7 +120,7 @@ private static void OnPlaybackCallback(MediaEngineEvent playEvent, long param1, eventReadyToPlay.Set(); break; case MediaEngineEvent.TimeUpdate: - Console.Write(" {0}", TimeSpan.FromSeconds(mediaEngineEx.CurrentTime)); + Console.Write(" {0}", TimeSpan.FromSeconds(mediaEngineEx.GetCurrentTime())); break; case MediaEngineEvent.Error: case MediaEngineEvent.Abort: diff --git a/Desktop/MediaFoundation/MediaEngineApp/app.config b/Desktop/MediaFoundation/MediaEngineApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/MediaFoundation/MediaEngineApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/MediaFoundation/MediaEngineApp/packages.config b/Desktop/MediaFoundation/MediaEngineApp/packages.config new file mode 100644 index 00000000..644e7431 --- /dev/null +++ b/Desktop/MediaFoundation/MediaEngineApp/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj b/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj index 3bc10919..acd8a900 100644 --- a/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj +++ b/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj @@ -9,8 +9,9 @@ Properties MediaEngineAppVideo MediaEngineAppVideo - v4.5.1 + v4.6.1 512 + AnyCPU @@ -32,24 +33,26 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.MediaFoundation.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + + ..\..\..\packages\SharpDX.MediaFoundation.4.1.0\lib\net45\SharpDX.MediaFoundation.dll @@ -65,6 +68,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/MediaFoundation/MediaEngineAppVideo/app.config b/Desktop/MediaFoundation/MediaEngineAppVideo/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/MediaFoundation/MediaEngineAppVideo/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config b/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config new file mode 100644 index 00000000..cb6d241c --- /dev/null +++ b/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj b/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj index e2c4aa32..7644c27e 100644 --- a/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj +++ b/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj @@ -10,10 +10,9 @@ Properties RawInputTrack RawInputTrack - v4.5.1 - - + v4.6.1 512 + true @@ -36,11 +35,11 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.RawInput.dll + + ..\..\..\packages\SharpDX.RawInput.4.1.0\lib\net45\SharpDX.RawInput.dll @@ -53,6 +52,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/RawInput/RawInputTrackApp/app.config b/Desktop/RawInput/RawInputTrackApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/RawInput/RawInputTrackApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/RawInput/RawInputTrackApp/packages.config b/Desktop/RawInput/RawInputTrackApp/packages.config new file mode 100644 index 00000000..fdd677e4 --- /dev/null +++ b/Desktop/RawInput/RawInputTrackApp/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Desktop/WIC/EncodeDecode/EncodeDecode.csproj b/Desktop/WIC/EncodeDecode/EncodeDecode.csproj index 985c901e..6554015c 100644 --- a/Desktop/WIC/EncodeDecode/EncodeDecode.csproj +++ b/Desktop/WIC/EncodeDecode/EncodeDecode.csproj @@ -10,10 +10,9 @@ Properties EncodeDecode EncodeDecode - v4.5.1 - - + v4.6.1 512 + true @@ -36,15 +35,14 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll @@ -57,6 +55,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/WIC/EncodeDecode/app.config b/Desktop/WIC/EncodeDecode/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/WIC/EncodeDecode/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/WIC/EncodeDecode/packages.config b/Desktop/WIC/EncodeDecode/packages.config new file mode 100644 index 00000000..5fa5212f --- /dev/null +++ b/Desktop/WIC/EncodeDecode/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj b/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj index 58c8b06f..50d54cca 100644 --- a/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj +++ b/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj @@ -10,8 +10,9 @@ Properties BipBounceApp BipBounceApp - v4.5.1 + v4.6.1 512 + true @@ -63,14 +64,14 @@ false - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll @@ -82,6 +83,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/X3DAudio/BipBounceApp/app.config b/Desktop/X3DAudio/BipBounceApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/X3DAudio/BipBounceApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/X3DAudio/BipBounceApp/packages.config b/Desktop/X3DAudio/BipBounceApp/packages.config new file mode 100644 index 00000000..26b2b878 --- /dev/null +++ b/Desktop/X3DAudio/BipBounceApp/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj b/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj index 966da568..8b4ff499 100644 --- a/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj +++ b/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj @@ -9,10 +9,11 @@ Properties AudioPlayerApp AudioPlayerApp - v4.5.1 + v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 + AnyCPU @@ -34,14 +35,23 @@ 4 - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.MediaFoundation.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + + ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + + ..\..\..\packages\SharpDX.MediaFoundation.4.1.0\lib\net45\SharpDX.MediaFoundation.dll + + + ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll @@ -97,6 +107,8 @@ ResXFileCodeGenerator Resources.Designer.cs + + SettingsSingleFileGenerator Settings.Designer.cs @@ -121,4 +133,4 @@ --> - \ No newline at end of file + diff --git a/Desktop/XAudio2/AudioPlayerApp/app.config b/Desktop/XAudio2/AudioPlayerApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/XAudio2/AudioPlayerApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/XAudio2/AudioPlayerApp/packages.config b/Desktop/XAudio2/AudioPlayerApp/packages.config new file mode 100644 index 00000000..139363c5 --- /dev/null +++ b/Desktop/XAudio2/AudioPlayerApp/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj b/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj index b00bca6f..442e11d3 100644 --- a/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj +++ b/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj @@ -10,10 +10,9 @@ Properties PlaySound PlaySound - v4.5.1 - - + v4.6.1 512 + true @@ -32,11 +31,11 @@ prompt - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll @@ -47,6 +46,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/XAudio2/PlayDynamicSound/app.config b/Desktop/XAudio2/PlayDynamicSound/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/XAudio2/PlayDynamicSound/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/XAudio2/PlayDynamicSound/packages.config b/Desktop/XAudio2/PlayDynamicSound/packages.config new file mode 100644 index 00000000..21dfe2ca --- /dev/null +++ b/Desktop/XAudio2/PlayDynamicSound/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Desktop/XAudio2/PlaySound/PlaySound.csproj b/Desktop/XAudio2/PlaySound/PlaySound.csproj index 9b9b083e..db651bd2 100644 --- a/Desktop/XAudio2/PlaySound/PlaySound.csproj +++ b/Desktop/XAudio2/PlaySound/PlaySound.csproj @@ -10,10 +10,9 @@ Properties PlaySound PlaySound - v4.5.1 - - + v4.6.1 512 + true @@ -32,12 +31,11 @@ prompt - - False - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll @@ -61,6 +59,10 @@ PreserveNewest + + + + - \ No newline at end of file + diff --git a/Desktop/XAudio2/PlaySound/app.config b/Desktop/XAudio2/PlaySound/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/XAudio2/PlaySound/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/XAudio2/PlaySound/packages.config b/Desktop/XAudio2/PlaySound/packages.config new file mode 100644 index 00000000..21dfe2ca --- /dev/null +++ b/Desktop/XAudio2/PlaySound/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj b/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj index 587ead45..90c40fc7 100644 --- a/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj +++ b/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj @@ -10,10 +10,9 @@ Properties PlaySoundCustomXAPO PlaySoundCustomXAPO - v4.5.1 - - + v4.6.1 512 + true @@ -37,11 +36,11 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll @@ -65,6 +64,10 @@ PlayForm.cs + + + + - \ No newline at end of file + diff --git a/Desktop/XAudio2/PlaySoundCustomXAPO/app.config b/Desktop/XAudio2/PlaySoundCustomXAPO/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/XAudio2/PlaySoundCustomXAPO/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config b/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config new file mode 100644 index 00000000..21dfe2ca --- /dev/null +++ b/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Desktop/XInput/XGamepadApp/XGamepadApp.csproj b/Desktop/XInput/XGamepadApp/XGamepadApp.csproj index e25b58d1..d15e9f08 100644 --- a/Desktop/XInput/XGamepadApp/XGamepadApp.csproj +++ b/Desktop/XInput/XGamepadApp/XGamepadApp.csproj @@ -10,10 +10,9 @@ Properties XGamepadApp XGamepadApp - v4.5.1 - - + v4.6.1 512 + true @@ -36,11 +35,11 @@ - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll - - ..\..\..\..\Bin\$(Configuration)\net45\SharpDX.XInput.dll + + ..\..\..\packages\SharpDX.XInput.4.1.0\lib\net45\SharpDX.XInput.dll @@ -53,6 +52,10 @@ + + + + - \ No newline at end of file + diff --git a/Desktop/XInput/XGamepadApp/app.config b/Desktop/XInput/XGamepadApp/app.config new file mode 100644 index 00000000..3dbff35f --- /dev/null +++ b/Desktop/XInput/XGamepadApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Desktop/XInput/XGamepadApp/packages.config b/Desktop/XInput/XGamepadApp/packages.config new file mode 100644 index 00000000..af861316 --- /dev/null +++ b/Desktop/XInput/XGamepadApp/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From 568779964d64bfe9dd01c37eb317898192831ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Juan=20Rico=20Mendoza?= Date: Mon, 27 Aug 2018 23:40:20 -0300 Subject: [PATCH 2/2] Update SharpDX to 4.2 --- Desktop/Common/SharpDX.Samples.csproj | 31 ++++++++++--------- Desktop/Common/app.config | 15 +++++++++ Desktop/Common/packages.config | 14 ++++----- .../AdvancedTextRenderingApp.csproj | 30 +++++++++--------- .../AdvancedTextRenderingApp/app.config | 17 ++++++++-- .../AdvancedTextRenderingApp/packages.config | 14 ++++----- Desktop/Direct2D1/BitmapApp/BitmapApp.csproj | 22 ++++++------- Desktop/Direct2D1/BitmapApp/app.config | 17 ++++++++-- Desktop/Direct2D1/BitmapApp/packages.config | 10 +++--- Desktop/Direct2D1/MiniRect/MiniRect.csproj | 26 ++++++++-------- Desktop/Direct2D1/MiniRect/app.config | 17 ++++++++-- Desktop/Direct2D1/MiniRect/packages.config | 12 +++---- .../OfflineImageProcessingApp/App.config | 17 ++++++++-- .../OfflineImageProcessingApp.csproj | 26 ++++++++-------- .../OfflineImageProcessingApp/Program.cs | 4 +-- .../OfflineImageProcessingApp/packages.config | 12 +++---- .../RenderToWicApp/RenderToWicApp.csproj | 18 +++++------ Desktop/Direct2D1/RenderToWicApp/app.config | 17 ++++++++-- .../Direct2D1/RenderToWicApp/packages.config | 8 ++--- .../TessellateApp/TessellateApp.csproj | 26 ++++++++-------- Desktop/Direct2D1/TessellateApp/app.config | 17 ++++++++-- .../Direct2D1/TessellateApp/packages.config | 12 +++---- Desktop/Direct2D1/TextRenderingApp/Program.cs | 4 +-- .../TextRenderingApp/TextRenderingApp.csproj | 26 ++++++++-------- Desktop/Direct2D1/TextRenderingApp/app.config | 17 ++++++++-- .../TextRenderingApp/packages.config | 12 +++---- .../ScreenCapture/ScreenCapture.csproj | 26 ++++++++-------- Desktop/Direct3D11.1/ScreenCapture/app.config | 17 ++++++++-- .../ScreenCapture/packages.config | 12 +++---- Desktop/Direct3D11/MiniCube/MiniCube.csproj | 26 ++++++++-------- Desktop/Direct3D11/MiniCube/packages.config | 12 +++---- Desktop/Direct3D11/MiniTri/MiniTri.csproj | 26 ++++++++-------- Desktop/Direct3D11/MiniTri/packages.config | 12 +++---- .../MiniTriEffects11/MiniTriEffects11.csproj | 30 +++++++++--------- .../Direct3D11/MiniTriEffects11/app.config | 13 ++++++-- .../MiniTriEffects11/packages.config | 14 ++++----- Desktop/Direct3D11/MultiCube/MultiCube.csproj | 26 ++++++++-------- Desktop/Direct3D11/MultiCube/app.config | 17 ++++++++-- Desktop/Direct3D11/MultiCube/packages.config | 12 +++---- Desktop/Direct3D12/HelloBundles/App.config | 13 ++++++-- .../HelloBundles/HelloBundles.csproj | 26 ++++++++-------- .../Direct3D12/HelloBundles/packages.config | 12 +++---- .../Direct3D12/HelloConstBuffers/App.config | 12 +++++-- .../HelloConstBuffers.csproj | 26 ++++++++-------- .../HelloConstBuffers/packages.config | 12 +++---- Desktop/Direct3D12/HelloTexture/App.config | 13 ++++++-- .../HelloTexture/HelloTexture.csproj | 26 ++++++++-------- .../Direct3D12/HelloTexture/packages.config | 12 +++---- Desktop/Direct3D12/HelloTriangle/App.config | 16 ++++++++-- .../HelloTriangle/HelloTriangle.csproj | 26 ++++++++-------- .../Direct3D12/HelloTriangle/packages.config | 12 +++---- Desktop/Direct3D12/HelloWindow/App.config | 12 +++++-- .../Direct3D12/HelloWindow/HelloWindow.csproj | 26 ++++++++-------- .../Direct3D12/HelloWindow/packages.config | 12 +++---- .../Direct3D12/HelloWorld/HelloWorld.csproj | 26 ++++++++-------- Desktop/Direct3D12/HelloWorld/app.config | 17 ++++++++-- Desktop/Direct3D12/HelloWorld/packages.config | 12 +++---- .../DisplayFontApp/DisplayFontApp.csproj | 18 +++++------ Desktop/Direct3D9/DisplayFontApp/app.config | 13 ++++++-- .../Direct3D9/DisplayFontApp/packages.config | 8 ++--- Desktop/Direct3D9/MiniCube/MiniCube.csproj | 18 +++++------ Desktop/Direct3D9/MiniCube/packages.config | 8 ++--- Desktop/Direct3D9/MiniTri/MiniTri.csproj | 18 +++++------ Desktop/Direct3D9/MiniTri/packages.config | 8 ++--- .../MinMaxGPUApp/MinMaxGPUApp.csproj | 26 ++++++++-------- Desktop/DirectCompute/MinMaxGPUApp/app.config | 17 ++++++++-- .../MinMaxGPUApp/packages.config | 12 +++---- .../JoystickApp/JoystickApp.csproj | 10 +++--- .../DirectInput/JoystickApp/packages.config | 4 +-- .../DirectSound/PlaySound/PlaySound.csproj | 10 +++--- Desktop/DirectSound/PlaySound/packages.config | 4 +-- .../ColorDrawingEffect.csproj | 22 ++++++------- .../ColorDrawingEffectForm.cs | 8 ++--- .../DirectWrite/ColorDrawingEffect/app.config | 17 ++++++++-- .../ColorDrawingEffect/packages.config | 10 +++--- Desktop/DirectWrite/CustomFont/CustomFont.cs | 8 ++--- .../DirectWrite/CustomFont/CustomFont.csproj | 22 ++++++------- Desktop/DirectWrite/CustomFont/app.config | 17 ++++++++-- .../DirectWrite/CustomFont/packages.config | 10 +++--- .../CustomLayout/CustomLayout.csproj | 22 ++++++------- .../CustomLayout/CustomLayoutForm.cs | 2 +- Desktop/DirectWrite/CustomLayout/app.config | 17 ++++++++-- .../DirectWrite/CustomLayout/packages.config | 10 +++--- .../FontEnumeration/FontEnumeration.csproj | 14 ++++----- .../DirectWrite/FontEnumeration/app.config | 17 ++++++++-- .../FontEnumeration/packages.config | 6 ++-- .../DirectWrite/SimpleHelloWorld/Program.cs | 4 +-- .../SimpleHelloWorld/SimpleHelloWorld.csproj | 22 ++++++------- .../DirectWrite/SimpleHelloWorld/app.config | 17 ++++++++-- .../SimpleHelloWorld/packages.config | 10 +++--- Desktop/DirectWrite/TextDialog/TextDialog.cs | 8 ++--- .../DirectWrite/TextDialog/TextDialog.csproj | 22 ++++++------- Desktop/DirectWrite/TextDialog/app.config | 17 ++++++++-- .../DirectWrite/TextDialog/packages.config | 10 +++--- .../MediaEngineApp/MediaEngineApp.csproj | 22 ++++++------- .../MediaFoundation/MediaEngineApp/Program.cs | 2 +- .../MediaFoundation/MediaEngineApp/app.config | 25 +++++++++++++-- .../MediaEngineApp/packages.config | 10 +++--- .../MediaEngineAppVideo.csproj | 30 +++++++++--------- .../MediaEngineAppVideo/app.config | 17 ++++++++-- .../MediaEngineAppVideo/packages.config | 14 ++++----- .../RawInputTrackApp/RawInputTrackApp.csproj | 10 +++--- .../RawInput/RawInputTrackApp/packages.config | 4 +-- Desktop/WIC/EncodeDecode/EncodeDecode.csproj | 14 ++++----- Desktop/WIC/EncodeDecode/app.config | 13 ++++++-- Desktop/WIC/EncodeDecode/packages.config | 6 ++-- .../X3DAudio/BipBounceApp/BipBounceApp.csproj | 14 ++++----- Desktop/X3DAudio/BipBounceApp/app.config | 13 ++++++-- Desktop/X3DAudio/BipBounceApp/packages.config | 6 ++-- .../AudioPlayerApp/AudioPlayerApp.csproj | 26 ++++++++-------- Desktop/XAudio2/AudioPlayerApp/app.config | 25 +++++++++++++-- .../XAudio2/AudioPlayerApp/packages.config | 12 +++---- .../PlayDynamicSound/PlayDynamicSound.csproj | 10 +++--- Desktop/XAudio2/PlayDynamicSound/app.config | 13 ++++++-- .../XAudio2/PlayDynamicSound/packages.config | 4 +-- Desktop/XAudio2/PlaySound/PlaySound.csproj | 10 +++--- Desktop/XAudio2/PlaySound/packages.config | 4 +-- .../PlaySoundCustomXAPO.csproj | 10 +++--- .../XAudio2/PlaySoundCustomXAPO/app.config | 13 ++++++-- .../PlaySoundCustomXAPO/packages.config | 4 +-- Desktop/XInput/XGamepadApp/XGamepadApp.csproj | 10 +++--- Desktop/XInput/XGamepadApp/app.config | 13 ++++++-- Desktop/XInput/XGamepadApp/packages.config | 4 +-- 123 files changed, 1120 insertions(+), 719 deletions(-) create mode 100644 Desktop/Common/app.config diff --git a/Desktop/Common/SharpDX.Samples.csproj b/Desktop/Common/SharpDX.Samples.csproj index ef4e712a..67db7622 100644 --- a/Desktop/Common/SharpDX.Samples.csproj +++ b/Desktop/Common/SharpDX.Samples.csproj @@ -34,26 +34,26 @@ 4 - - ..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -71,6 +71,7 @@ + @@ -81,4 +82,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Common/app.config b/Desktop/Common/app.config new file mode 100644 index 00000000..445df4d9 --- /dev/null +++ b/Desktop/Common/app.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/Common/packages.config b/Desktop/Common/packages.config index 386a86d5..e311a4a3 100644 --- a/Desktop/Common/packages.config +++ b/Desktop/Common/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj b/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj index 7160575a..14550e03 100644 --- a/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj +++ b/Desktop/Direct2D1/AdvancedTextRenderingApp/AdvancedTextRenderingApp.csproj @@ -33,26 +33,26 @@ true - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.Direct3D10.4.1.0\lib\net45\SharpDX.Direct3D10.dll + + ..\..\..\packages\SharpDX.Direct3D10.4.2.0\lib\net45\SharpDX.Direct3D10.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -76,4 +76,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config b/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config +++ b/Desktop/Direct2D1/AdvancedTextRenderingApp/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config b/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config index 5f63e29e..abae3581 100644 --- a/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config +++ b/Desktop/Direct2D1/AdvancedTextRenderingApp/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj b/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj index 4cfff8d4..939a93ab 100644 --- a/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj +++ b/Desktop/Direct2D1/BitmapApp/BitmapApp.csproj @@ -33,20 +33,20 @@ false - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -82,4 +82,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/BitmapApp/app.config b/Desktop/Direct2D1/BitmapApp/app.config index 3dbff35f..2ce580fb 100644 --- a/Desktop/Direct2D1/BitmapApp/app.config +++ b/Desktop/Direct2D1/BitmapApp/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/BitmapApp/packages.config b/Desktop/Direct2D1/BitmapApp/packages.config index 4ee488be..9f78939b 100644 --- a/Desktop/Direct2D1/BitmapApp/packages.config +++ b/Desktop/Direct2D1/BitmapApp/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/MiniRect/MiniRect.csproj b/Desktop/Direct2D1/MiniRect/MiniRect.csproj index 5112029d..a0a49a66 100644 --- a/Desktop/Direct2D1/MiniRect/MiniRect.csproj +++ b/Desktop/Direct2D1/MiniRect/MiniRect.csproj @@ -32,23 +32,23 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -72,4 +72,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/MiniRect/app.config b/Desktop/Direct2D1/MiniRect/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct2D1/MiniRect/app.config +++ b/Desktop/Direct2D1/MiniRect/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/MiniRect/packages.config b/Desktop/Direct2D1/MiniRect/packages.config index ff0d4cac..7e70f05a 100644 --- a/Desktop/Direct2D1/MiniRect/packages.config +++ b/Desktop/Direct2D1/MiniRect/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/App.config b/Desktop/Direct2D1/OfflineImageProcessingApp/App.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/App.config +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/App.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj b/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj index ffaf6461..cee4e4a2 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/OfflineImageProcessingApp.csproj @@ -33,23 +33,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -76,4 +76,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs b/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs index 07ab7fca..b290c3e6 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/Program.cs @@ -147,8 +147,8 @@ static void Main() // this is the trick to write D2D1 bitmap to WIC var imageEncoder = new wic.ImageEncoder(imagingFactory, d2dDevice); - var imageParametersRef = new wic.ImageParameters(d2PixelFormat, 96, 96, 0, 0, pixelWidth, pixelHeight); - imageEncoder.WriteFrame(d2dRenderTarget, bitmapFrameEncode, ref imageParametersRef); + var imageParameters = new wic.ImageParameters(d2PixelFormat, 96, 96, 0, 0, pixelWidth, pixelHeight); + imageEncoder.WriteFrame(d2dRenderTarget, bitmapFrameEncode, imageParameters); bitmapFrameEncode.Commit(); encoder.Commit(); diff --git a/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config b/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config index 0c880afe..191054ee 100644 --- a/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config +++ b/Desktop/Direct2D1/OfflineImageProcessingApp/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj b/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj index a833ab93..751720d1 100644 --- a/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj +++ b/Desktop/Direct2D1/RenderToWicApp/RenderToWicApp.csproj @@ -32,17 +32,17 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -66,4 +66,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/RenderToWicApp/app.config b/Desktop/Direct2D1/RenderToWicApp/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct2D1/RenderToWicApp/app.config +++ b/Desktop/Direct2D1/RenderToWicApp/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/RenderToWicApp/packages.config b/Desktop/Direct2D1/RenderToWicApp/packages.config index 742eb226..6244a8f7 100644 --- a/Desktop/Direct2D1/RenderToWicApp/packages.config +++ b/Desktop/Direct2D1/RenderToWicApp/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj b/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj index 93b42a88..94ee0717 100644 --- a/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj +++ b/Desktop/Direct2D1/TessellateApp/TessellateApp.csproj @@ -31,23 +31,23 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.Direct3D10.4.1.0\lib\net45\SharpDX.Direct3D10.dll + + ..\..\..\packages\SharpDX.Direct3D10.4.2.0\lib\net45\SharpDX.Direct3D10.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -77,4 +77,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/TessellateApp/app.config b/Desktop/Direct2D1/TessellateApp/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct2D1/TessellateApp/app.config +++ b/Desktop/Direct2D1/TessellateApp/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/TessellateApp/packages.config b/Desktop/Direct2D1/TessellateApp/packages.config index 73893ffd..d3191b9c 100644 --- a/Desktop/Direct2D1/TessellateApp/packages.config +++ b/Desktop/Direct2D1/TessellateApp/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct2D1/TextRenderingApp/Program.cs b/Desktop/Direct2D1/TextRenderingApp/Program.cs index 5ba5c392..01656d29 100644 --- a/Desktop/Direct2D1/TextRenderingApp/Program.cs +++ b/Desktop/Direct2D1/TextRenderingApp/Program.cs @@ -37,8 +37,8 @@ protected override void Initialize(DemoConfiguration demoConfiguration) // Initialize a TextFormat TextFormat = new TextFormat(FactoryDWrite, "Calibri", 128); - TextFormat.SetTextAlignment(TextAlignment.Center); - TextFormat.SetParagraphAlignment(ParagraphAlignment.Center); + TextFormat.TextAlignment = TextAlignment.Center; + TextFormat.ParagraphAlignment = ParagraphAlignment.Center; RenderTarget2D.TextAntialiasMode = TextAntialiasMode.Cleartype; diff --git a/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj b/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj index f826baad..d048f416 100644 --- a/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj +++ b/Desktop/Direct2D1/TextRenderingApp/TextRenderingApp.csproj @@ -33,23 +33,23 @@ true - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.Direct3D10.4.1.0\lib\net45\SharpDX.Direct3D10.dll + + ..\..\..\packages\SharpDX.Direct3D10.4.2.0\lib\net45\SharpDX.Direct3D10.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -79,4 +79,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct2D1/TextRenderingApp/app.config b/Desktop/Direct2D1/TextRenderingApp/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct2D1/TextRenderingApp/app.config +++ b/Desktop/Direct2D1/TextRenderingApp/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct2D1/TextRenderingApp/packages.config b/Desktop/Direct2D1/TextRenderingApp/packages.config index 73893ffd..d3191b9c 100644 --- a/Desktop/Direct2D1/TextRenderingApp/packages.config +++ b/Desktop/Direct2D1/TextRenderingApp/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj b/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj index b8cce9cb..3cfebf63 100644 --- a/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj +++ b/Desktop/Direct3D11.1/ScreenCapture/ScreenCapture.csproj @@ -32,23 +32,23 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -71,4 +71,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D11.1/ScreenCapture/app.config b/Desktop/Direct3D11.1/ScreenCapture/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct3D11.1/ScreenCapture/app.config +++ b/Desktop/Direct3D11.1/ScreenCapture/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct3D11.1/ScreenCapture/packages.config b/Desktop/Direct3D11.1/ScreenCapture/packages.config index f8e37644..b25f2741 100644 --- a/Desktop/Direct3D11.1/ScreenCapture/packages.config +++ b/Desktop/Direct3D11.1/ScreenCapture/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniCube/MiniCube.csproj b/Desktop/Direct3D11/MiniCube/MiniCube.csproj index 1364ace3..9f8c882b 100644 --- a/Desktop/Direct3D11/MiniCube/MiniCube.csproj +++ b/Desktop/Direct3D11/MiniCube/MiniCube.csproj @@ -32,23 +32,23 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -76,4 +76,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniCube/packages.config b/Desktop/Direct3D11/MiniCube/packages.config index f8e37644..b25f2741 100644 --- a/Desktop/Direct3D11/MiniCube/packages.config +++ b/Desktop/Direct3D11/MiniCube/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniTri/MiniTri.csproj b/Desktop/Direct3D11/MiniTri/MiniTri.csproj index f81ad73d..0db23bec 100644 --- a/Desktop/Direct3D11/MiniTri/MiniTri.csproj +++ b/Desktop/Direct3D11/MiniTri/MiniTri.csproj @@ -32,23 +32,23 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -74,4 +74,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniTri/packages.config b/Desktop/Direct3D11/MiniTri/packages.config index f8e37644..b25f2741 100644 --- a/Desktop/Direct3D11/MiniTri/packages.config +++ b/Desktop/Direct3D11/MiniTri/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj b/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj index cca687ad..1afed349 100644 --- a/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj +++ b/Desktop/Direct3D11/MiniTriEffects11/MiniTriEffects11.csproj @@ -54,26 +54,26 @@ false - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.Direct3D11.Effects.4.1.0\lib\net45\SharpDX.Direct3D11.Effects.dll + + ..\..\..\packages\SharpDX.Direct3D11.Effects.4.2.0\lib\net45\SharpDX.Direct3D11.Effects.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -102,4 +102,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D11/MiniTriEffects11/app.config b/Desktop/Direct3D11/MiniTriEffects11/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/Direct3D11/MiniTriEffects11/app.config +++ b/Desktop/Direct3D11/MiniTriEffects11/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/Direct3D11/MiniTriEffects11/packages.config b/Desktop/Direct3D11/MiniTriEffects11/packages.config index 7a7ad04b..5e6deab6 100644 --- a/Desktop/Direct3D11/MiniTriEffects11/packages.config +++ b/Desktop/Direct3D11/MiniTriEffects11/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D11/MultiCube/MultiCube.csproj b/Desktop/Direct3D11/MultiCube/MultiCube.csproj index 2784de05..48d8047f 100644 --- a/Desktop/Direct3D11/MultiCube/MultiCube.csproj +++ b/Desktop/Direct3D11/MultiCube/MultiCube.csproj @@ -32,23 +32,23 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -76,4 +76,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D11/MultiCube/app.config b/Desktop/Direct3D11/MultiCube/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct3D11/MultiCube/app.config +++ b/Desktop/Direct3D11/MultiCube/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct3D11/MultiCube/packages.config b/Desktop/Direct3D11/MultiCube/packages.config index f8e37644..b25f2741 100644 --- a/Desktop/Direct3D11/MultiCube/packages.config +++ b/Desktop/Direct3D11/MultiCube/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloBundles/App.config b/Desktop/Direct3D12/HelloBundles/App.config index d4050983..8e34f4a6 100644 --- a/Desktop/Direct3D12/HelloBundles/App.config +++ b/Desktop/Direct3D12/HelloBundles/App.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj b/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj index 92c5ebe7..fc650e2d 100644 --- a/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj +++ b/Desktop/Direct3D12/HelloBundles/HelloBundles.csproj @@ -33,23 +33,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.2.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -104,4 +104,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloBundles/packages.config b/Desktop/Direct3D12/HelloBundles/packages.config index b9a01f4d..ccd733d1 100644 --- a/Desktop/Direct3D12/HelloBundles/packages.config +++ b/Desktop/Direct3D12/HelloBundles/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloConstBuffers/App.config b/Desktop/Direct3D12/HelloConstBuffers/App.config index 45437954..6248b143 100644 --- a/Desktop/Direct3D12/HelloConstBuffers/App.config +++ b/Desktop/Direct3D12/HelloConstBuffers/App.config @@ -1,6 +1,14 @@ - + - + + + + + + + + + diff --git a/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj b/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj index 0ec0b3d5..d4ecc90b 100644 --- a/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj +++ b/Desktop/Direct3D12/HelloConstBuffers/HelloConstBuffers.csproj @@ -33,23 +33,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.2.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -104,4 +104,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloConstBuffers/packages.config b/Desktop/Direct3D12/HelloConstBuffers/packages.config index b9a01f4d..ccd733d1 100644 --- a/Desktop/Direct3D12/HelloConstBuffers/packages.config +++ b/Desktop/Direct3D12/HelloConstBuffers/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloTexture/App.config b/Desktop/Direct3D12/HelloTexture/App.config index d4050983..8e34f4a6 100644 --- a/Desktop/Direct3D12/HelloTexture/App.config +++ b/Desktop/Direct3D12/HelloTexture/App.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj b/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj index b93a71fc..94713d33 100644 --- a/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj +++ b/Desktop/Direct3D12/HelloTexture/HelloTexture.csproj @@ -34,23 +34,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.2.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -106,4 +106,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloTexture/packages.config b/Desktop/Direct3D12/HelloTexture/packages.config index b9a01f4d..ccd733d1 100644 --- a/Desktop/Direct3D12/HelloTexture/packages.config +++ b/Desktop/Direct3D12/HelloTexture/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloTriangle/App.config b/Desktop/Direct3D12/HelloTriangle/App.config index 45437954..71cd5488 100644 --- a/Desktop/Direct3D12/HelloTriangle/App.config +++ b/Desktop/Direct3D12/HelloTriangle/App.config @@ -1,6 +1,18 @@ - + - + + + + + + + + + + + + + diff --git a/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj b/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj index 5f03dfcd..e2727b26 100644 --- a/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj +++ b/Desktop/Direct3D12/HelloTriangle/HelloTriangle.csproj @@ -34,23 +34,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.2.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -105,4 +105,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloTriangle/packages.config b/Desktop/Direct3D12/HelloTriangle/packages.config index b9a01f4d..ccd733d1 100644 --- a/Desktop/Direct3D12/HelloTriangle/packages.config +++ b/Desktop/Direct3D12/HelloTriangle/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloWindow/App.config b/Desktop/Direct3D12/HelloWindow/App.config index 45437954..6248b143 100644 --- a/Desktop/Direct3D12/HelloWindow/App.config +++ b/Desktop/Direct3D12/HelloWindow/App.config @@ -1,6 +1,14 @@ - + - + + + + + + + + + diff --git a/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj b/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj index 7d1c83b2..615a324f 100644 --- a/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj +++ b/Desktop/Direct3D12/HelloWindow/HelloWindow.csproj @@ -34,23 +34,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.2.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -100,4 +100,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloWindow/packages.config b/Desktop/Direct3D12/HelloWindow/packages.config index b9a01f4d..ccd733d1 100644 --- a/Desktop/Direct3D12/HelloWindow/packages.config +++ b/Desktop/Direct3D12/HelloWindow/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj b/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj index 7e810515..a9c47b23 100644 --- a/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj +++ b/Desktop/Direct3D12/HelloWorld/HelloWorld.csproj @@ -38,23 +38,23 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D12.4.1.0\lib\net45\SharpDX.Direct3D12.dll + + ..\..\..\packages\SharpDX.Direct3D12.4.2.0\lib\net45\SharpDX.Direct3D12.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -79,4 +79,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D12/HelloWorld/app.config b/Desktop/Direct3D12/HelloWorld/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/Direct3D12/HelloWorld/app.config +++ b/Desktop/Direct3D12/HelloWorld/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/Direct3D12/HelloWorld/packages.config b/Desktop/Direct3D12/HelloWorld/packages.config index b9a01f4d..ccd733d1 100644 --- a/Desktop/Direct3D12/HelloWorld/packages.config +++ b/Desktop/Direct3D12/HelloWorld/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj b/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj index 1daa9e16..e069135b 100644 --- a/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj +++ b/Desktop/Direct3D9/DisplayFontApp/DisplayFontApp.csproj @@ -33,17 +33,17 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -66,4 +66,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D9/DisplayFontApp/app.config b/Desktop/Direct3D9/DisplayFontApp/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/Direct3D9/DisplayFontApp/app.config +++ b/Desktop/Direct3D9/DisplayFontApp/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/Direct3D9/DisplayFontApp/packages.config b/Desktop/Direct3D9/DisplayFontApp/packages.config index 1c30479e..97bb0b5f 100644 --- a/Desktop/Direct3D9/DisplayFontApp/packages.config +++ b/Desktop/Direct3D9/DisplayFontApp/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/Desktop/Direct3D9/MiniCube/MiniCube.csproj b/Desktop/Direct3D9/MiniCube/MiniCube.csproj index ab5663d7..f364d7b6 100644 --- a/Desktop/Direct3D9/MiniCube/MiniCube.csproj +++ b/Desktop/Direct3D9/MiniCube/MiniCube.csproj @@ -34,17 +34,17 @@ false - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -72,4 +72,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D9/MiniCube/packages.config b/Desktop/Direct3D9/MiniCube/packages.config index 1c30479e..97bb0b5f 100644 --- a/Desktop/Direct3D9/MiniCube/packages.config +++ b/Desktop/Direct3D9/MiniCube/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/Desktop/Direct3D9/MiniTri/MiniTri.csproj b/Desktop/Direct3D9/MiniTri/MiniTri.csproj index b6270a54..a1c54505 100644 --- a/Desktop/Direct3D9/MiniTri/MiniTri.csproj +++ b/Desktop/Direct3D9/MiniTri/MiniTri.csproj @@ -33,17 +33,17 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -66,4 +66,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/Direct3D9/MiniTri/packages.config b/Desktop/Direct3D9/MiniTri/packages.config index 1c30479e..97bb0b5f 100644 --- a/Desktop/Direct3D9/MiniTri/packages.config +++ b/Desktop/Direct3D9/MiniTri/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj b/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj index 95b120fe..1f50253c 100644 --- a/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj +++ b/Desktop/DirectCompute/MinMaxGPUApp/MinMaxGPUApp.csproj @@ -35,23 +35,23 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.D3DCompiler.4.1.0\lib\net45\SharpDX.D3DCompiler.dll + + ..\..\..\packages\SharpDX.D3DCompiler.4.2.0\lib\net45\SharpDX.D3DCompiler.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -82,4 +82,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectCompute/MinMaxGPUApp/app.config b/Desktop/DirectCompute/MinMaxGPUApp/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectCompute/MinMaxGPUApp/app.config +++ b/Desktop/DirectCompute/MinMaxGPUApp/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectCompute/MinMaxGPUApp/packages.config b/Desktop/DirectCompute/MinMaxGPUApp/packages.config index f8e37644..b25f2741 100644 --- a/Desktop/DirectCompute/MinMaxGPUApp/packages.config +++ b/Desktop/DirectCompute/MinMaxGPUApp/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/DirectInput/JoystickApp/JoystickApp.csproj b/Desktop/DirectInput/JoystickApp/JoystickApp.csproj index 9df39307..c1514fb6 100644 --- a/Desktop/DirectInput/JoystickApp/JoystickApp.csproj +++ b/Desktop/DirectInput/JoystickApp/JoystickApp.csproj @@ -35,11 +35,11 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.DirectInput.4.1.0\lib\net45\SharpDX.DirectInput.dll + + ..\..\..\packages\SharpDX.DirectInput.4.2.0\lib\net45\SharpDX.DirectInput.dll @@ -64,4 +64,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectInput/JoystickApp/packages.config b/Desktop/DirectInput/JoystickApp/packages.config index 0fa26e70..f9132808 100644 --- a/Desktop/DirectInput/JoystickApp/packages.config +++ b/Desktop/DirectInput/JoystickApp/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Desktop/DirectSound/PlaySound/PlaySound.csproj b/Desktop/DirectSound/PlaySound/PlaySound.csproj index 6543e004..3f4d33e4 100644 --- a/Desktop/DirectSound/PlaySound/PlaySound.csproj +++ b/Desktop/DirectSound/PlaySound/PlaySound.csproj @@ -38,11 +38,11 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.DirectSound.4.1.0\lib\net45\SharpDX.DirectSound.dll + + ..\..\..\packages\SharpDX.DirectSound.4.2.0\lib\net45\SharpDX.DirectSound.dll @@ -65,4 +65,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectSound/PlaySound/packages.config b/Desktop/DirectSound/PlaySound/packages.config index 481195eb..746d7e37 100644 --- a/Desktop/DirectSound/PlaySound/packages.config +++ b/Desktop/DirectSound/PlaySound/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj index 0b21f47d..bccb5eae 100644 --- a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj +++ b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffect.csproj @@ -35,20 +35,20 @@ true - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -84,4 +84,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs index 0afe97c3..3922bf87 100644 --- a/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs +++ b/Desktop/DirectWrite/ColorDrawingEffect/ColorDrawingEffectForm.cs @@ -152,8 +152,8 @@ private void InitTextFormatLayout() // Initialize a TextFormat CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, FontSize); - CurrentTextFormat.SetTextAlignment(TextAlignment.Center); - CurrentTextFormat.SetParagraphAlignment(ParagraphAlignment.Center); + CurrentTextFormat.TextAlignment = TextAlignment.Center; + CurrentTextFormat.ParagraphAlignment = ParagraphAlignment.Center; CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, ClientRectangle.Width, ClientRectangle.Height); @@ -190,8 +190,8 @@ void RenderControlResize(object sender, System.EventArgs e) try { RenderTarget2D.Resize(new Size2(ClientRectangle.Size.Width, ClientRectangle.Size.Height)); - CurrentTextLayout.SetMaxWidth(ClientRectangle.Size.Width); - CurrentTextLayout.SetMaxHeight(ClientRectangle.Size.Height); + CurrentTextLayout.MaxWidth = ClientRectangle.Size.Width; + CurrentTextLayout.MaxHeight = ClientRectangle.Size.Height; } catch (Exception ex) { diff --git a/Desktop/DirectWrite/ColorDrawingEffect/app.config b/Desktop/DirectWrite/ColorDrawingEffect/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectWrite/ColorDrawingEffect/app.config +++ b/Desktop/DirectWrite/ColorDrawingEffect/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectWrite/ColorDrawingEffect/packages.config b/Desktop/DirectWrite/ColorDrawingEffect/packages.config index 4ee488be..9f78939b 100644 --- a/Desktop/DirectWrite/ColorDrawingEffect/packages.config +++ b/Desktop/DirectWrite/ColorDrawingEffect/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/CustomFont/CustomFont.cs b/Desktop/DirectWrite/CustomFont/CustomFont.cs index 0d46051a..f8fa539c 100644 --- a/Desktop/DirectWrite/CustomFont/CustomFont.cs +++ b/Desktop/DirectWrite/CustomFont/CustomFont.cs @@ -130,8 +130,8 @@ void renderControl_Resize(object sender, EventArgs e) try { RenderTarget2D.Resize(new Size2(renderControl.Size.Width, renderControl.Size.Height)); - CurrentTextLayout.SetMaxWidth(renderControl.Size.Width); - CurrentTextLayout.SetMaxHeight(renderControl.Size.Height); + CurrentTextLayout.MaxWidth = renderControl.Size.Width; + CurrentTextLayout.MaxHeight = renderControl.Size.Height; Refresh(); } catch (Exception ex) @@ -189,8 +189,8 @@ private void UpdateTextFormatAndLayout() // Initialize a TextFormat CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, CurrentFontCollection, FontWeight.Normal, FontStyle.Normal, FontStretch.Normal, 64); - CurrentTextFormat.SetTextAlignment(TextAlignment.Center); - CurrentTextFormat.SetParagraphAlignment(ParagraphAlignment.Center); + CurrentTextFormat.TextAlignment = TextAlignment.Center; + CurrentTextFormat.ParagraphAlignment = ParagraphAlignment.Center; CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, renderControl.ClientSize.Width, renderControl.ClientSize.Height); } diff --git a/Desktop/DirectWrite/CustomFont/CustomFont.csproj b/Desktop/DirectWrite/CustomFont/CustomFont.csproj index 70cfa190..1561a4a1 100644 --- a/Desktop/DirectWrite/CustomFont/CustomFont.csproj +++ b/Desktop/DirectWrite/CustomFont/CustomFont.csproj @@ -35,20 +35,20 @@ true - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -86,4 +86,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectWrite/CustomFont/app.config b/Desktop/DirectWrite/CustomFont/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectWrite/CustomFont/app.config +++ b/Desktop/DirectWrite/CustomFont/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectWrite/CustomFont/packages.config b/Desktop/DirectWrite/CustomFont/packages.config index 4ee488be..9f78939b 100644 --- a/Desktop/DirectWrite/CustomFont/packages.config +++ b/Desktop/DirectWrite/CustomFont/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj b/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj index a9459fcd..2fbd25d2 100644 --- a/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj +++ b/Desktop/DirectWrite/CustomLayout/CustomLayout.csproj @@ -31,20 +31,20 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -78,4 +78,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs b/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs index 4bdd43d8..04d84f90 100644 --- a/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs +++ b/Desktop/DirectWrite/CustomLayout/CustomLayoutForm.cs @@ -317,7 +317,7 @@ private void SetLayoutText(LayoutText layoutText) try { textFormat = new TextFormat(FactoryDWrite, fontName, null, FontWeight.Normal, SharpDX.DirectWrite.FontStyle.Normal, FontStretch.Normal, 14, localeName); - textFormat.SetReadingDirection(readingDirection); + textFormat.ReadingDirection = readingDirection; } catch (Exception ex) { diff --git a/Desktop/DirectWrite/CustomLayout/app.config b/Desktop/DirectWrite/CustomLayout/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectWrite/CustomLayout/app.config +++ b/Desktop/DirectWrite/CustomLayout/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectWrite/CustomLayout/packages.config b/Desktop/DirectWrite/CustomLayout/packages.config index 4ee488be..9f78939b 100644 --- a/Desktop/DirectWrite/CustomLayout/packages.config +++ b/Desktop/DirectWrite/CustomLayout/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj b/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj index 883e13f5..c7eea72c 100644 --- a/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj +++ b/Desktop/DirectWrite/FontEnumeration/FontEnumeration.csproj @@ -31,14 +31,14 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll @@ -61,4 +61,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectWrite/FontEnumeration/app.config b/Desktop/DirectWrite/FontEnumeration/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectWrite/FontEnumeration/app.config +++ b/Desktop/DirectWrite/FontEnumeration/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectWrite/FontEnumeration/packages.config b/Desktop/DirectWrite/FontEnumeration/packages.config index 5fa5212f..145a0a7e 100644 --- a/Desktop/DirectWrite/FontEnumeration/packages.config +++ b/Desktop/DirectWrite/FontEnumeration/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/SimpleHelloWorld/Program.cs b/Desktop/DirectWrite/SimpleHelloWorld/Program.cs index f49a0f80..8a6a2a82 100644 --- a/Desktop/DirectWrite/SimpleHelloWorld/Program.cs +++ b/Desktop/DirectWrite/SimpleHelloWorld/Program.cs @@ -43,8 +43,8 @@ protected override void Initialize(DemoConfiguration demoConfiguration) // Initialize a TextFormat TextFormat = new TextFormat(FactoryDWrite, "Gabriola", 96); - TextFormat.SetTextAlignment(TextAlignment.Center); - TextFormat.SetParagraphAlignment(ParagraphAlignment.Center); + TextFormat.TextAlignment = TextAlignment.Center; + TextFormat.ParagraphAlignment = ParagraphAlignment.Center; RenderTarget2D.TextAntialiasMode = TextAntialiasMode.Cleartype; diff --git a/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj b/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj index 0d6dc25b..20eaf529 100644 --- a/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj +++ b/Desktop/DirectWrite/SimpleHelloWorld/SimpleHelloWorld.csproj @@ -35,20 +35,20 @@ true - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -79,4 +79,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectWrite/SimpleHelloWorld/app.config b/Desktop/DirectWrite/SimpleHelloWorld/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectWrite/SimpleHelloWorld/app.config +++ b/Desktop/DirectWrite/SimpleHelloWorld/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectWrite/SimpleHelloWorld/packages.config b/Desktop/DirectWrite/SimpleHelloWorld/packages.config index 4ee488be..9f78939b 100644 --- a/Desktop/DirectWrite/SimpleHelloWorld/packages.config +++ b/Desktop/DirectWrite/SimpleHelloWorld/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/DirectWrite/TextDialog/TextDialog.cs b/Desktop/DirectWrite/TextDialog/TextDialog.cs index 058a7001..f39d2370 100644 --- a/Desktop/DirectWrite/TextDialog/TextDialog.cs +++ b/Desktop/DirectWrite/TextDialog/TextDialog.cs @@ -148,8 +148,8 @@ private void UpdateTextFormatAndLayout() // Initialize a TextFormat CurrentTextFormat = new TextFormat(FactoryDWrite, FontFamilyName, FontSize); - CurrentTextFormat.SetTextAlignment(TextAlignment.Center); - CurrentTextFormat.SetParagraphAlignment(ParagraphAlignment.Center); + CurrentTextFormat.TextAlignment = TextAlignment.Center; + CurrentTextFormat.ParagraphAlignment = ParagraphAlignment.Center; CurrentTextLayout = new TextLayout(FactoryDWrite, FontText, CurrentTextFormat, renderControl.Width, renderControl.Height); @@ -247,8 +247,8 @@ void RenderControlResize(object sender, System.EventArgs e) try { RenderTarget2D.Resize(new Size2(renderControl.Size.Width, renderControl.Size.Height)); - CurrentTextLayout.SetMaxWidth(renderControl.Size.Width); - CurrentTextLayout.SetMaxHeight(renderControl.Size.Height); + CurrentTextLayout.MaxWidth = renderControl.Size.Width; + CurrentTextLayout.MaxHeight = renderControl.Size.Height; } catch (Exception ex) { diff --git a/Desktop/DirectWrite/TextDialog/TextDialog.csproj b/Desktop/DirectWrite/TextDialog/TextDialog.csproj index 1eea922a..04ba99ec 100644 --- a/Desktop/DirectWrite/TextDialog/TextDialog.csproj +++ b/Desktop/DirectWrite/TextDialog/TextDialog.csproj @@ -35,20 +35,20 @@ false - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll @@ -82,4 +82,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/DirectWrite/TextDialog/app.config b/Desktop/DirectWrite/TextDialog/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/DirectWrite/TextDialog/app.config +++ b/Desktop/DirectWrite/TextDialog/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/DirectWrite/TextDialog/packages.config b/Desktop/DirectWrite/TextDialog/packages.config index 4ee488be..9f78939b 100644 --- a/Desktop/DirectWrite/TextDialog/packages.config +++ b/Desktop/DirectWrite/TextDialog/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj b/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj index 2eb849f3..8f31a538 100644 --- a/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj +++ b/Desktop/MediaFoundation/MediaEngineApp/MediaEngineApp.csproj @@ -33,20 +33,20 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll - - ..\..\..\packages\SharpDX.MediaFoundation.4.1.0\lib\net45\SharpDX.MediaFoundation.dll + + ..\..\..\packages\SharpDX.MediaFoundation.4.2.0\lib\net45\SharpDX.MediaFoundation.dll @@ -74,4 +74,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/MediaFoundation/MediaEngineApp/Program.cs b/Desktop/MediaFoundation/MediaEngineApp/Program.cs index f7dd18df..a5cec6a7 100644 --- a/Desktop/MediaFoundation/MediaEngineApp/Program.cs +++ b/Desktop/MediaFoundation/MediaEngineApp/Program.cs @@ -120,7 +120,7 @@ private static void OnPlaybackCallback(MediaEngineEvent playEvent, long param1, eventReadyToPlay.Set(); break; case MediaEngineEvent.TimeUpdate: - Console.Write(" {0}", TimeSpan.FromSeconds(mediaEngineEx.GetCurrentTime())); + Console.Write(" {0}", TimeSpan.FromSeconds(mediaEngineEx.CurrentTime)); break; case MediaEngineEvent.Error: case MediaEngineEvent.Abort: diff --git a/Desktop/MediaFoundation/MediaEngineApp/app.config b/Desktop/MediaFoundation/MediaEngineApp/app.config index 3dbff35f..1b627447 100644 --- a/Desktop/MediaFoundation/MediaEngineApp/app.config +++ b/Desktop/MediaFoundation/MediaEngineApp/app.config @@ -1,3 +1,24 @@ - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/Desktop/MediaFoundation/MediaEngineApp/packages.config b/Desktop/MediaFoundation/MediaEngineApp/packages.config index 644e7431..61231d08 100644 --- a/Desktop/MediaFoundation/MediaEngineApp/packages.config +++ b/Desktop/MediaFoundation/MediaEngineApp/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj b/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj index acd8a900..d52d0047 100644 --- a/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj +++ b/Desktop/MediaFoundation/MediaEngineAppVideo/MediaEngineAppVideo.csproj @@ -33,26 +33,26 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Desktop.4.1.0\lib\net45\SharpDX.Desktop.dll + + ..\..\..\packages\SharpDX.Desktop.4.2.0\lib\net45\SharpDX.Desktop.dll - - ..\..\..\packages\SharpDX.Direct3D11.4.1.0\lib\net45\SharpDX.Direct3D11.dll + + ..\..\..\packages\SharpDX.Direct3D11.4.2.0\lib\net45\SharpDX.Direct3D11.dll - - ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll - - ..\..\..\packages\SharpDX.MediaFoundation.4.1.0\lib\net45\SharpDX.MediaFoundation.dll + + ..\..\..\packages\SharpDX.MediaFoundation.4.2.0\lib\net45\SharpDX.MediaFoundation.dll @@ -80,4 +80,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/MediaFoundation/MediaEngineAppVideo/app.config b/Desktop/MediaFoundation/MediaEngineAppVideo/app.config index 3dbff35f..c2eaee64 100644 --- a/Desktop/MediaFoundation/MediaEngineAppVideo/app.config +++ b/Desktop/MediaFoundation/MediaEngineAppVideo/app.config @@ -1,3 +1,16 @@ - + - + + + + + + + + + + + + + + diff --git a/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config b/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config index cb6d241c..f9b6ee78 100644 --- a/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config +++ b/Desktop/MediaFoundation/MediaEngineAppVideo/packages.config @@ -1,10 +1,10 @@  - - - - - - - + + + + + + + \ No newline at end of file diff --git a/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj b/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj index 7644c27e..baf44103 100644 --- a/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj +++ b/Desktop/RawInput/RawInputTrackApp/RawInputTrackApp.csproj @@ -35,11 +35,11 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.RawInput.4.1.0\lib\net45\SharpDX.RawInput.dll + + ..\..\..\packages\SharpDX.RawInput.4.2.0\lib\net45\SharpDX.RawInput.dll @@ -64,4 +64,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/RawInput/RawInputTrackApp/packages.config b/Desktop/RawInput/RawInputTrackApp/packages.config index fdd677e4..3c6758b6 100644 --- a/Desktop/RawInput/RawInputTrackApp/packages.config +++ b/Desktop/RawInput/RawInputTrackApp/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Desktop/WIC/EncodeDecode/EncodeDecode.csproj b/Desktop/WIC/EncodeDecode/EncodeDecode.csproj index 6554015c..0c4f0aa6 100644 --- a/Desktop/WIC/EncodeDecode/EncodeDecode.csproj +++ b/Desktop/WIC/EncodeDecode/EncodeDecode.csproj @@ -35,14 +35,14 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Direct2D1.4.1.0\lib\net45\SharpDX.Direct2D1.dll + + ..\..\..\packages\SharpDX.Direct2D1.4.2.0\lib\net45\SharpDX.Direct2D1.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll @@ -67,4 +67,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/WIC/EncodeDecode/app.config b/Desktop/WIC/EncodeDecode/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/WIC/EncodeDecode/app.config +++ b/Desktop/WIC/EncodeDecode/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/WIC/EncodeDecode/packages.config b/Desktop/WIC/EncodeDecode/packages.config index 5fa5212f..145a0a7e 100644 --- a/Desktop/WIC/EncodeDecode/packages.config +++ b/Desktop/WIC/EncodeDecode/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj b/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj index 50d54cca..5afcc30c 100644 --- a/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj +++ b/Desktop/X3DAudio/BipBounceApp/BipBounceApp.csproj @@ -64,14 +64,14 @@ false - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll - - ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.2.0\lib\net45\SharpDX.XAudio2.dll @@ -95,4 +95,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/X3DAudio/BipBounceApp/app.config b/Desktop/X3DAudio/BipBounceApp/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/X3DAudio/BipBounceApp/app.config +++ b/Desktop/X3DAudio/BipBounceApp/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/X3DAudio/BipBounceApp/packages.config b/Desktop/X3DAudio/BipBounceApp/packages.config index 26b2b878..96b5f41b 100644 --- a/Desktop/X3DAudio/BipBounceApp/packages.config +++ b/Desktop/X3DAudio/BipBounceApp/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj b/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj index 8b4ff499..885b2f70 100644 --- a/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj +++ b/Desktop/XAudio2/AudioPlayerApp/AudioPlayerApp.csproj @@ -35,23 +35,23 @@ 4 - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.Direct3D9.4.1.0\lib\net45\SharpDX.Direct3D9.dll + + ..\..\..\packages\SharpDX.Direct3D9.4.2.0\lib\net45\SharpDX.Direct3D9.dll - - ..\..\..\packages\SharpDX.DXGI.4.1.0\lib\net45\SharpDX.DXGI.dll + + ..\..\..\packages\SharpDX.DXGI.4.2.0\lib\net45\SharpDX.DXGI.dll - - ..\..\..\packages\SharpDX.Mathematics.4.1.0\lib\net45\SharpDX.Mathematics.dll + + ..\..\..\packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll - - ..\..\..\packages\SharpDX.MediaFoundation.4.1.0\lib\net45\SharpDX.MediaFoundation.dll + + ..\..\..\packages\SharpDX.MediaFoundation.4.2.0\lib\net45\SharpDX.MediaFoundation.dll - - ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.2.0\lib\net45\SharpDX.XAudio2.dll @@ -133,4 +133,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/XAudio2/AudioPlayerApp/app.config b/Desktop/XAudio2/AudioPlayerApp/app.config index 3dbff35f..1b627447 100644 --- a/Desktop/XAudio2/AudioPlayerApp/app.config +++ b/Desktop/XAudio2/AudioPlayerApp/app.config @@ -1,3 +1,24 @@ - + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/Desktop/XAudio2/AudioPlayerApp/packages.config b/Desktop/XAudio2/AudioPlayerApp/packages.config index 139363c5..d2138165 100644 --- a/Desktop/XAudio2/AudioPlayerApp/packages.config +++ b/Desktop/XAudio2/AudioPlayerApp/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj b/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj index 442e11d3..12e14791 100644 --- a/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj +++ b/Desktop/XAudio2/PlayDynamicSound/PlayDynamicSound.csproj @@ -31,11 +31,11 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.2.0\lib\net45\SharpDX.XAudio2.dll @@ -58,4 +58,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/XAudio2/PlayDynamicSound/app.config b/Desktop/XAudio2/PlayDynamicSound/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/XAudio2/PlayDynamicSound/app.config +++ b/Desktop/XAudio2/PlayDynamicSound/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/XAudio2/PlayDynamicSound/packages.config b/Desktop/XAudio2/PlayDynamicSound/packages.config index 21dfe2ca..01f39cbe 100644 --- a/Desktop/XAudio2/PlayDynamicSound/packages.config +++ b/Desktop/XAudio2/PlayDynamicSound/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Desktop/XAudio2/PlaySound/PlaySound.csproj b/Desktop/XAudio2/PlaySound/PlaySound.csproj index db651bd2..77ae9b49 100644 --- a/Desktop/XAudio2/PlaySound/PlaySound.csproj +++ b/Desktop/XAudio2/PlaySound/PlaySound.csproj @@ -31,11 +31,11 @@ prompt - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.2.0\lib\net45\SharpDX.XAudio2.dll @@ -71,4 +71,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/XAudio2/PlaySound/packages.config b/Desktop/XAudio2/PlaySound/packages.config index 21dfe2ca..01f39cbe 100644 --- a/Desktop/XAudio2/PlaySound/packages.config +++ b/Desktop/XAudio2/PlaySound/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj b/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj index 90c40fc7..8ac523a9 100644 --- a/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj +++ b/Desktop/XAudio2/PlaySoundCustomXAPO/PlaySoundCustomXAPO.csproj @@ -36,11 +36,11 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.XAudio2.4.1.0\lib\net45\SharpDX.XAudio2.dll + + ..\..\..\packages\SharpDX.XAudio2.4.2.0\lib\net45\SharpDX.XAudio2.dll @@ -76,4 +76,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/XAudio2/PlaySoundCustomXAPO/app.config b/Desktop/XAudio2/PlaySoundCustomXAPO/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/XAudio2/PlaySoundCustomXAPO/app.config +++ b/Desktop/XAudio2/PlaySoundCustomXAPO/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config b/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config index 21dfe2ca..01f39cbe 100644 --- a/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config +++ b/Desktop/XAudio2/PlaySoundCustomXAPO/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Desktop/XInput/XGamepadApp/XGamepadApp.csproj b/Desktop/XInput/XGamepadApp/XGamepadApp.csproj index d15e9f08..fb43f3f5 100644 --- a/Desktop/XInput/XGamepadApp/XGamepadApp.csproj +++ b/Desktop/XInput/XGamepadApp/XGamepadApp.csproj @@ -35,11 +35,11 @@ - - ..\..\..\packages\SharpDX.4.1.0\lib\net45\SharpDX.dll + + ..\..\..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll - - ..\..\..\packages\SharpDX.XInput.4.1.0\lib\net45\SharpDX.XInput.dll + + ..\..\..\packages\SharpDX.XInput.4.2.0\lib\net45\SharpDX.XInput.dll @@ -64,4 +64,4 @@ --> - + \ No newline at end of file diff --git a/Desktop/XInput/XGamepadApp/app.config b/Desktop/XInput/XGamepadApp/app.config index 3dbff35f..24c52ed2 100644 --- a/Desktop/XInput/XGamepadApp/app.config +++ b/Desktop/XInput/XGamepadApp/app.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/Desktop/XInput/XGamepadApp/packages.config b/Desktop/XInput/XGamepadApp/packages.config index af861316..d673dd8c 100644 --- a/Desktop/XInput/XGamepadApp/packages.config +++ b/Desktop/XInput/XGamepadApp/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file