Skip to content

Commit d2c3d64

Browse files
Terence-DTerence-D
authored
Merge pull request #30 from Terence-D/Dev1.0
1.5
2 parents 0b17bb5 + 0e55419 commit d2c3d64

9 files changed

+346
-23
lines changed

‎GameInputCommandSystem/App.config

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
55
<section name="GameInputCommandSystem.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
@@ -16,11 +16,19 @@
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
2432
</dependentAssembly>
2533
</assemblyBinding>
2634
</runtime>

‎GameInputCommandSystem/App_Start/SwaggerConfig.cs

+255
Large diffs are not rendered by default.

‎GameInputCommandSystem/Controllers/KeyController.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@ limitations under the License.
1818
*/
1919
namespace GameInputCommandSystem.Controllers
2020
{
21+
/**
22+
* Used for commands related to a standard key up/down event
23+
* */
2124
[Authorize]
2225
public class KeyController : ApiController
2326
{
24-
// POST api/key
27+
/**
28+
* Client will send in a specific key command along with modifiers and the event type - key down or key up
29+
* */
2530
public void Post([FromBody]Command value)
2631
{
2732
KeyMaster.SendCommand(value, false);

‎GameInputCommandSystem/Controllers/ToggleController.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@ limitations under the License.
1818
*/
1919
namespace GameInputCommandSystem.Controllers
2020
{
21+
/**
22+
* Used for quick toggle commands
23+
* */
2124
[Authorize]
2225
public class ToggleController : ApiController
2326
{
24-
// POST api/toggle
27+
/**
28+
* Client will send in a specific key command along with modifiers and the event type.
29+
* The server will process both the key down and up commands.
30+
* */
2531
public void Post([FromBody]Command value)
2632
{
2733
KeyMaster.SendCommand(value, true);

‎GameInputCommandSystem/Controllers/VersionController.cs

+23-2
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,37 @@
99
using System.Diagnostics;
1010
using System.Net;
1111

12+
/**
13+
Copyright [2019] [Terence Doerksen]
14+
15+
Licensed under the Apache License, Version 2.0 (the "License");
16+
you may not use this file except in compliance with the License.
17+
You may obtain a copy of the License at
18+
19+
http://www.apache.org/licenses/LICENSE-2.0
20+
21+
Unless required by applicable law or agreed to in writing, software
22+
distributed under the License is distributed on an "AS IS" BASIS,
23+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
24+
See the License for the specific language governing permissions and
25+
limitations under the License.
26+
*/
1227
namespace GameInputCommandSystem.Controllers
1328
{
29+
/**
30+
* Used to validate the version of the server is what the client expects
31+
* */
1432
public class VersionController : ApiController
1533
{
16-
// Get api/version
34+
private const string API_VERSION = "1.3.0.0";
35+
/**
36+
* Returns current API version of this server
37+
* */
1738
public HttpResponseMessage Get()
1839
{
1940
Assembly assembly = Assembly.GetExecutingAssembly();
2041
//FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
21-
string version = "1.3.0.0";// fileVersionInfo.ProductVersion;
42+
string version = API_VERSION;// fileVersionInfo.ProductVersion;
2243

2344
return Request.CreateResponse(HttpStatusCode.OK, version, Configuration.Formatters.JsonFormatter);
2445
}

‎GameInputCommandSystem/GameInputCommandSystem.csproj

+25-10
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
<UpdateRequired>false</UpdateRequired>
2626
<MapFileExtensions>true</MapFileExtensions>
2727
<AutorunEnabled>true</AutorunEnabled>
28-
<ApplicationRevision>1</ApplicationRevision>
29-
<ApplicationVersion>1.4.0.%2a</ApplicationVersion>
28+
<ApplicationRevision>0</ApplicationRevision>
29+
<ApplicationVersion>1.5.0.%2a</ApplicationVersion>
3030
<UseApplicationTrust>false</UseApplicationTrust>
3131
<PublishWizardCompleted>true</PublishWizardCompleted>
3232
<BootstrapperEnabled>true</BootstrapperEnabled>
@@ -49,6 +49,7 @@
4949
<DefineConstants>TRACE</DefineConstants>
5050
<ErrorReport>prompt</ErrorReport>
5151
<WarningLevel>4</WarningLevel>
52+
<DocumentationFile>bin\Release\GameInputCommandSystem.xml</DocumentationFile>
5253
</PropertyGroup>
5354
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
5455
<DebugSymbols>true</DebugSymbols>
@@ -96,36 +97,46 @@
9697
<SpecificVersion>False</SpecificVersion>
9798
<HintPath>C:\Program Files (x86)\AutoIt3\AutoItX\AutoItX3.Assembly.dll</HintPath>
9899
</Reference>
99-
<Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100-
<HintPath>..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
100+
<Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101+
<HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
101102
</Reference>
102-
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
103-
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
103+
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104+
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.4.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
104105
</Reference>
105-
<Reference Include="Microsoft.Owin.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106-
<HintPath>..\packages\Microsoft.Owin.Hosting.4.0.0\lib\net451\Microsoft.Owin.Hosting.dll</HintPath>
106+
<Reference Include="Microsoft.Owin.Hosting, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107+
<HintPath>..\packages\Microsoft.Owin.Hosting.4.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
107108
</Reference>
108-
<Reference Include="Microsoft.Owin.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109-
<HintPath>..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll</HintPath>
109+
<Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110+
<HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
111+
</Reference>
112+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
110114
</Reference>
111115
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
112116
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
113117
</Reference>
114118
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
115119
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
116120
</Reference>
121+
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
122+
<HintPath>..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll</HintPath>
123+
</Reference>
117124
<Reference Include="System" />
118125
<Reference Include="System.Data" />
119126
<Reference Include="System.Drawing" />
120127
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
121128
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
122129
</Reference>
130+
<Reference Include="System.Web" />
123131
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124132
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
125133
</Reference>
126134
<Reference Include="System.Web.Http.Owin, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127135
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll</HintPath>
128136
</Reference>
137+
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
138+
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
139+
</Reference>
129140
<Reference Include="System.Windows.Forms" />
130141
<Reference Include="System.Xml" />
131142
<Reference Include="Microsoft.CSharp" />
@@ -139,6 +150,9 @@
139150
<Reference Include="Thinktecture.IdentityModel.Owin.BasicAuthentication, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
140151
<HintPath>..\packages\Thinktecture.IdentityModel.Owin.BasicAuthentication.1.0.1\lib\net45\Thinktecture.IdentityModel.Owin.BasicAuthentication.dll</HintPath>
141152
</Reference>
153+
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
154+
<HintPath>..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
155+
</Reference>
142156
<Reference Include="WindowsBase" />
143157
<Reference Include="PresentationCore" />
144158
<Reference Include="PresentationFramework" />
@@ -160,6 +174,7 @@
160174
<DependentUpon>App.xaml</DependentUpon>
161175
<SubType>Code</SubType>
162176
</Compile>
177+
<Compile Include="App_Start\SwaggerConfig.cs" />
163178
<Compile Include="Controllers\KeyController.cs" />
164179
<Compile Include="Controllers\ToggleController.cs" />
165180
<Compile Include="Controllers\VersionController.cs" />

‎GameInputCommandSystem/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.4.0.1")]
55-
[assembly: AssemblyFileVersion("1.4.0.1")]
54+
[assembly: AssemblyVersion("1.5.0.0")]
55+
[assembly: AssemblyFileVersion("1.5.0.0")]

‎GameInputCommandSystem/Startup.cs

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Newtonsoft.Json;
22
using Newtonsoft.Json.Serialization;
33
using Owin;
4+
using Swashbuckle.Application;
45
using System.Collections.Generic;
56
using System.Net.Http.Formatting;
67
using System.Net.Http.Headers;
@@ -41,6 +42,13 @@ public void Configuration(IAppBuilder appBuilder)
4142
appBuilder.UseBasicAuthentication(new BasicAuthenticationOptions("SecureApi",
4243
async (username, password) => await Authenticate(username, password)));
4344

45+
//Tell swagger to generate documentation based on the XML doc file output from msbuild
46+
config.EnableSwagger(c =>
47+
{
48+
c.IncludeXmlComments("GameInputCommandSystem.xml");
49+
c.SingleApiVersion("1.0", "Owin Swashbuckle Demo");
50+
}).EnableSwaggerUi();
51+
4452
appBuilder.UseWebApi(config);
4553
}
4654
private async Task<IEnumerable<Claim>> Authenticate(string username, string password)

‎GameInputCommandSystem/packages.config

+9-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net461" />
55
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net461" />
66
<package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.7" targetFramework="net461" />
7-
<package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
8-
<package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net461" />
9-
<package id="Microsoft.Owin.Hosting" version="4.0.0" targetFramework="net461" />
10-
<package id="Microsoft.Owin.Security" version="4.0.0" targetFramework="net461" />
7+
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.30506.0" targetFramework="net461" />
8+
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net461" />
9+
<package id="Microsoft.Owin.Host.HttpListener" version="4.0.1" targetFramework="net461" />
10+
<package id="Microsoft.Owin.Hosting" version="4.0.1" targetFramework="net461" />
11+
<package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net461" />
12+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
1113
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
1214
<package id="Owin" version="1.0" targetFramework="net461" />
15+
<package id="Swashbuckle" version="5.6.0" targetFramework="net461" />
16+
<package id="Swashbuckle.Core" version="5.6.0" targetFramework="net461" />
1317
<package id="Thinktecture.IdentityModel.Owin.BasicAuthentication" version="1.0.1" targetFramework="net461" />
18+
<package id="WebActivatorEx" version="2.0" targetFramework="net461" />
1419
</packages>

0 commit comments

Comments
 (0)