diff --git a/Release.ps1 b/Release.ps1 index 768b257..c664794 100644 --- a/Release.ps1 +++ b/Release.ps1 @@ -1,7 +1,5 @@ -$ErrorActionPreference = 'Stop' - -$desktopDir = [Environment]::GetFolderPath('Desktop') +$tmpDir = 'D:\Work' $exePath = $PSScriptRoot + '\mpv.net\bin\x64\mpvnet.exe' $versionInfo = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath) $vsDir = 'C:\Program Files (x86)\Microsoft Visual Studio\2019' @@ -46,12 +44,12 @@ if ($versionInfo.FilePrivatePart -eq 0) & $inno /Darch=x86 setup.iss if ($LastExitCode) { throw $LastExitCode } - $targetDir = $desktopDir + "\mpv.net-portable-x64-$($versionInfo.FileVersion)" + $targetDir = $tmpDir + "\mpv.net-portable-x64-$($versionInfo.FileVersion)" Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } - $targetDir = $desktopDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)" + $targetDir = $tmpDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)" Copy-Item .\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml & $7z a -tzip -mx9 "$targetDir.zip" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } @@ -68,13 +66,13 @@ else & $msBuild mpv.net.sln -t:Rebuild -p:Configuration=Debug -p:Platform=x86 if ($LastExitCode) { throw $LastExitCode } - $targetDir = "$desktopDir\mpv.net-portable-x64-$($versionInfo.FileVersion)-beta" + $targetDir = "$tmpDir\mpv.net-portable-x64-$($versionInfo.FileVersion)-beta" Copy-Item .\mpv.net\bin\x64 $targetDir -Recurse -Exclude System.Management.Automation.xml & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } UploadBeta "$targetDir.7z" - $targetDir = $desktopDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)-beta" + $targetDir = $tmpDir + "\mpv.net-portable-x86-$($versionInfo.FileVersion)-beta" Copy-Item .\mpv.net\bin\x86 $targetDir -Recurse -Exclude System.Management.Automation.xml & $7z a -t7z -mx9 "$targetDir.7z" -r "$targetDir\*" if ($LastExitCode) { throw $LastExitCode } diff --git a/mpv.net/Misc/Help.cs b/mpv.net/Misc/Help.cs index fac6e8a..943cf86 100644 --- a/mpv.net/Misc/Help.cs +++ b/mpv.net/Misc/Help.cs @@ -43,7 +43,7 @@ namespace mpvnet public static void WriteError(object obj, string module = "mpv.net") { - Write(obj, module, ConsoleColor.Red, false); + Write(obj, module, ConsoleColor.DarkRed, false); } public static void Write(object obj, string module = "mpv.net") @@ -76,7 +76,7 @@ namespace mpvnet if (Padding > 0 && value.Length < Padding) value = value.PadRight(Padding); - if (color == ConsoleColor.Red) + if (color == ConsoleColor.Red || color == ConsoleColor.DarkRed) Console.Error.WriteLine(value); else Console.WriteLine(value); diff --git a/mpv.net/mpv/Core.cs b/mpv.net/mpv/Core.cs index 46e574d..9555ca1 100644 --- a/mpv.net/mpv/Core.cs +++ b/mpv.net/mpv/Core.cs @@ -150,12 +150,6 @@ namespace mpvnet public void ProcessProperty(string name, string value) { - foreach (char i in name) - if (char.IsUpper(i)) - Msg.ShowError("Uppercase char detected: " + name, - "mpv properties using the command line and the mpv.conf " + - "config file are required to be lowercase."); - switch (name) { case "autofit":