Add support for net40 target (issue #877)

sharpdx · Apr 10, 2017 · 057f462 · 057f462
1 parent 56eaf4a
commit 057f462
Show file tree

Hide file tree

Showing 60 changed files with 210 additions and 341 deletions.
diff --git a/Build/SharpDX.targets b/Build/SharpDX.targets
@@ -1,4 +1,25 @@
 <Project>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
+    <DefineConstants>$(DefineConstants);DESKTOP_APP;BEFORE_NET45</DefineConstants>
+    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'netcoreapp1.0' ">
+    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
+    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
+    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
+    <SharpDXAppType>STORE_APP</SharpDXAppType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
+    <SharpDXAppType>REFERENCE</SharpDXAppType>
+    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
+  </PropertyGroup>
+
   <Target Name="PatchAssembly" AfterTargets="AfterBuild">
     <Exec Command="&quot;$(SolutionDir)\Source\Bin\SharpCLI.exe&quot; &quot;$(TargetPath)&quot;" />
 

diff --git a/Source/SharpDX.Animation/SharpDX.Animation.csproj b/Source/SharpDX.Animation/SharpDX.Animation.csproj
@@ -1,21 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1</TargetFrameworks>
     <PackageId>SharpDX.Animation</PackageId>
     <Product>SharpDX.Animation</Product>
     <AssemblyTitle>SharpDX.Animation</AssemblyTitle>
     <Title>SharpDX.Animation</Title>
     <Description>Assembly providing DirectX - Animation managed API.</Description>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj b/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj
@@ -1,25 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.D3DCompiler</PackageId>
     <Product>SharpDX.D3DCompiler</Product>
     <AssemblyTitle>SharpDX.D3DCompiler</AssemblyTitle>
     <Title>SharpDX.D3DCompiler</Title>
     <Description>Assembly providing DirectX - D3DCompiler managed API.</Description>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.DXGI/SharpDX.DXGI.csproj b/Source/SharpDX.DXGI/SharpDX.DXGI.csproj
@@ -1,26 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.DXGI</PackageId>
     <Product>SharpDX.DXGI</Product>
     <AssemblyTitle>SharpDX.DXGI</AssemblyTitle>
     <Title>SharpDX.DXGI</Title>
     <Description>Assembly providing DirectX - DXGI managed API.</Description>
     <PackageTags>$(PackageTags) DXGI</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.Desktop/SharpDX.Desktop.csproj b/Source/SharpDX.Desktop/SharpDX.Desktop.csproj
@@ -1,17 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net40;net45</TargetFrameworks>
     <PackageId>SharpDX.Desktop</PackageId>
     <Product>SharpDX.Desktop</Product>
     <AssemblyTitle>SharpDX.Desktop</AssemblyTitle>
     <Title>SharpDX.Desktop</Title>
     <Description>Assembly providing APIs related to Desktop platform.</Description>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <Compile Include="..\SharedAssemblyInfo.cs">

diff --git a/Source/SharpDX.Direct2D1/CustomEffectFactory.cs b/Source/SharpDX.Direct2D1/CustomEffectFactory.cs
@@ -87,7 +87,11 @@ public string ToXml()
         private void InitializeBindings()
         {
             var bindings = new List<PropertyBinding>();
+#if BEFORE_NET45
+            foreach (var propertyInfo in customEffectType.GetTypeInfo().GetProperties(BindingFlags.Public|BindingFlags.Instance))
+#else
             foreach (var propertyInfo in customEffectType.GetTypeInfo().DeclaredProperties)
+#endif
             {
                 var binding = PropertyBinding.Get(customEffectType, propertyInfo);
                 if (binding != null) 

diff --git a/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj b/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj
@@ -1,26 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct2D1</PackageId>
     <Product>SharpDX.Direct2D1</Product>
     <AssemblyTitle>SharpDX.Direct2D1</AssemblyTitle>
     <Title>SharpDX.Direct2D1</Title>
     <Description>Assembly providing DirectX - Direct2D, DirectWrite and WIC managed API.</Description>
     <PackageTags>$(PackageTags) 3D Direct2D D2D DirectWrite DWrite WIC</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj b/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj
@@ -1,26 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D10</PackageId>
     <Product>SharpDX.Direct3D10</Product>
     <AssemblyTitle>SharpDX.Direct3D10</AssemblyTitle>
     <Title>SharpDX.Direct3D10</Title>
     <Description>Assembly providing DirectX - Direct3D10 and Direct3D10.1 managed API.</Description>
     <PackageTags>$(PackageTags) Direct3D10 D3D10</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj b/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D11.Effects</PackageId>
     <Product>SharpDX.Direct3D11.Effects</Product>
     <AssemblyTitle>SharpDX.Direct3D11.Effects</AssemblyTitle>
@@ -10,18 +10,6 @@
     <PackageTags>$(PackageTags) 3D Direct3D11 D3D11 Effects11</PackageTags>
     <RuntimeIdentifiers>win-x86;win-x64;win8-arm</RuntimeIdentifiers>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj b/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj
@@ -1,26 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D11</PackageId>
     <Product>SharpDX.Direct3D11</Product>
     <AssemblyTitle>SharpDX.Direct3D11</AssemblyTitle>
     <Title>SharpDX.Direct3D11</Title>
     <Description>Assembly providing DirectX - Direct3D11, Direct3D11.1 and Effects11 managed API.</Description>
     <PackageTags>$(PackageTags) 3D Direct3D11 D3D11 Effects11</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj b/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj
@@ -1,26 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D12</PackageId>
     <Product>SharpDX.Direct3D12</Product>
     <AssemblyTitle>SharpDX.Direct3D12</AssemblyTitle>
     <Title>SharpDX.Direct3D12</Title>
     <Description>Assembly providing DirectX - Direct3D12 managed API.</Description>
     <PackageTags>$(PackageTags) Direct3D12 D3D12</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
-    <SharpDXAppType>STORE_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.Direct3D9/Device.cs b/Source/SharpDX.Direct3D9/Device.cs
@@ -22,7 +22,6 @@
 using System.Globalization;
 using System.Reflection;
 using SharpDX.Mathematics.Interop;
-using System.Reflection;
 
 namespace SharpDX.Direct3D9
 {

diff --git a/Source/SharpDX.Direct3D9/Fill3DCallback.cs b/Source/SharpDX.Direct3D9/Fill3DCallback.cs
@@ -47,8 +47,8 @@ namespace SharpDX.Direct3D9
     /// </summary>
     internal static class FillCallbackHelper
     {
-        private static unsafe Delegate native2DCallback = new Fill2DCallbackDelegate(Fill2DCallbackImpl);
-        private static unsafe Delegate native3DCallback = new Fill3DCallbackDelegate(Fill3DCallbackImpl);
+        private static unsafe Fill2DCallbackDelegate native2DCallback = new Fill2DCallbackDelegate(Fill2DCallbackImpl);
+        private static unsafe Fill3DCallbackDelegate native3DCallback = new Fill3DCallbackDelegate(Fill3DCallbackImpl);
 
         /// <summary>
         /// Pointer to the native callback for 2D function
@@ -60,7 +60,7 @@ internal static class FillCallbackHelper
         /// </summary>
         public static IntPtr Native3DCallbackPtr;
 
-        static FillCallbackHelper()
+        static unsafe FillCallbackHelper()
         {
             Native2DCallbackPtr = Marshal.GetFunctionPointerForDelegate(native2DCallback);
             Native3DCallbackPtr = Marshal.GetFunctionPointerForDelegate(native3DCallback);

diff --git a/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj b/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj
@@ -1,22 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.Direct3D9</PackageId>
     <Product>SharpDX.Direct3D9</Product>
     <AssemblyTitle>SharpDX.Direct3D9</AssemblyTitle>
     <Title>SharpDX.Direct3D9</Title>
     <Description>Assembly providing DirectX - Direct3D9 managed API.</Description>
     <PackageTags>$(PackageTags) Direct3D9 D3D9</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj b/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj
@@ -1,22 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.DirectComposition</PackageId>
     <Product>SharpDX.DirectComposition</Product>
     <AssemblyTitle>SharpDX.DirectComposition</AssemblyTitle>
     <Title>SharpDX.DirectComposition</Title>
     <Description>Assembly providing DirectX - DirectComposition managed API.</Description>
     <PackageTags>$(PackageTags) DirectComposition DComposition</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />

diff --git a/Source/SharpDX.DirectInput/CustomDevice.cs b/Source/SharpDX.DirectInput/CustomDevice.cs
@@ -150,7 +150,7 @@ private DataFormat GetDataFormat()
                     var dataObjects = new List<DataObjectFormat>();
 
                     IEnumerable<FieldInfo> fields;
-#if NET45
+#if NET45 || BEFORE_NET45
                     fields = typeof(TRaw).GetFields(BindingFlags.Public|BindingFlags.NonPublic|BindingFlags.Instance);
 #elif NETCOREAPP1_0
                     fields = typeof(TRaw).GetTypeInfo().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);

diff --git a/Source/SharpDX.DirectInput/Device.cs b/Source/SharpDX.DirectInput/Device.cs
@@ -254,7 +254,7 @@ public void RunControlPanel(IntPtr parentHwnd)
         public void SetNotification(WaitHandle eventHandle)
         {
             Microsoft.Win32.SafeHandles.SafeWaitHandle safeHandle;
-#if NET45
+#if NET45 || BEFORE_NET45
             safeHandle = eventHandle?.SafeWaitHandle;
 #else
             safeHandle = eventHandle?.GetSafeWaitHandle();

diff --git a/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj b/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj
@@ -1,22 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.3</TargetFrameworks>
     <PackageId>SharpDX.DirectInput</PackageId>
     <Product>SharpDX.DirectInput</Product>
     <AssemblyTitle>SharpDX.DirectInput</AssemblyTitle>
     <Title>SharpDX.DirectInput</Title>
     <Description>Assembly providing DirectX - DirectInput managed API.</Description>
     <PackageTags>$(PackageTags) DirectInput DInput</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR  '$(TargetFramework)' == 'netcoreapp1.0' ">
-    <DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
-    <SharpDXAppType>DESKTOP_APP</SharpDXAppType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
-    <SharpDXAppType>REFERENCE</SharpDXAppType>
-  </PropertyGroup>
   <ItemGroup>
     <None Include="Documentation\CodeComments.xml" />
     <None Include="Mapping.xml" />