Skip to content

Commit 2b5206d

Browse files
authored
Merge pull request #25 from Terence-D/ED
fixed versioning - should have been checked in to last build
2 parents 95f03da + 5aaab51 commit 2b5206d

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

GameInputCommandSystem/Controllers/VersionController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public class VersionController : ApiController
1717
public HttpResponseMessage Get()
1818
{
1919
Assembly assembly = Assembly.GetExecutingAssembly();
20-
FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
21-
string version = fileVersionInfo.ProductVersion;
20+
//FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
21+
string version = "1.3.0.0";// fileVersionInfo.ProductVersion;
2222

2323
return Request.CreateResponse(HttpStatusCode.OK, version, Configuration.Formatters.JsonFormatter);
2424
}

GameInputCommandSystem/GameInputCommandSystem.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<UpdateRequired>false</UpdateRequired>
2626
<MapFileExtensions>true</MapFileExtensions>
2727
<AutorunEnabled>true</AutorunEnabled>
28-
<ApplicationRevision>0</ApplicationRevision>
28+
<ApplicationRevision>1</ApplicationRevision>
2929
<ApplicationVersion>1.4.0.%2a</ApplicationVersion>
3030
<UseApplicationTrust>false</UseApplicationTrust>
3131
<PublishWizardCompleted>true</PublishWizardCompleted>

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.0")]
55-
[assembly: AssemblyFileVersion("1.4.0.0")]
54+
[assembly: AssemblyVersion("1.4.0.1")]
55+
[assembly: AssemblyFileVersion("1.4.0.1")]

GameInputCommandSystem/Views/MainWindow.xaml.cs

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ private void btnStart_Click(object sender, RoutedEventArgs e)
5656
private void LoadSettings()
5757
{
5858
txtTarget.Items.Add("Star Citizen");
59+
txtTarget.Items.Add("Elite - Dangerous (CLIENT)");
5960
txtTarget.Text = Properties.Settings.Default.target;
6061
if (txtTarget.Text == "")
6162
txtTarget.Text = "Star Citizen";

0 commit comments

Comments
 (0)