Refactors project structure

guFalcon · guFalcon · commit 9d6000aa7b6c · 2017-11-03T08:51:30.000+01:00
Updates version
diff --git a/InputStateManager/InputManager.cs b/InputStateManager/InputManager.cs
@@ -25,16 +25,13 @@
 // For more information, please refer to <http://unlicense.org>
 // ***************************************************************************
 
-using Inputs.Inputs.GamePad;
-using Inputs.Inputs.Keyboard;
-using Inputs.Inputs.Mouse;
-using Inputs.Inputs.TouchPanel;
+using InputStateManager.Inputs;
 using JetBrains.Annotations;
 
-namespace Inputs
+namespace InputStateManager
 {
     [PublicAPI]
-    public class InputStateManager
+    public class InputManager
     {
         public Mouse Mouse { get; } = new Mouse();
         public Pad Pad { get; } = new Pad();
diff --git a/InputStateManager/InputStateManager.csproj b/InputStateManager/InputStateManager.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{48D4510A-1D34-4F2F-B8D1-72617109B28F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Inputs</RootNamespace>
-    <AssemblyName>Inputs</AssemblyName>
+    <RootNamespace>InputStateManager</RootNamespace>
+    <AssemblyName>InputStateManager</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -47,12 +47,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Inputs\GamePad\GamePadStates.cs" />
-    <Compile Include="Inputs\GamePad\Pad.cs" />
-    <Compile Include="InputStateManager.cs" />
-    <Compile Include="Inputs\Keyboard\Key.cs" />
-    <Compile Include="Inputs\Mouse\Mouse.cs" />
+    <Compile Include="Inputs\Pad.cs" />
+    <Compile Include="InputManager.cs" />
+    <Compile Include="Inputs\Key.cs" />
+    <Compile Include="Inputs\Mouse.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Inputs\TouchPanel\Touch.cs" />
+    <Compile Include="Inputs\Touch.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/InputStateManager/InputStateManager.sln b/InputStateManager/InputStateManager.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Inputs", "Inputs.csproj", "{48D4510A-1D34-4F2F-B8D1-72617109B28F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InputStateManager", "InputStateManager.csproj", "{48D4510A-1D34-4F2F-B8D1-72617109B28F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "..\Test\Test.csproj", "{5B47FE90-22E2-4184-A09D-03BAA54CBBB0}"
 EndProject
diff --git a/InputStateManager/Inputs.nuspec b/InputStateManager/Inputs.nuspec
@@ -10,9 +10,9 @@
 	<iconUrl>https://github.com/UnterrainerInformatik/InputStateManager/raw/master/icon.png</iconUrl>
     <projectUrl>https://github.com/UnterrainerInformatik/InputStateManager</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>A helper class for MonoGame useful for querying keyboard, mouse, touch and gamepad inputs.</description>
+    <description>A helper class (InputStateManager) for MonoGame useful for querying keyboard, mouse, touch and gamepad inputs.</description>
     <summary>
-      A helper class for MonoGame useful for querying keyboard, mouse, touch and gamepad inputs.
+      A helper class (InputStateManager) for MonoGame useful for querying keyboard, mouse, touch and gamepad inputs.
 		Currently it provides convenience-methods in a fluent manner for:
 		- Keyboard (Key) Sub-context for 'Is' and 'Was', helper functions for 'Any-ALT (...SHIFT, CTRL)' and NumLock and CapsLock.
 		- Mouse (Mouse) Sub-context for 'Is' and 'Was' and delta-functions for mouse-wheel, position, etc...
diff --git a/InputStateManager/Inputs/GamePad/GamePadStates.cs b/InputStateManager/Inputs/GamePad/GamePadStates.cs
@@ -29,7 +29,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 
-namespace Inputs.Inputs.GamePad
+namespace InputStateManager.Inputs.GamePad
 {
     [PublicAPI]
     class GamePadStates
diff --git a/InputStateManager/Inputs/Key.cs b/InputStateManager/Inputs/Key.cs
@@ -29,7 +29,7 @@
 using JetBrains.Annotations;
 using Microsoft.Xna.Framework.Input;
 
-namespace Inputs.Inputs.Keyboard
+namespace InputStateManager.Inputs
 {
     [PublicAPI]
     public class Key
diff --git a/InputStateManager/Inputs/Mouse.cs b/InputStateManager/Inputs/Mouse.cs
@@ -30,7 +30,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 
-namespace Inputs.Inputs.Mouse
+namespace InputStateManager.Inputs
 {
     [PublicAPI]
     public class Mouse
diff --git a/InputStateManager/Inputs/Pad.cs b/InputStateManager/Inputs/Pad.cs
@@ -26,11 +26,12 @@
 // ***************************************************************************
 
 using System;
+using InputStateManager.Inputs.GamePad;
 using JetBrains.Annotations;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 
-namespace Inputs.Inputs.GamePad
+namespace InputStateManager.Inputs
 {
     [PublicAPI]
     public class Pad
diff --git a/InputStateManager/Inputs/Touch.cs b/InputStateManager/Inputs/Touch.cs
@@ -30,7 +30,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input.Touch;
 
-namespace Inputs.Inputs.TouchPanel
+namespace InputStateManager.Inputs
 {
     [PublicAPI]
     public class Touch
diff --git a/InputStateManager/Properties/AssemblyInfo.cs b/InputStateManager/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.4")]
-[assembly: AssemblyFileVersion("1.0.0.4")]
+[assembly: AssemblyVersion("1.1.0.1")]
+[assembly: AssemblyFileVersion("1.1.0.1")]
diff --git a/Test/Game1.cs b/Test/Game1.cs
@@ -26,12 +26,12 @@
 // ***************************************************************************
 
 using System.Text;
-using Inputs;
-using Inputs.Inputs.GamePad;
+using InputStateManager;
+using InputStateManager.Inputs;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
-using Mouse = Inputs.Inputs.Mouse.Mouse;
+using Mouse = InputStateManager.Inputs.Mouse;
 
 namespace Test
 {
@@ -45,7 +45,7 @@ public class Game1 : Game
 
         SpriteBatch spriteBatch;
         private SpriteFont font;
-        private readonly InputStateManager input = new InputStateManager();
+        private readonly InputManager input = new InputManager();
 
         public Game1()
         {
diff --git a/Test/Properties/AssemblyInfo.cs b/Test/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("3.4.0.459")]
-[assembly: AssemblyFileVersion("3.4.0.459")]
+[assembly: AssemblyVersion("3.4.1.0")]
+[assembly: AssemblyFileVersion("3.4.1.0")]
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -114,9 +114,9 @@
     <None Include="Content\AnonymousPro8.spritefont" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\InputStateManager\Inputs.csproj">
+    <ProjectReference Include="..\InputStateManager\InputStateManager.csproj">
       <Project>{48D4510A-1D34-4F2F-B8D1-72617109B28F}</Project>
-      <Name>Inputs</Name>
+      <Name>InputStateManager</Name>
     </ProjectReference>
   </ItemGroup>
   <!-- Specify the search path explicitly so the ResolveAssemblyReferences task picks the right ones -->

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`using Microsoft.Xna.Framework;`
`30`	`30`	`using Microsoft.Xna.Framework.Input;`
`31`	`31`
`32`		`-namespace Inputs.Inputs.GamePad`
	`32`	`+namespace InputStateManager.Inputs.GamePad`
`33`	`33`	`{`
`34`	`34`	`[PublicAPI]`
`35`	`35`	`class GamePadStates`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`using Microsoft.Xna.Framework;`
`31`	`31`	`using Microsoft.Xna.Framework.Input;`
`32`	`32`
`33`		`-namespace Inputs.Inputs.Mouse`
	`33`	`+namespace InputStateManager.Inputs`
`34`	`34`	`{`
`35`	`35`	`[PublicAPI]`
`36`	`36`	`public class Mouse`