From: <seb...@us...> - 2014-05-01 10:43:48
|
Revision: 4792 http://sourceforge.net/p/mp-plugins/code/4792 Author: sebastiii Date: 2014-05-01 10:43:45 +0000 (Thu, 01 May 2014) Log Message: ----------- Add external bin (based on 1.7.1) and fix AssemblyInfo for proper SubsystemVersions. Modified Paths: -------------- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/Resources.Designer.cs Added Paths: ----------- trunk/plugins/MyStreamradioV2/Source/External/ trunk/plugins/MyStreamradioV2/Source/External/Bass.Net.dll trunk/plugins/MyStreamradioV2/Source/External/Common.Utils.dll trunk/plugins/MyStreamradioV2/Source/External/Core.dll trunk/plugins/MyStreamradioV2/Source/External/Databases.dll trunk/plugins/MyStreamradioV2/Source/External/Dialogs.dll trunk/plugins/MyStreamradioV2/Source/External/Utils.dll Added: trunk/plugins/MyStreamradioV2/Source/External/Bass.Net.dll =================================================================== (Binary files differ) Index: trunk/plugins/MyStreamradioV2/Source/External/Bass.Net.dll =================================================================== --- trunk/plugins/MyStreamradioV2/Source/External/Bass.Net.dll 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/External/Bass.Net.dll 2014-05-01 10:43:45 UTC (rev 4792) Property changes on: trunk/plugins/MyStreamradioV2/Source/External/Bass.Net.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/MyStreamradioV2/Source/External/Common.Utils.dll =================================================================== (Binary files differ) Index: trunk/plugins/MyStreamradioV2/Source/External/Common.Utils.dll =================================================================== --- trunk/plugins/MyStreamradioV2/Source/External/Common.Utils.dll 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/External/Common.Utils.dll 2014-05-01 10:43:45 UTC (rev 4792) Property changes on: trunk/plugins/MyStreamradioV2/Source/External/Common.Utils.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/MyStreamradioV2/Source/External/Core.dll =================================================================== (Binary files differ) Index: trunk/plugins/MyStreamradioV2/Source/External/Core.dll =================================================================== --- trunk/plugins/MyStreamradioV2/Source/External/Core.dll 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/External/Core.dll 2014-05-01 10:43:45 UTC (rev 4792) Property changes on: trunk/plugins/MyStreamradioV2/Source/External/Core.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/MyStreamradioV2/Source/External/Databases.dll =================================================================== (Binary files differ) Index: trunk/plugins/MyStreamradioV2/Source/External/Databases.dll =================================================================== --- trunk/plugins/MyStreamradioV2/Source/External/Databases.dll 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/External/Databases.dll 2014-05-01 10:43:45 UTC (rev 4792) Property changes on: trunk/plugins/MyStreamradioV2/Source/External/Databases.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/MyStreamradioV2/Source/External/Dialogs.dll =================================================================== (Binary files differ) Index: trunk/plugins/MyStreamradioV2/Source/External/Dialogs.dll =================================================================== --- trunk/plugins/MyStreamradioV2/Source/External/Dialogs.dll 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/External/Dialogs.dll 2014-05-01 10:43:45 UTC (rev 4792) Property changes on: trunk/plugins/MyStreamradioV2/Source/External/Dialogs.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/MyStreamradioV2/Source/External/Utils.dll =================================================================== (Binary files differ) Index: trunk/plugins/MyStreamradioV2/Source/External/Utils.dll =================================================================== --- trunk/plugins/MyStreamradioV2/Source/External/Utils.dll 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/External/Utils.dll 2014-05-01 10:43:45 UTC (rev 4792) Property changes on: trunk/plugins/MyStreamradioV2/Source/External/Utils.dll ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj 2014-05-01 10:43:45 UTC (rev 4792) @@ -15,7 +15,7 @@ <UpgradeBackupLocation> </UpgradeBackupLocation> <OldToolsVersion>3.5</OldToolsVersion> - <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkProfile /> <PublishUrl>publish\</PublishUrl> <Install>true</Install> @@ -56,27 +56,27 @@ <ItemGroup> <Reference Include="Bass.Net, Version=2.4.4.3, Culture=neutral, PublicKeyToken=b7566c273e6ef480, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll</HintPath> + <HintPath>..\External\Bass.Net.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath> + <HintPath>..\External\Common.Utils.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Core, Version=1.0.5.32056, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath> + <HintPath>..\External\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Databases, Version=1.0.5.32058, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath> + <HintPath>..\External\Databases.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Dialogs, Version=1.0.5.32061, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath> + <HintPath>..\External\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -87,7 +87,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=2.2.7.32052, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath> + <HintPath>..\External\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs 2014-05-01 10:43:45 UTC (rev 4792) @@ -3,7 +3,8 @@ using System.Runtime.InteropServices; using MediaPortal.Common.Utils; -[assembly: CompatibleVersion("1.1.6.27644")] +// Define that our plugin is designed for MediaPortal 1.7 - the MP dlls have been slightly restructured and it's using .net 4 now, so not backward compatible +[assembly: CompatibleVersion("1.7.000.0", "1.7.000.0")] // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. @@ -35,3 +36,9 @@ // übernehmen, indem Sie "*" eingeben: [assembly: AssemblyVersion("0.6.5.1")] [assembly: AssemblyFileVersion("0.6.5.1")] + +// Tell MediaPortal which subsystems this plugin will use, so it can check for compatiblity +[assembly: UsesSubsystem("MP.SkinEngine")] +[assembly: UsesSubsystem("MP.Plugins.Music")] +[assembly: UsesSubsystem("MP.Config")] +[assembly: UsesSubsystem("MP.Externals.BASS")] Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/Resources.Designer.cs 2014-04-30 20:28:38 UTC (rev 4791) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/Resources.Designer.cs 2014-05-01 10:43:45 UTC (rev 4792) @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // <auto-generated> -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:2.0.50727.3082 +// This code was generated by a tool. +// Runtime Version:4.0.30319.34014 // -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // </auto-generated> //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ /// <summary> - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// A strongly-typed resource class, for looking up localized strings, etc. /// </summary> - // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert - // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. - // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ } /// <summary> - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// Returns the cached ResourceManager instance used by this class. /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ } /// <summary> - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// </summary> [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |