Updated to IOWrapper v0.2.17. Updated build script

Snoothy · Jan 3, 2018 · bcb548c · bcb548c
1 parent 9791e36
commit bcb548c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # Universal Control Remapper
-[![GitHub release](https://img.shields.io/github/release/snoothy/ucr.svg)]() [![IOWrapper version](https://img.shields.io/badge/IOWrapper-v0.2.16-blue.svg)](https://github.com/evilC/IOWrapper) [![license](https://img.shields.io/github/license/snoothy/ucr.svg)]() [![Github All Releases](https://img.shields.io/github/downloads/snoothy/ucr/total.svg)]()
-
-Universal Control Remapper is a complete rewrite of the original [UCR](https://github.com/evilC/UCR), created in collaboration with [evilC](https://github.com/evilC/), to overcome the limitations of AHK.
+[![GitHub release](https://img.shields.io/badge/release-v0.1.1-blue.svg)](https://github.com/Snoothy/UCR/releases/tag/v0.1.1) [![IOWrapper version](https://img.shields.io/badge/IOWrapper-v0.2.17-blue.svg)](https://github.com/evilC/IOWrapper) [![license](https://img.shields.io/github/license/snoothy/ucr.svg)]() [![Github All Releases](https://img.shields.io/github/downloads/snoothy/ucr/total.svg)]()
+Universal Control Remapper is a complete rewrite of the original [UCR](https://github.com/evilC/UCR), created in collaboration with [evilC](https://github.com/evilC/).
 
 Universal Control Remapper is a Windows application which allows the end-user to remap any inputs from devices, such as keyboards, mice, joysticks, racing wheels, eyetrackers, etc. to virtual output devices. Remapping is achieved by transforming inputs through plugins to a desired output device.
 

diff --git a/UCR.Core/Properties/AssemblyInfo.cs b/UCR.Core/Properties/AssemblyInfo.cs
@@ -38,4 +38,4 @@
 // Make internal visible for tests
 [assembly: InternalsVisibleTo("UCR")]
 [assembly: InternalsVisibleTo("UCR.Tests")]
-[assembly: AssemblyInformationalVersion("0.1.0+65.Branch.master.Sha.68c846ac2a532f9e5acefdb3069dd3ad430c4bac")]
+[assembly: AssemblyInformationalVersion("0.1.0+81.Branch.master.Sha.9791e36d06cda5c355c790d4504a3c797f397128")]
diff --git a/UCR.Plugins/Properties/AssemblyInfo.cs b/UCR.Plugins/Properties/AssemblyInfo.cs
@@ -35,4 +35,4 @@
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("0.1.0+65.Branch.master.Sha.68c846ac2a532f9e5acefdb3069dd3ad430c4bac")]
+[assembly: AssemblyInformationalVersion("0.1.0+81.Branch.master.Sha.9791e36d06cda5c355c790d4504a3c797f397128")]
diff --git a/UCR.Tests/Properties/AssemblyInfo.cs b/UCR.Tests/Properties/AssemblyInfo.cs
@@ -35,4 +35,4 @@
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
 
-[assembly: AssemblyInformationalVersion("0.1.0+65.Branch.master.Sha.68c846ac2a532f9e5acefdb3069dd3ad430c4bac")]
+[assembly: AssemblyInformationalVersion("0.1.0+81.Branch.master.Sha.9791e36d06cda5c355c790d4504a3c797f397128")]
diff --git a/UCR/Properties/AssemblyInfo.cs b/UCR/Properties/AssemblyInfo.cs
@@ -53,4 +53,4 @@
 // [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyVersion("0.1.0.0")]
 [assembly: AssemblyFileVersion("0.1.0.0")]
-[assembly: AssemblyInformationalVersion("0.1.0+65.Branch.master.Sha.68c846ac2a532f9e5acefdb3069dd3ad430c4bac")]
+[assembly: AssemblyInformationalVersion("0.1.0+81.Branch.master.Sha.9791e36d06cda5c355c790d4504a3c797f397128")]
diff --git a/UCR/Views/AboutWindow.xaml b/UCR/Views/AboutWindow.xaml
@@ -13,7 +13,7 @@
         </Grid.RowDefinitions>
         <StackPanel>
             <TextBlock Margin="0,0,0,5">Universal Control Remapper is created by HidWizards: <Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/evilC">evilC</Hyperlink> and <Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/Snoothy">Snoothy</Hyperlink></TextBlock>
-            <TextBlock Margin="0,0,0,5" Name="VersionTextBlock"><Bold>Version: v0.1.0</Bold></TextBlock>
+            <TextBlock Margin="0,0,0,5" Name="VersionTextBlock"/>
 
             <TextBlock Margin="0,0,0,5">Latest version and source code is available on <Hyperlink RequestNavigate="Hyperlink_RequestNavigate" NavigateUri="https://github.com/Snoothy/UCR">Github</Hyperlink></TextBlock>
 

diff --git a/UCR/Views/AboutWindow.xaml.cs b/UCR/Views/AboutWindow.xaml.cs
@@ -1,16 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace UCR.Views
 {
@@ -22,11 +12,19 @@ public partial class AboutWindow : Window
         public AboutWindow()
         {
             InitializeComponent();
+            VersionTextBlock.Inlines.Add(new Bold(new Run($"Version: {GetVersion()}")));
         }
 
         private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
         {
             System.Diagnostics.Process.Start(e.Uri.AbsoluteUri);
         }
+
+        private string GetVersion()
+        {
+            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+            return $"v{fvi.FileVersion}";
+        }
     }
 }
diff --git a/build.cake b/build.cake
@@ -8,9 +8,10 @@
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Debug");
 
+var ucrVersion = "v0.1.1";
+var iowrapperVersion = "v0.2.17";
 var outputDir = "./artifacts/";
 var dependencyDir = "./dependencies/";
-var iowrapperVersion = "v0.2.16";
 var iowrapperDir = dependencyDir + "IOWrapper";
 var iowrapperSolutionPath = iowrapperDir + "/IOWrapper/IOWrapper.sln";
 var solutionPath = "./UCR.sln";
@@ -43,9 +44,13 @@ Task("Version")
 			OutputType = GitVersionOutput.BuildServer
 		});
 		versionInfo = GitVersion(new GitVersionSettings{ OutputType = GitVersionOutput.Json });
-
+		
 		// Set IOWrapper version in README
-		ReplaceRegexInFiles("./README.md", @"IOWrapper-v([0-9]+\.[0-9]+\.[0-9]+).*-blue.svg", "IOWrapper-" + iowrapperVersion + "-blue.svg");
+		ReplaceRegexInFiles("./README.md", @"IOWrapper-v([0-9]+\.[0-9]+\.[0-9]+)-blue.svg", "IOWrapper-" + iowrapperVersion + "-blue.svg");
+
+		// Set UCR release badge in README
+		ReplaceRegexInFiles("./README.md", @"release-v([0-9]+\.[0-9]+\.[0-9]+)-blue.svg", "release-" + ucrVersion + "-blue.svg");
+		ReplaceRegexInFiles("./README.md", @"releases/tag/v([0-9]+\.[0-9]+\.[0-9]+)", "releases/tag/" + ucrVersion);
 
 		// Update project.json
 		//VersionProject(projectJson, versionInfo);
@@ -76,7 +81,7 @@ Task("BuildIOWrapper")
 		MSBuild(iowrapperSolutionPath, new MSBuildSettings 
 		{
 			Verbosity = Verbosity.Minimal,
-			ToolVersion = MSBuildToolVersion.VS2017,
+			ToolVersion = MSBuildToolVersion.VS2015,
 			Configuration = configuration,
 			PlatformTarget = PlatformTarget.MSIL
 		});
@@ -97,7 +102,7 @@ Task("Build")
 		MSBuild(solutionPath, new MSBuildSettings 
 		{
 			Verbosity = Verbosity.Minimal,
-			ToolVersion = MSBuildToolVersion.VS2017,
+			ToolVersion = MSBuildToolVersion.VS2015,
 			Configuration = configuration,
 			PlatformTarget = PlatformTarget.MSIL
 		});