From e957101268ff7f6c1635b108474e28a45ef478f0 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Mon, 11 Mar 2019 06:16:39 +0100 Subject: [PATCH] - --- CSScriptAddon/CSScriptAddon.vbproj | 8 ++------ RatingAddon/Properties/AssemblyInfo.cs | 4 ++-- RatingAddon/{Rating.cs => RatingAddon.cs} | 6 +++--- .../{Rating.csproj => RatingAddon.csproj} | 8 ++++---- mpv.net.sln | 4 ++-- {mpvnet => mpv.net}/Addon.cs | 0 {mpvnet => mpv.net}/App.config | 0 {mpvnet => mpv.net}/Command.cs | 0 {mpvnet => mpv.net}/Extensions.cs | 0 {mpvnet => mpv.net}/MainForm.Designer.cs | 0 {mpvnet => mpv.net}/MainForm.cs | 0 {mpvnet => mpv.net}/MainForm.resx | 0 {mpvnet => mpv.net}/MediaInfo.cs | 0 {mpvnet => mpv.net}/Menu.cs | 0 {mpvnet => mpv.net}/Misc.cs | 0 {mpvnet => mpv.net}/Native.cs | 0 {mpvnet => mpv.net}/NativeHelp.cs | 0 {mpvnet => mpv.net}/Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 {mpvnet => mpv.net}/Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 {mpvnet => mpv.net}/Resources/input_conf.txt | 0 {mpvnet => mpv.net}/StringExtensions.cs | 0 {mpvnet => mpv.net}/UI.cs | 0 {mpvnet => mpv.net}/app.manifest | 0 {mpvnet => mpv.net}/libmpv.cs | 0 {mpvnet => mpv.net}/mpv.cs | 0 {mpvnet => mpv.net}/mpv.ico | Bin {mpvnet => mpv.net}/mpv.net.csproj | 0 {mpvnet => mpv.net}/screenshot.jpg | Bin release.ps1 | 18 +++++++++++------- 33 files changed, 24 insertions(+), 24 deletions(-) rename RatingAddon/{Rating.cs => RatingAddon.cs} (94%) rename RatingAddon/{Rating.csproj => RatingAddon.csproj} (94%) rename {mpvnet => mpv.net}/Addon.cs (100%) rename {mpvnet => mpv.net}/App.config (100%) rename {mpvnet => mpv.net}/Command.cs (100%) rename {mpvnet => mpv.net}/Extensions.cs (100%) rename {mpvnet => mpv.net}/MainForm.Designer.cs (100%) rename {mpvnet => mpv.net}/MainForm.cs (100%) rename {mpvnet => mpv.net}/MainForm.resx (100%) rename {mpvnet => mpv.net}/MediaInfo.cs (100%) rename {mpvnet => mpv.net}/Menu.cs (100%) rename {mpvnet => mpv.net}/Misc.cs (100%) rename {mpvnet => mpv.net}/Native.cs (100%) rename {mpvnet => mpv.net}/NativeHelp.cs (100%) rename {mpvnet => mpv.net}/Program.cs (100%) rename {mpvnet => mpv.net}/Properties/AssemblyInfo.cs (100%) rename {mpvnet => mpv.net}/Properties/Resources.Designer.cs (100%) rename {mpvnet => mpv.net}/Properties/Resources.resx (100%) rename {mpvnet => mpv.net}/Properties/Settings.Designer.cs (100%) rename {mpvnet => mpv.net}/Properties/Settings.settings (100%) rename {mpvnet => mpv.net}/Resources/input_conf.txt (100%) rename {mpvnet => mpv.net}/StringExtensions.cs (100%) rename {mpvnet => mpv.net}/UI.cs (100%) rename {mpvnet => mpv.net}/app.manifest (100%) rename {mpvnet => mpv.net}/libmpv.cs (100%) rename {mpvnet => mpv.net}/mpv.cs (100%) rename {mpvnet => mpv.net}/mpv.ico (100%) rename {mpvnet => mpv.net}/mpv.net.csproj (100%) rename {mpvnet => mpv.net}/screenshot.jpg (100%) diff --git a/CSScriptAddon/CSScriptAddon.vbproj b/CSScriptAddon/CSScriptAddon.vbproj index 656f309..eb47078 100644 --- a/CSScriptAddon/CSScriptAddon.vbproj +++ b/CSScriptAddon/CSScriptAddon.vbproj @@ -18,7 +18,7 @@ full true true - ..\mpvnet\bin\Debug\Addons\CSScript\ + ..\mpv.net\bin\Debug\Addons\CSScriptAddon\ 42105,42106,42107,42353,42354,42355 @@ -54,7 +54,7 @@ False - ..\mpvnet\bin\Debug\mpvnet.exe + ..\mpv.net\bin\Debug\mpvnet.exe True @@ -65,10 +65,6 @@ - - ..\vbnet\bin\Debug\vbnet.dll - True - diff --git a/RatingAddon/Properties/AssemblyInfo.cs b/RatingAddon/Properties/AssemblyInfo.cs index 70938c8..6fa70e4 100644 --- a/RatingAddon/Properties/AssemblyInfo.cs +++ b/RatingAddon/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Rating")] +[assembly: AssemblyTitle("RatingAddon")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Rating")] +[assembly: AssemblyProduct("RatingAddon")] [assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/RatingAddon/Rating.cs b/RatingAddon/RatingAddon.cs similarity index 94% rename from RatingAddon/Rating.cs rename to RatingAddon/RatingAddon.cs index bd61883..34407a1 100644 --- a/RatingAddon/Rating.cs +++ b/RatingAddon/RatingAddon.cs @@ -5,14 +5,14 @@ using System.IO; using mpvnet; -namespace Rating +namespace RatingAddon { [Export(typeof(IAddon))] - public class Rating : IAddon + public class RatingAddon : IAddon { private Dictionary Dic = new Dictionary(); - public Rating() + public RatingAddon() { mpv.ClientMessage += mpv_ClientMessage; mpv.Shutdown += mpv_Shutdown; diff --git a/RatingAddon/Rating.csproj b/RatingAddon/RatingAddon.csproj similarity index 94% rename from RatingAddon/Rating.csproj rename to RatingAddon/RatingAddon.csproj index b60df57..e99efb0 100644 --- a/RatingAddon/Rating.csproj +++ b/RatingAddon/RatingAddon.csproj @@ -7,7 +7,7 @@ {55C88710-539D-4402-84C8-31694841C731} Library Properties - Rating + RatingAddon RatingAddon v4.7.2 512 @@ -17,7 +17,7 @@ true full false - ..\mpvnet\bin\Debug\Addons\Rating\ + ..\mpv.net\bin\Debug\Addons\RatingAddon\ DEBUG;TRACE prompt 4 @@ -68,7 +68,7 @@ - ..\mpvnet\bin\Debug\mpvnet.exe + ..\mpv.net\bin\Debug\mpvnet.exe True @@ -82,7 +82,7 @@ - + diff --git a/mpv.net.sln b/mpv.net.sln index b28ef14..7d5a869 100644 --- a/mpv.net.sln +++ b/mpv.net.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.8 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpvnet\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}" ProjectSection(ProjectDependencies) = postProject {55C88710-539D-4402-84C8-31694841C731} = {55C88710-539D-4402-84C8-31694841C731} {71808A87-8B1C-4DF8-957C-D79C3B164CCA} = {71808A87-8B1C-4DF8-957C-D79C3B164CCA} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rating", "RatingAddon\Rating.csproj", "{55C88710-539D-4402-84C8-31694841C731}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}" EndProject diff --git a/mpvnet/Addon.cs b/mpv.net/Addon.cs similarity index 100% rename from mpvnet/Addon.cs rename to mpv.net/Addon.cs diff --git a/mpvnet/App.config b/mpv.net/App.config similarity index 100% rename from mpvnet/App.config rename to mpv.net/App.config diff --git a/mpvnet/Command.cs b/mpv.net/Command.cs similarity index 100% rename from mpvnet/Command.cs rename to mpv.net/Command.cs diff --git a/mpvnet/Extensions.cs b/mpv.net/Extensions.cs similarity index 100% rename from mpvnet/Extensions.cs rename to mpv.net/Extensions.cs diff --git a/mpvnet/MainForm.Designer.cs b/mpv.net/MainForm.Designer.cs similarity index 100% rename from mpvnet/MainForm.Designer.cs rename to mpv.net/MainForm.Designer.cs diff --git a/mpvnet/MainForm.cs b/mpv.net/MainForm.cs similarity index 100% rename from mpvnet/MainForm.cs rename to mpv.net/MainForm.cs diff --git a/mpvnet/MainForm.resx b/mpv.net/MainForm.resx similarity index 100% rename from mpvnet/MainForm.resx rename to mpv.net/MainForm.resx diff --git a/mpvnet/MediaInfo.cs b/mpv.net/MediaInfo.cs similarity index 100% rename from mpvnet/MediaInfo.cs rename to mpv.net/MediaInfo.cs diff --git a/mpvnet/Menu.cs b/mpv.net/Menu.cs similarity index 100% rename from mpvnet/Menu.cs rename to mpv.net/Menu.cs diff --git a/mpvnet/Misc.cs b/mpv.net/Misc.cs similarity index 100% rename from mpvnet/Misc.cs rename to mpv.net/Misc.cs diff --git a/mpvnet/Native.cs b/mpv.net/Native.cs similarity index 100% rename from mpvnet/Native.cs rename to mpv.net/Native.cs diff --git a/mpvnet/NativeHelp.cs b/mpv.net/NativeHelp.cs similarity index 100% rename from mpvnet/NativeHelp.cs rename to mpv.net/NativeHelp.cs diff --git a/mpvnet/Program.cs b/mpv.net/Program.cs similarity index 100% rename from mpvnet/Program.cs rename to mpv.net/Program.cs diff --git a/mpvnet/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs similarity index 100% rename from mpvnet/Properties/AssemblyInfo.cs rename to mpv.net/Properties/AssemblyInfo.cs diff --git a/mpvnet/Properties/Resources.Designer.cs b/mpv.net/Properties/Resources.Designer.cs similarity index 100% rename from mpvnet/Properties/Resources.Designer.cs rename to mpv.net/Properties/Resources.Designer.cs diff --git a/mpvnet/Properties/Resources.resx b/mpv.net/Properties/Resources.resx similarity index 100% rename from mpvnet/Properties/Resources.resx rename to mpv.net/Properties/Resources.resx diff --git a/mpvnet/Properties/Settings.Designer.cs b/mpv.net/Properties/Settings.Designer.cs similarity index 100% rename from mpvnet/Properties/Settings.Designer.cs rename to mpv.net/Properties/Settings.Designer.cs diff --git a/mpvnet/Properties/Settings.settings b/mpv.net/Properties/Settings.settings similarity index 100% rename from mpvnet/Properties/Settings.settings rename to mpv.net/Properties/Settings.settings diff --git a/mpvnet/Resources/input_conf.txt b/mpv.net/Resources/input_conf.txt similarity index 100% rename from mpvnet/Resources/input_conf.txt rename to mpv.net/Resources/input_conf.txt diff --git a/mpvnet/StringExtensions.cs b/mpv.net/StringExtensions.cs similarity index 100% rename from mpvnet/StringExtensions.cs rename to mpv.net/StringExtensions.cs diff --git a/mpvnet/UI.cs b/mpv.net/UI.cs similarity index 100% rename from mpvnet/UI.cs rename to mpv.net/UI.cs diff --git a/mpvnet/app.manifest b/mpv.net/app.manifest similarity index 100% rename from mpvnet/app.manifest rename to mpv.net/app.manifest diff --git a/mpvnet/libmpv.cs b/mpv.net/libmpv.cs similarity index 100% rename from mpvnet/libmpv.cs rename to mpv.net/libmpv.cs diff --git a/mpvnet/mpv.cs b/mpv.net/mpv.cs similarity index 100% rename from mpvnet/mpv.cs rename to mpv.net/mpv.cs diff --git a/mpvnet/mpv.ico b/mpv.net/mpv.ico similarity index 100% rename from mpvnet/mpv.ico rename to mpv.net/mpv.ico diff --git a/mpvnet/mpv.net.csproj b/mpv.net/mpv.net.csproj similarity index 100% rename from mpvnet/mpv.net.csproj rename to mpv.net/mpv.net.csproj diff --git a/mpvnet/screenshot.jpg b/mpv.net/screenshot.jpg similarity index 100% rename from mpvnet/screenshot.jpg rename to mpv.net/screenshot.jpg diff --git a/release.ps1 b/release.ps1 index c9331a0..0e7f43d 100644 --- a/release.ps1 +++ b/release.ps1 @@ -1,8 +1,12 @@ -using namespace System.Diagnostics -$exePath = "C:\Users\frank\C-Daten\Projekte\VS\CS\mpvnet\mpvnet\bin\Debug\mpvnet.exe" -$version = [FileVersionInfo]::GetVersionInfo($exePath).FileVersion -$targetDir = "C:\Users\Frank\Desktop\mpv.net-" + $version -Copy-Item C:\Users\frank\C-Daten\Projekte\VS\CS\mpvnet\mpvnet\bin\Debug $targetDir -recurse +$scriptDir = Split-Path -Path $PSCommandPath -Parent +$exePath = $scriptDir + "\mpv.net\bin\Debug\mpvnet.exe" +$version = [Diagnostics.FileVersionInfo]::GetVersionInfo($exePath).FileVersion +$desktopDir = [Environment]::GetFolderPath("Desktop") +$targetDir = $desktopDir + "\mpv.net-" + $version +if (Test-Path $targetDir) { rd $targetDir -recurse } +Copy-Item $scriptDir\mpv.net\bin\Debug $targetDir -recurse $addonDir = $targetDir + "\Addons" -remove-item $addonDir -Recurse -Include *vbnet.pdb, *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb, *vbnet.dll -C:\Users\frank\C-Daten\Projekte\VS\VB\util\bin\util.exe -pack $targetDir \ No newline at end of file +remove-item $addonDir -Recurse -Include *mpvnet.exe, *mpvnet.exe.config, *mpvnet.pdb +$7zPath = "C:\Program Files\7-Zip\7z.exe" +$args = "a -t7z -mx9 $targetDir.7z -r $targetDir\*" +Start-Process -FilePath $7zPath -ArgumentList $args \ No newline at end of file