Moved examples. Added assembly info and nuspec.

wzfxue · Jan 15, 2018 · 2e8db7b · 2e8db7b
1 parent 6bdd2d1
commit 2e8db7b
Show file tree

Hide file tree

Showing 26 changed files with 77 additions and 54 deletions.
diff --git a/MouseKeyHook.Rx/MouseKeyHook.Rx.nuspec b/MouseKeyHook.Rx/MouseKeyHook.Rx.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <licenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</licenseUrl>
+    <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
+    <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
+    <copyright>Copyright 2018</copyright>
+    <tags>Tag1 Tag2</tags>
+  </metadata>
+</package>
diff --git a/MouseKeyHook.Rx/MouseObserverExtensions.cs b/MouseKeyHook.Rx/MouseObserverExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MouseKeyHook.Rx
+{
+    class MouseObserverExtensions
+    {
+    }
+}
diff --git a/MouseKeyHook.Rx/PointExtensions.cs b/MouseKeyHook.Rx/PointExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MouseKeyHook.Rx
+{
+    class PointExtensions
+    {
+    }
+}
diff --git a/MouseKeyHook.Rx/Properties/AssemblyInfo.cs b/MouseKeyHook.Rx/Properties/AssemblyInfo.cs
@@ -5,35 +5,11 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("MouseKeyHook.Rx")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MouseKeyHook.Rx")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
+[assembly:
+    AssemblyDescription(
+        "This is an extension to the MouseKeyHook library which allows you to observe keyboard and mouse venets in reactive manner using Rx.Net (System.Reactive) extensions."
+    )]
+[assembly: AssemblyCopyright("(c) George Mamaladze 2000-2018")]
 [assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9754749c-1eea-4468-8c32-b5bac3235f54")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0")]
