From 7aebfe54421eb69f8fa9750f5638b9f229c75ef1 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Sat, 28 Feb 2015 18:44:25 +0100 Subject: [PATCH 1/2] Removed unused usings from CGamePad --- Vocaluxe/Lib/Input/CGamePad.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Vocaluxe/Lib/Input/CGamePad.cs b/Vocaluxe/Lib/Input/CGamePad.cs index 4e0ecca4..482dce1a 100644 --- a/Vocaluxe/Lib/Input/CGamePad.cs +++ b/Vocaluxe/Lib/Input/CGamePad.cs @@ -16,8 +16,6 @@ #endregion using System; -using System.Diagnostics.PerformanceData; -using System.Drawing; using System.Threading; using System.Windows.Forms; using OpenTK.Input; From 0f11a800f8ca98d75210c6278f84c9704c5df0b4 Mon Sep 17 00:00:00 2001 From: lukeIam Date: Wed, 4 Mar 2015 21:26:51 +0100 Subject: [PATCH 2/2] Fixed PS script for version injection into main.js --- Vocaluxe/Vocaluxe.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj index a0990475..85b12678 100644 --- a/Vocaluxe/Vocaluxe.csproj +++ b/Vocaluxe/Vocaluxe.csproj @@ -536,10 +536,10 @@ - xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap" -powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\\\")\w*(?=\\\" *;)', %2524('@(VersionNumber)'+' ('+$version+')')} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'" + xcopy /E /D /Y "$(ProjectDir)\Website" "$(SolutionDir)\PhoneGap" +powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js') | Foreach-Object {$_ -replace '(?<=var *matchingServerVersion * = *\")\w*(?=\" *;)', "$version"} | Set-Content -Encoding UTF8 '$(ProjectDir)..\Output\Website\js\main.js'" powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace '(?<=AssemblyInformationalVersion\()(.*)(?=\))', '\"GITVERSION\"'} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'" - cp -ruT "$(ProjectDir)Website" "$(SolutionDir)/PhoneGap" + cp -ruT "$(ProjectDir)Website" "$(SolutionDir)/PhoneGap" powershell -command "$version = git describe --long; (Get-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs') | Foreach-Object {$_ -replace 'GITVERSION', $version} | Set-Content -Encoding UTF8 '$(ProjectDir)Properties\AssemblyInfo.cs'"