From 45db8bad6e1050404d0ab842a60747eb4db3b922 Mon Sep 17 00:00:00 2001
From: Aiden Eades <aiden.eades@asmpt.com>
Date: Thu, 1 Nov 2018 12:40:08 +0000
Subject: [PATCH 1/2] Changed project to .NET Standard, and test project to
 .NET Framework 4.7.1

---
 WindowsInput.Tests/InputSimulatorExamples.cs  | 42 --------
 WindowsInput.Tests/Properties/AssemblyInfo.cs |  1 -
 WindowsInput.Tests/WindowsInput.Tests.csproj  | 16 ++--
 WindowsInput/InputSimulator.cs                |  4 +-
 WindowsInput/WindowsInput.csproj              | 95 ++-----------------
 5 files changed, 16 insertions(+), 142 deletions(-)

diff --git a/WindowsInput.Tests/InputSimulatorExamples.cs b/WindowsInput.Tests/InputSimulatorExamples.cs
index d46fcd8..47e7728 100644
--- a/WindowsInput.Tests/InputSimulatorExamples.cs
+++ b/WindowsInput.Tests/InputSimulatorExamples.cs
@@ -7,15 +7,6 @@ namespace WindowsInput.Tests
     public class InputSimulatorExamples
     {
         [Test]
-        [Explicit]
-        public void OpenWindowsExplorer()
-        {
-            var sim = new InputSimulator();
-            sim.Keyboard.ModifiedKeyStroke(VirtualKeyCode.LWIN, VirtualKeyCode.VK_E);
-        }
-
-        [Test]
-        [Explicit]
         public void SayHello()
         {
             var sim = new InputSimulator();
@@ -45,38 +36,5 @@ public void SayHello()
                .ModifiedKeyStroke(VirtualKeyCode.MENU, VirtualKeyCode.F4)
                .KeyPress(VirtualKeyCode.VK_N);
         }
-
-        [Test]
-        [Explicit]
-        public void AnotherTest()
-        {
-            var sim = new InputSimulator();
-            sim.Keyboard.KeyPress(VirtualKeyCode.SPACE);
-
-            sim.Keyboard.ModifiedKeyStroke(VirtualKeyCode.LWIN, VirtualKeyCode.VK_R)
-               .Sleep(1000)
-               .TextEntry("mspaint")
-               .Sleep(1000)
-               .KeyPress(VirtualKeyCode.RETURN)
-               .Sleep(1000)
-               .Mouse
-               .LeftButtonDown()
-               .MoveMouseToPositionOnVirtualDesktop(65535/2, 65535/2)
-               .LeftButtonUp();
-
-        }
-
-        [Test]
-        [Explicit]
-        public void TestMouseMoveTo()
-        {
-            var sim = new InputSimulator();
-            sim.Mouse
-               .MoveMouseTo(0, 0)
-               .Sleep(1000)
-               .MoveMouseTo(65535, 65535)
-               .Sleep(1000)
-               .MoveMouseTo(65535/2, 65535/2);
-        }
     }
 }
\ No newline at end of file
diff --git a/WindowsInput.Tests/Properties/AssemblyInfo.cs b/WindowsInput.Tests/Properties/AssemblyInfo.cs
index d082ec1..541f6d8 100644
--- a/WindowsInput.Tests/Properties/AssemblyInfo.cs
+++ b/WindowsInput.Tests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/WindowsInput.Tests/WindowsInput.Tests.csproj b/WindowsInput.Tests/WindowsInput.Tests.csproj
index 0c66b34..f15f6f9 100644
--- a/WindowsInput.Tests/WindowsInput.Tests.csproj
+++ b/WindowsInput.Tests/WindowsInput.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WindowsInput.Tests</RootNamespace>
     <AssemblyName>WindowsInput.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -70,12 +70,6 @@
     </Compile>
     <Compile Include="UnicodeText\UnicodeTextTests.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\WindowsInput\WindowsInput.csproj">
-      <Project>{3549CD6F-80F8-450F-B99E-CF0A736B1F2A}</Project>
-      <Name>WindowsInput</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="WindowsInput.Tests.snk" />
@@ -85,6 +79,12 @@
       <DependentUpon>UnicodeTestForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\WindowsInput\WindowsInput.csproj">
