XInput fix (#944)

XInput fix loading dll when running net standard and net desktop.
Fix XInput9_1_0 not being loaded correctly.

* Missing commit

Author: amerkoleci

Source/SharpDX.XInput/Controller.cs

@@ -163,7 +163,7 @@ public bool IsConnected
             }
         }
 
-#if DESKTOP_APP
+#if !WINDOWS_UWP
         static Controller()
         {
             if(LoadLibrary("xinput1_4.dll") != IntPtr.Zero)
@@ -176,7 +176,7 @@ static Controller()
             }
             else if (LoadLibrary("xinput9_1_0.dll") != IntPtr.Zero)
             {
-                xinput = new XInput13();
+                xinput = new XInput910();
             }
         }
 

Source/SharpDX.XInput/XInput13.cs

@@ -17,7 +17,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if DESKTOP_APP
+#if !WINDOWS_UWP
 
 using System;
 using System.Runtime.InteropServices;

Source/SharpDX.XInput/XInput910.cs

@@ -17,7 +17,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-#if DESKTOP_APP
+#if !WINDOWS_UWP
 using System;
 using System.Runtime.InteropServices;
 using SharpDX.Mathematics.Interop;