diff options
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 15 | ||||
| -rw-r--r-- | MediaBrowser.Common/Plugins/BasePlugin.cs | 9 |
2 files changed, 11 insertions, 13 deletions
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index a9499dedd..c7b3a6511 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -35,21 +35,18 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="ServiceStack.Common"> <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll</HintPath> </Reference> - <Reference Include="ServiceStack.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> + <Reference Include="ServiceStack.Interfaces"> <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll</HintPath> </Reference> - <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> + <Reference Include="ServiceStack.Text"> <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath> </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="Microsoft.CSharp" /> </ItemGroup> <ItemGroup> <Compile Include="..\SharedVersion.cs"> diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs index ea4439c4e..795d22100 100644 --- a/MediaBrowser.Common/Plugins/BasePlugin.cs +++ b/MediaBrowser.Common/Plugins/BasePlugin.cs @@ -57,7 +57,7 @@ namespace MediaBrowser.Common.Plugins { get { return typeof(TConfigurationType); } } - + /// <summary> /// The _assembly name /// </summary> @@ -90,7 +90,8 @@ namespace MediaBrowser.Common.Plugins if (!_uniqueId.HasValue) { - _uniqueId = Marshal.GetTypeLibGuidForAssembly(GetType().Assembly); + var attribute = (GuidAttribute)GetType().Assembly.GetCustomAttributes(typeof(GuidAttribute), true)[0]; + _uniqueId = new Guid(attribute.Value); } return _uniqueId.Value; @@ -282,7 +283,7 @@ namespace MediaBrowser.Common.Plugins { throw new ArgumentNullException("configuration"); } - + Configuration = (TConfigurationType)configuration; SaveConfiguration(); @@ -315,7 +316,7 @@ namespace MediaBrowser.Common.Plugins /// </summary> public virtual void OnUninstalling() { - + } /// <summary> |