+      <Project>{3549cd6f-80f8-450f-b99e-cf0a736b1f2a}</Project>
+      <Name>WindowsInput</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/WindowsInput/InputSimulator.cs b/WindowsInput/InputSimulator.cs
index 2e05958..fa8aa4c 100644
--- a/WindowsInput/InputSimulator.cs
+++ b/WindowsInput/InputSimulator.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace WindowsInput
+namespace WindowsInput
 {
     /// <summary>
     /// Implements the <see cref="IInputSimulator"/> interface to simulate Keyboard and Mouse input and provide the state of those input devices.
diff --git a/WindowsInput/WindowsInput.csproj b/WindowsInput/WindowsInput.csproj
index 9b27456..0b71861 100644
--- a/WindowsInput/WindowsInput.csproj
+++ b/WindowsInput/WindowsInput.csproj
@@ -1,92 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3549CD6F-80F8-450F-B99E-CF0A736B1F2A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WindowsInput</RootNamespace>
-    <AssemblyName>WindowsInput</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\WindowsInput.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\WindowsInput.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
+    <DelaySign>false</DelaySign>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyOriginatorKeyFile>WindowsInput.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IInputSimulator.cs" />
-    <Compile Include="IMouseSimulator.cs" />
-    <Compile Include="InputSimulator.cs" />
-    <Compile Include="MouseButton.cs" />
-    <Compile Include="MouseSimulator.cs" />
-    <Compile Include="Native\NativeMethods.cs" />
-    <Compile Include="Native\HARDWAREINPUT.cs" />
-    <Compile Include="IInputDeviceStateAdaptor.cs" />
-    <Compile Include="IInputMessageDispatcher.cs" />
-    <Compile Include="IKeyboardSimulator.cs" />
-    <Compile Include="Native\INPUT.cs" />
-    <Compile Include="InputBuilder.cs" />
-    <Compile Include="KeyboardSimulator.cs" />
-    <Compile Include="Native\InputType.cs" />
-    <Compile Include="Native\KEYBDINPUT.cs" />
-    <Compile Include="Native\KeyboardFlag.cs" />
-    <Compile Include="Native\MouseFlag.cs" />
-    <Compile Include="Native\MOUSEINPUT.cs" />
-    <Compile Include="Native\MOUSEKEYBDHARDWAREINPUT.cs" />
-    <Compile Include="WindowsInputDeviceStateAdaptor.cs" />
-    <Compile Include="WindowsInputMessageDispatcher.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Native\VirtualKeyCode.cs" />
-    <Compile Include="Native\XButton.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="WindowsInput.nuspec" />
-    <None Include="WindowsInput.snk" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>

From b515d19c0392e87e9cecde1c646aef1997cd47f8 Mon Sep 17 00:00:00 2001
From: Aiden Eades <aiden.eades@asmpt.com>
Date: Thu, 1 Nov 2018 12:42:15 +0000
Subject: [PATCH 2/2] Added back tests removed accidently

---
 WindowsInput.Tests/InputSimulatorExamples.cs | 42 ++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/WindowsInput.Tests/InputSimulatorExamples.cs b/WindowsInput.Tests/InputSimulatorExamples.cs
index 47e7728..d46fcd8 100644
--- a/WindowsInput.Tests/InputSimulatorExamples.cs
+++ b/WindowsInput.Tests/InputSimulatorExamples.cs
@@ -7,6 +7,15 @@ namespace WindowsInput.Tests
     public class InputSimulatorExamples
     {
         [Test]
+        [Explicit]
+        public void OpenWindowsExplorer()
+        {
+            var sim = new InputSimulator();
+            sim.Keyboard.ModifiedKeyStroke(VirtualKeyCode.LWIN, VirtualKeyCode.VK_E);
+        }
+
+        [Test]
+        [Explicit]
         public void SayHello()
         {
             var sim = new InputSimulator();
@@ -36,5 +45,38 @@ public void SayHello()
                .ModifiedKeyStroke(VirtualKeyCode.MENU, VirtualKeyCode.F4)
                .KeyPress(VirtualKeyCode.VK_N);
         }
+
+        [Test]
+        [Explicit]
+        public void AnotherTest()
+        {
+            var sim = new InputSimulator();
+            sim.Keyboard.KeyPress(VirtualKeyCode.SPACE);
+
+            sim.Keyboard.ModifiedKeyStroke(VirtualKeyCode.LWIN, VirtualKeyCode.VK_R)
+               .Sleep(1000)
+               .TextEntry("mspaint")
+               .Sleep(1000)
+               .KeyPress(VirtualKeyCode.RETURN)
+               .Sleep(1000)
+               .Mouse
+               .LeftButtonDown()
+               .MoveMouseToPositionOnVirtualDesktop(65535/2, 65535/2)
+               .LeftButtonUp();
+
+        }
+
+        [Test]
+        [Explicit]
+        public void TestMouseMoveTo()
+        {
+            var sim = new InputSimulator();
+            sim.Mouse
+               .MoveMouseTo(0, 0)
+               .Sleep(1000)
+               .MoveMouseTo(65535, 65535)
+               .Sleep(1000)
+               .MoveMouseTo(65535/2, 65535/2);
+        }
     }
 }
\ No newline at end of file