From dfc1ac712e5565526aa15e73058a15c1ea2673ec Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Thu, 25 Jul 2019 02:22:16 +0200 Subject: [PATCH] extension changes --- Changelog.md | 5 ++++ .../CSScriptExtension/CSScriptExtension.vb | 2 ++ .../CSScriptExtension.vbproj | 22 ---------------- .../RatingExtension/RatingExtension.csproj | 17 ------------- mpv.net.sln | 18 +++++-------- mpv.net/Misc/{Addon.cs => Extension.cs} | 2 +- mpv.net/mpv.net.csproj | 25 +------------------ 7 files changed, 15 insertions(+), 76 deletions(-) rename mpv.net/Misc/{Addon.cs => Extension.cs} (98%) diff --git a/Changelog.md b/Changelog.md index c175e13..035f5d6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,11 @@ screenshot-jpeg-source-chroma, screenshot-template, screenshot-jpeg-quality, screenshot-png-compression, screenshot-png-filter - mpv.conf preview feature added to config editor, it previews the mpv.conf content +- in the entire project the term addon was replaced with the term extension, + unfortunately this will break user extensions. The reason for this drastic + change is that there exist too many different terms, addons, addins, + extensions, modules, packages etc.. mpv.net follows Google Chrome as the worlds + most popular extendable app, Chrome uses the term Extension. ### 4.7.7 diff --git a/extensions/CSScriptExtension/CSScriptExtension.vb b/extensions/CSScriptExtension/CSScriptExtension.vb index 32fa252..ec91cab 100644 --- a/extensions/CSScriptExtension/CSScriptExtension.vb +++ b/extensions/CSScriptExtension/CSScriptExtension.vb @@ -1,6 +1,8 @@ 'this extension implements the C# scripting feature of mpv.net, 'it is based on CS-Script: https://www.cs-script.net/ +' the assembly/dll name of extensions must end with 'Extension' + Imports System.ComponentModel.Composition Imports System.IO Imports System.Windows.Forms diff --git a/extensions/CSScriptExtension/CSScriptExtension.vbproj b/extensions/CSScriptExtension/CSScriptExtension.vbproj index ec0d67c..1dffdb7 100644 --- a/extensions/CSScriptExtension/CSScriptExtension.vbproj +++ b/extensions/CSScriptExtension/CSScriptExtension.vbproj @@ -13,28 +13,6 @@ v4.7.2 - - true - full - true - true - ..\mpv.net\bin\Addons\CSScriptAddon\ - - - 42105,42106,42107,42353,42354,42355 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - - - pdbonly - false - true - true - ..\mpv.net\bin\Addons\CSScriptAddon\ - - - 42105,42106,42107,42353,42354,42355 - 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - On diff --git a/extensions/RatingExtension/RatingExtension.csproj b/extensions/RatingExtension/RatingExtension.csproj index 180580f..0563187 100644 --- a/extensions/RatingExtension/RatingExtension.csproj +++ b/extensions/RatingExtension/RatingExtension.csproj @@ -13,23 +13,6 @@ 512 - - true - full - false - ..\mpv.net\bin\Addons\RatingAddon\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\mpv.net\bin\Addons\RatingAddon\ - TRACE - prompt - 4 - true ..\..\mpv.net\bin\x86\Extensions\RatingExtension\ diff --git a/mpv.net.sln b/mpv.net.sln index 78c9bb6..e334927 100644 --- a/mpv.net.sln +++ b/mpv.net.sln @@ -19,38 +19,32 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.ActiveCfg = Debug|x86 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.ActiveCfg = Debug|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.Build.0 = Debug|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|x86 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|x86 - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.Build.0 = Release|Any CPU + {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|x86 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.ActiveCfg = Release|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|x64 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|x86 {1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|x86 - {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|x86 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|x64 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|x64 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|x86 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|x86 - {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU + {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|x86 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|x64 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|x64 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|x86 {71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|x86 - {55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|x86 {55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64 {55C88710-539D-4402-84C8-31694841C731}.Debug|x64.Build.0 = Debug|x64 {55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|x86 {55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|x86 - {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.Build.0 = Release|Any CPU + {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|x86 {55C88710-539D-4402-84C8-31694841C731}.Release|x64.ActiveCfg = Release|x64 {55C88710-539D-4402-84C8-31694841C731}.Release|x64.Build.0 = Release|x64 {55C88710-539D-4402-84C8-31694841C731}.Release|x86.ActiveCfg = Release|x86 diff --git a/mpv.net/Misc/Addon.cs b/mpv.net/Misc/Extension.cs similarity index 98% rename from mpv.net/Misc/Addon.cs rename to mpv.net/Misc/Extension.cs index 56a07fb..f7d3843 100644 --- a/mpv.net/Misc/Addon.cs +++ b/mpv.net/Misc/Extension.cs @@ -24,7 +24,7 @@ namespace mpvnet if (Directory.Exists(dir)) foreach (string i in Directory.GetDirectories(dir)) - catalog.Catalogs.Add(new DirectoryCatalog(i, "*Extensions.dll")); + catalog.Catalogs.Add(new DirectoryCatalog(i, "*Extension.dll")); dir = mp.ConfigFolder + "\\Extensions"; diff --git a/mpv.net/mpv.net.csproj b/mpv.net/mpv.net.csproj index 0d651d8..8fac44d 100644 --- a/mpv.net/mpv.net.csproj +++ b/mpv.net/mpv.net.csproj @@ -14,29 +14,6 @@ true - - AnyCPU - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - false - On - 7.3 - - - AnyCPU - pdbonly - true - bin\ - TRACE - prompt - 4 - false - @@ -137,7 +114,7 @@ - + MSBuild:Compile Designer