diff --git a/MouseKeyHook.sln b/MouseKeyHook.sln
@@ -15,13 +15,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseKeyHook", "MouseKeyHook\MouseKeyHook.csproj", "{F52AA97E-180A-40ED-8F2B-09080171D6C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo", "Demo\Demo.csproj", "{693C8A54-2FA1-408B-9896-7CB1E5E9E257}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MouseKeyHook.Rx", "MouseKeyHook.Rx\MouseKeyHook.Rx.csproj", "{9754749C-1EEA-4468-8C32-B5BAC3235F54}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{1DE6BB2E-ED17-4507-9E71-65DA4580C131}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleHook.Rx", "ConsoleHook.Rx\ConsoleHook.Rx.csproj", "{F9B78F1A-F065-4BB4-A15B-393DFFE8DB0B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleHook.Rx", "examples\ConsoleHook.Rx\ConsoleHook.Rx.csproj", "{F9B78F1A-F065-4BB4-A15B-393DFFE8DB0B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsExample", "examples\FormsExample\FormsExample.csproj", "{693C8A54-2FA1-408B-9896-7CB1E5E9E257}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,14 +45,6 @@ Global
 		{F52AA97E-180A-40ED-8F2B-09080171D6C7}.Release|x64.Build.0 = Release|x64
 		{F52AA97E-180A-40ED-8F2B-09080171D6C7}.Release|x86.ActiveCfg = Release|x86
 		{F52AA97E-180A-40ED-8F2B-09080171D6C7}.Release|x86.Build.0 = Release|x86
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|Any CPU.Build.0 = Release|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|x64.ActiveCfg = Release|Any CPU
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|x86.ActiveCfg = Release|Any CPU
 		{9754749C-1EEA-4468-8C32-B5BAC3235F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9754749C-1EEA-4468-8C32-B5BAC3235F54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9754749C-1EEA-4468-8C32-B5BAC3235F54}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -77,12 +69,24 @@ Global
 		{F9B78F1A-F065-4BB4-A15B-393DFFE8DB0B}.Release|x64.Build.0 = Release|Any CPU
 		{F9B78F1A-F065-4BB4-A15B-393DFFE8DB0B}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9B78F1A-F065-4BB4-A15B-393DFFE8DB0B}.Release|x86.Build.0 = Release|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|x64.Build.0 = Debug|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Debug|x86.Build.0 = Debug|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|Any CPU.Build.0 = Release|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|x64.ActiveCfg = Release|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|x64.Build.0 = Release|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|x86.ActiveCfg = Release|Any CPU
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{693C8A54-2FA1-408B-9896-7CB1E5E9E257} = {1DE6BB2E-ED17-4507-9E71-65DA4580C131}
 		{F9B78F1A-F065-4BB4-A15B-393DFFE8DB0B} = {1DE6BB2E-ED17-4507-9E71-65DA4580C131}
+		{693C8A54-2FA1-408B-9896-7CB1E5E9E257} = {1DE6BB2E-ED17-4507-9E71-65DA4580C131}
 	EndGlobalSection
 EndGlobal
diff --git a/MouseKeyHook/MouseKeyHook.nuspec b/MouseKeyHook/MouseKeyHook.nuspec
@@ -3,7 +3,7 @@
 <package>
   <metadata>
     <id>MouseKeyHook</id>
-    <version>5.4.0</version>
+    <version>5.5.0</version>
     <title>$title$</title>
     <authors>George Mamaladze</authors>
     <owners>George Mamaladze</owners>
@@ -23,7 +23,7 @@
       Additionally, there is a possibility to supress certain keyboard or mouse clicks, or detect special key combinations.
     </description>
     <summary>This library allows you to tap keyboard and mouse, to detect and record their activity even when an application is inactive and runs in background.</summary>
-    <copyright>(c) George Mamaladze 2000-2014</copyright>
+    <copyright>(c) George Mamaladze 2000-2018</copyright>
     <tags>keyboard mouse hook event global spy</tags>
   </metadata>
 </package>
diff --git a/MouseKeyHook/Properties/AssemblyInfo.cs b/MouseKeyHook/Properties/AssemblyInfo.cs
@@ -10,6 +10,6 @@
     AssemblyDescription(
         "This library allows you to tap keyboard and mouse, to detect and record their activity even when an application is inactive and runs in background."
     )]
-[assembly: AssemblyCopyright("(c) George Mamaladze 2000-2014")]
+[assembly: AssemblyCopyright("(c) George Mamaladze 2000-2018")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.4.0")]
+[assembly: AssemblyVersion("5.5.0")]
diff --git a/ConsoleHook.Rx/App.config → examples/ConsoleHook.Rx/App.config b/ConsoleHook.Rx/App.config → examples/ConsoleHook.Rx/App.config
diff --git a/ConsoleHook.Rx/ConsoleHook.Rx.csproj → ...ples/ConsoleHook.Rx/ConsoleHook.Rx.csproj b/ConsoleHook.Rx/ConsoleHook.Rx.csproj → ...ples/ConsoleHook.Rx/ConsoleHook.Rx.csproj
@@ -70,11 +70,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MouseKeyHook.Rx\MouseKeyHook.Rx.csproj">
+    <ProjectReference Include="..\..\MouseKeyHook.Rx\MouseKeyHook.Rx.csproj">
       <Project>{9754749c-1eea-4468-8c32-b5bac3235f54}</Project>
       <Name>MouseKeyHook.Rx</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MouseKeyHook\MouseKeyHook.csproj">
+    <ProjectReference Include="..\..\MouseKeyHook\MouseKeyHook.csproj">
       <Project>{f52aa97e-180a-40ed-8f2b-09080171d6c7}</Project>
       <Name>MouseKeyHook</Name>
     </ProjectReference>

diff --git a/ConsoleHook.Rx/DetectCombinations.cs → ...ples/ConsoleHook.Rx/DetectCombinations.cs b/ConsoleHook.Rx/DetectCombinations.cs → ...ples/ConsoleHook.Rx/DetectCombinations.cs
diff --git a/ConsoleHook.Rx/DetectSequences.cs → examples/ConsoleHook.Rx/DetectSequences.cs b/ConsoleHook.Rx/DetectSequences.cs → examples/ConsoleHook.Rx/DetectSequences.cs
@@ -9,6 +9,7 @@
 using Gma.System.MouseKeyHook;
 using MouseKeyHook.Rx;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace ConsoleHook.Rx
 {
@@ -18,8 +19,8 @@ public static void Do(AutoResetEvent quit)
         {
             var expected = new HashSet<KeySequence>
             {
-                new KeySequence(Keys.Control, Keys.Q),
-                new KeySequence(Keys.Alt, Keys.Shift)
+                new KeySequence(Keys.A, Keys.B, Keys.C),
+                new KeySequence(Keys.Q, Keys.Q)  
             };
 
             Hook
@@ -29,7 +30,7 @@ public static void Do(AutoResetEvent quit)
                 //.Matching(expected)
                 .ForEachAsync(sequence =>
                 {
-                    if (sequence.ToString() == "Control+Q") quit.Set();
+                    if (sequence.SequenceEqual(new []{Keys.Q, Keys.Q})) quit.Set();
                     Console.WriteLine(sequence);
                 });
 

diff --git a/ConsoleHook.Rx/Program.cs → examples/ConsoleHook.Rx/Program.cs b/ConsoleHook.Rx/Program.cs → examples/ConsoleHook.Rx/Program.cs
@@ -18,8 +18,8 @@ private static void Main(string[] args)
 
             var selector = new Dictionary<string, Action<AutoResetEvent>>
             {
-                {"1. Detect key sequence", DetectSequences.Do},
-                {"2. Detect key combinationss", DetectCombinations.Do},
+                {"1. Detect key combinationss", DetectCombinations.Do},
+                {"2. Detect key sequence", DetectSequences.Do},
                 {"Q. Quit", Exit}
             };
 

diff --git a/ConsoleHook.Rx/Properties/AssemblyInfo.cs → ...ConsoleHook.Rx/Properties/AssemblyInfo.cs b/ConsoleHook.Rx/Properties/AssemblyInfo.cs → ...ConsoleHook.Rx/Properties/AssemblyInfo.cs
diff --git a/ConsoleHook.Rx/packages.config → examples/ConsoleHook.Rx/packages.config b/ConsoleHook.Rx/packages.config → examples/ConsoleHook.Rx/packages.config
diff --git a/Demo/App.config → examples/FormsExample/App.config b/Demo/App.config → examples/FormsExample/App.config
diff --git a/Demo/Demo.csproj → examples/FormsExample/FormsExample.csproj b/Demo/Demo.csproj → examples/FormsExample/FormsExample.csproj
@@ -81,7 +81,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MouseKeyHook\MouseKeyHook.csproj">
+    <ProjectReference Include="..\..\MouseKeyHook\MouseKeyHook.csproj">
       <Project>{F52AA97E-180A-40ED-8F2B-09080171D6C7}</Project>
       <Name>MouseKeyHook</Name>
     </ProjectReference>

diff --git a/Demo/Main.Designer.cs → examples/FormsExample/Main.Designer.cs b/Demo/Main.Designer.cs → examples/FormsExample/Main.Designer.cs
diff --git a/Demo/Main.cs → examples/FormsExample/Main.cs b/Demo/Main.cs → examples/FormsExample/Main.cs
diff --git a/Demo/Main.resx → examples/FormsExample/Main.resx b/Demo/Main.resx → examples/FormsExample/Main.resx
diff --git a/Demo/Program.cs → examples/FormsExample/Program.cs b/Demo/Program.cs → examples/FormsExample/Program.cs
diff --git a/Demo/Properties/AssemblyInfo.cs → ...s/FormsExample/Properties/AssemblyInfo.cs b/Demo/Properties/AssemblyInfo.cs → ...s/FormsExample/Properties/AssemblyInfo.cs
diff --git a/Demo/Properties/Resources.Designer.cs → ...sExample/Properties/Resources.Designer.cs b/Demo/Properties/Resources.Designer.cs → ...sExample/Properties/Resources.Designer.cs
diff --git a/Demo/Properties/Resources.resx → ...es/FormsExample/Properties/Resources.resx b/Demo/Properties/Resources.resx → ...es/FormsExample/Properties/Resources.resx
diff --git a/Demo/Properties/Settings.Designer.cs → ...msExample/Properties/Settings.Designer.cs b/Demo/Properties/Settings.Designer.cs → ...msExample/Properties/Settings.Designer.cs
diff --git a/Demo/Properties/Settings.settings → ...FormsExample/Properties/Settings.settings b/Demo/Properties/Settings.settings → ...FormsExample/Properties/Settings.settings
diff --git a/Demo/Sample.cs → examples/FormsExample/Sample.cs b/Demo/Sample.cs → examples/FormsExample/Sample.cs