From 43854972c8a66a5227153c0c4272409479518e43 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Fri, 22 Feb 2013 14:43:24 -0500 Subject: partial post build on serverapplication --- .../MediaBrowser.ServerApplication.csproj | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 79ced29a7f..66cbbb059b 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -66,7 +66,7 @@ app.manifest - Always + OnBuildSuccess 9633DCDB4A07D3328EFB99299C6DFB1823EBC4BE @@ -373,7 +373,19 @@ - xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y + xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y + +xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y +mkdir "$(SolutionDir)..\Deploy\Server\System\x64" +xcopy "$(TargetDir)x64" "$(SolutionDir)..\Deploy\Server\System\x64" /y + +mkdir "$(SolutionDir)..\Deploy\Server\System\x86" +xcopy "$(TargetDir)x86" "$(SolutionDir)..\Deploy\Server\System\x86" /y + +mkdir "$(SolutionDir)..\Deploy\Server\System\CorePlugins" +xcopy "$(TargetDir)CorePlugins" "$(SolutionDir)..\Deploy\Server\System\CorePlugins" /y + +compress -Z "$(SolutionDir)..\Deploy\Server\*.*" + \ No newline at end of file diff --git a/MediaBrowser.Networking/Properties/AssemblyInfo.cs b/MediaBrowser.Networking/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..2eae67b6d5 --- /dev/null +++ b/MediaBrowser.Networking/Properties/AssemblyInfo.cs @@ -0,0 +1,31 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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("MediaBrowser.Networking")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("MediaBrowser.Networking")] +[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("01f56324-c175-4237-9204-aefda50bcf8d")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// \ No newline at end of file diff --git a/MediaBrowser.Plugins.DefaultTheme/MediaBrowser.Plugins.DefaultTheme.csproj b/MediaBrowser.Plugins.DefaultTheme/MediaBrowser.Plugins.DefaultTheme.csproj index 0ba40e814c..f0176049d3 100644 --- a/MediaBrowser.Plugins.DefaultTheme/MediaBrowser.Plugins.DefaultTheme.csproj +++ b/MediaBrowser.Plugins.DefaultTheme/MediaBrowser.Plugins.DefaultTheme.csproj @@ -47,7 +47,6 @@ ..\ThirdParty\Expression\Microsoft.Expression.Interactions.dll - diff --git a/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs b/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs index 81ed462174..3ca6e8df2b 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs @@ -1,12 +1,11 @@ -using System.Threading.Tasks; -using MediaBrowser.Model.Dto; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI; using MediaBrowser.UI.Controller; using MediaBrowser.UI.Controls; using MediaBrowser.UI.Playback; using MediaBrowser.UI.Playback.InternalPlayer; -using System.ComponentModel.Composition; +using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; @@ -15,7 +14,6 @@ namespace MediaBrowser.Plugins.DefaultTheme.Resources /// /// Class AppResources /// - [Export(typeof(ResourceDictionary))] public partial class AppResources : ResourceDictionary { /// diff --git a/MediaBrowser.Plugins.DefaultTheme/Theme.cs b/MediaBrowser.Plugins.DefaultTheme/Theme.cs index f8d6d87241..5a730cf081 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Theme.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Theme.cs @@ -4,7 +4,6 @@ using MediaBrowser.Plugins.DefaultTheme.Resources; using MediaBrowser.UI; using MediaBrowser.UI.Controller; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Windows; using System.Windows.Controls; @@ -13,7 +12,6 @@ namespace MediaBrowser.Plugins.DefaultTheme /// /// Class Theme /// - [Export(typeof(BaseTheme))] class Theme : BaseTheme { /// diff --git a/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj b/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj index 98e973c15f..0d47febed1 100644 --- a/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj +++ b/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj @@ -34,7 +34,6 @@ - diff --git a/MediaBrowser.Server.WorldWeatherOnline/WeatherProvider.cs b/MediaBrowser.Server.WorldWeatherOnline/WeatherProvider.cs index 257249793e..c30a304559 100644 --- a/MediaBrowser.Server.WorldWeatherOnline/WeatherProvider.cs +++ b/MediaBrowser.Server.WorldWeatherOnline/WeatherProvider.cs @@ -4,7 +4,6 @@ using MediaBrowser.Controller.Weather; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Weather; using System; -using System.ComponentModel.Composition; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -15,7 +14,6 @@ namespace MediaBrowser.Server.WorldWeatherOnline /// Based on http://www.worldweatheronline.com/free-weather-feed.aspx /// The classes in this file are a reproduction of the json output, which will then be converted to our weather model classes /// - [Export(typeof(IWeatherProvider))] public class WeatherProvider : IWeatherProvider { /// @@ -29,8 +27,7 @@ namespace MediaBrowser.Server.WorldWeatherOnline /// /// The logger. /// logger - [ImportingConstructor] - public WeatherProvider([Import("logger")] ILogger logger) + public WeatherProvider(ILogger logger) { if (logger == null) { diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs index fd296e213b..492fef2429 100644 --- a/MediaBrowser.ServerApplication/App.xaml.cs +++ b/MediaBrowser.ServerApplication/App.xaml.cs @@ -11,6 +11,7 @@ using MediaBrowser.Model.Updates; using MediaBrowser.Server.Uninstall; using MediaBrowser.ServerApplication.Implementations; using Microsoft.Win32; +using SimpleInjector; using System; using System.Diagnostics; using System.IO; @@ -22,7 +23,6 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Media; using System.Windows.Media.Imaging; -using SimpleInjector; namespace MediaBrowser.ServerApplication { @@ -129,6 +129,12 @@ namespace MediaBrowser.ServerApplication get { return "MediaBrowser.Server.Uninstall.exe"; } } + /// + /// Gets or sets the iso manager. + /// + /// The iso manager. + private IIsoManager IsoManager { get; set; } + /// /// Gets or sets a value indicating whether [last run at startup value]. /// @@ -181,18 +187,6 @@ namespace MediaBrowser.ServerApplication Shutdown(); } - /// - /// Registers resources that classes will depend on - /// - private void RegisterResources() - { - Register(this); - Register(Logger); - Register(new PismoIsoManager(Logger)); - Register(new BdInfoExaminer()); - Register(new DotNetZipClient()); - } - /// /// Loads the kernel. /// @@ -509,6 +503,21 @@ namespace MediaBrowser.ServerApplication return new ApplicationUpdater().UpdateApplication(cancellationToken, progress); } + /// + /// Registers resources that classes will depend on + /// + private void RegisterResources() + { + Register(this); + Register(Logger); + + IsoManager = new PismoIsoManager(Logger); + + Register(IsoManager); + Register(new BdInfoExaminer()); + Register(new DotNetZipClient()); + } + /// /// Creates an instance of type and resolves all constructor dependancies /// @@ -544,9 +553,25 @@ namespace MediaBrowser.ServerApplication /// /// /// ``0. - public T Resolve() where T : class + public T Resolve() { return (T)_container.GetRegistration(typeof (T), true).GetInstance(); } + + /// + /// Resolves this instance. + /// + /// + /// ``0. + public T TryResolve() + { + var result = _container.GetRegistration(typeof (T), false); + + if (result == null) + { + return default(T); + } + return (T)result.GetInstance(); + } } } diff --git a/MediaBrowser.UI/App.xaml.cs b/MediaBrowser.UI/App.xaml.cs index b98ce8e6cd..bcaa0529e6 100644 --- a/MediaBrowser.UI/App.xaml.cs +++ b/MediaBrowser.UI/App.xaml.cs @@ -117,6 +117,17 @@ namespace MediaBrowser.UI get { return "MediaBrowser.UI.Uninstall.exe"; } } + /// + /// The container + /// + private SimpleInjector.Container _container = new SimpleInjector.Container(); + + /// + /// Gets or sets the iso manager. + /// + /// The iso manager. + private IIsoManager IsoManager { get; set; } + /// /// Gets the instance. /// @@ -290,15 +301,6 @@ namespace MediaBrowser.UI InitializeComponent(); } - - /// - /// Instantiates the kernel. - /// - /// IKernel. - protected IKernel InstantiateKernel() - { - return new UIKernel(this, new PismoIsoManager(Logger), Logger); - } /// /// Instantiates the main window. @@ -405,7 +407,9 @@ namespace MediaBrowser.UI // Without this the app will shutdown after the splash screen closes ShutdownMode = ShutdownMode.OnExplicitShutdown; - Kernel = InstantiateKernel(); + RegisterResources(); + + Kernel = new UIKernel(this, Logger); try { @@ -614,7 +618,8 @@ namespace MediaBrowser.UI { try { - ServerConfiguration = await ApiClient.GetServerConfigurationAsync(); + var b = Kernel; + //ServerConfiguration = await ApiClient.GetServerConfigurationAsync(); } catch (HttpException ex) { @@ -1010,6 +1015,19 @@ namespace MediaBrowser.UI return new ApplicationUpdateCheck().CheckForApplicationUpdate(cancellationToken, progress); } + /// + /// Registers resources that classes will depend on + /// + private void RegisterResources() + { + Register(this); + Register(Logger); + + IsoManager = new PismoIsoManager(Logger); + + Register(IsoManager); + } + /// /// Updates the application. /// @@ -1020,5 +1038,61 @@ namespace MediaBrowser.UI { return new ApplicationUpdater().UpdateApplication(cancellationToken, progress); } + + /// + /// Creates an instance of type and resolves all constructor dependancies + /// + /// The type. + /// System.Object. + public object CreateInstance(Type type) + { + try + { + return _container.GetInstance(type); + } + catch + { + Logger.Error("Error creating {0}", type.Name); + + throw; + } + } + + /// + /// Registers the specified obj. + /// + /// + /// The obj. + public void Register(T obj) + where T : class + { + _container.RegisterSingle(obj); + } + + /// + /// Resolves this instance. + /// + /// + /// ``0. + public T Resolve() + { + return (T)_container.GetRegistration(typeof(T), true).GetInstance(); + } + + /// + /// Resolves this instance. + /// + /// + /// ``0. + public T TryResolve() + { + var result = _container.GetRegistration(typeof(T), false); + + if (result == null) + { + return default(T); + } + return (T)result.GetInstance(); + } } } diff --git a/MediaBrowser.UI/Controller/UIKernel.cs b/MediaBrowser.UI/Controller/UIKernel.cs index 1bed49cf9f..118067140f 100644 --- a/MediaBrowser.UI/Controller/UIKernel.cs +++ b/MediaBrowser.UI/Controller/UIKernel.cs @@ -1,5 +1,4 @@ using MediaBrowser.ApiInteraction; -using MediaBrowser.Common.IO; using MediaBrowser.Common.Kernel; using MediaBrowser.Model.Connectivity; using MediaBrowser.Model.Logging; @@ -8,7 +7,6 @@ using MediaBrowser.UI.Configuration; using MediaBrowser.UI.Playback; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Net; using System.Net.Cache; using System.Net.Http; @@ -42,8 +40,8 @@ namespace MediaBrowser.UI.Controller /// /// Initializes a new instance of the class. /// - public UIKernel(IApplicationHost appHost, IIsoManager isoManager, ILogger logger) - : base(appHost, isoManager, logger) + public UIKernel(IApplicationHost appHost, ILogger logger) + : base(appHost, logger) { Instance = this; } @@ -52,14 +50,12 @@ namespace MediaBrowser.UI.Controller /// Gets the media players. /// /// The media players. - [ImportMany(typeof(BaseMediaPlayer))] public IEnumerable MediaPlayers { get; private set; } /// /// Gets the list of currently loaded themes /// /// The themes. - [ImportMany(typeof(BaseTheme))] public IEnumerable Themes { get; private set; } /// @@ -132,14 +128,17 @@ namespace MediaBrowser.UI.Controller } /// - /// Reloads the internal. + /// Finds the parts. /// - /// Task. - protected override Task ReloadInternal() + /// All types. + protected override void FindParts(Type[] allTypes) { - PlaybackManager = new PlaybackManager(this, Logger); + PlaybackManager = (PlaybackManager)ApplicationHost.CreateInstance(typeof(PlaybackManager)); + + base.FindParts(allTypes); - return base.ReloadInternal(); + Themes = GetExports(allTypes); + MediaPlayers = GetExports(allTypes); } /// diff --git a/MediaBrowser.UI/MediaBrowser.UI.csproj b/MediaBrowser.UI/MediaBrowser.UI.csproj index 5601d7c48a..1f8469cbcd 100644 --- a/MediaBrowser.UI/MediaBrowser.UI.csproj +++ b/MediaBrowser.UI/MediaBrowser.UI.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {B5ECE1FB-618E-420B-9A99-8E972D76920A} - Library + WinExe Properties MediaBrowser.UI MediaBrowser.UI @@ -86,6 +86,10 @@ x86 bin\x86\Release\ + + + true + ..\ThirdParty\Taygeta\Declarations.dll @@ -114,8 +118,10 @@ False ..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll + + ..\packages\SimpleInjector.2.0.0-beta5\lib\net40-client\SimpleInjector.dll + - diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs index 3efb28d225..9150280507 100644 --- a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs +++ b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Dto; -using System.ComponentModel.Composition; using MediaBrowser.Model.Logging; namespace MediaBrowser.UI.Playback.ExternalPlayer @@ -7,11 +6,9 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// /// Class GenericExternalPlayer /// - [Export(typeof(BaseMediaPlayer))] public class GenericExternalPlayer : BaseExternalPlayer { - [ImportingConstructor] - public GenericExternalPlayer([Import("logger")] ILogger logger) + public GenericExternalPlayer(ILogger logger) : base(logger) { } diff --git a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs index 7233eb64f8..2d596655b5 100644 --- a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs +++ b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs @@ -9,7 +9,6 @@ using MediaBrowser.UI.Configuration; using MediaBrowser.UI.Playback.InternalPlayer; using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Drawing; using System.IO; using System.Linq; @@ -21,11 +20,9 @@ namespace MediaBrowser.UI.Playback.NVlc /// /// Class InternalMediaPlayer /// - [Export(typeof(BaseMediaPlayer))] public class InternalMediaPlayerNVlc : BaseInternalMediaPlayer { - [ImportingConstructor] - public InternalMediaPlayerNVlc([Import("logger")] ILogger logger) + public InternalMediaPlayerNVlc(ILogger logger) : base(logger) { } diff --git a/MediaBrowser.UI/packages.config b/MediaBrowser.UI/packages.config index 14ccb1e02d..3de1bc355b 100644 --- a/MediaBrowser.UI/packages.config +++ b/MediaBrowser.UI/packages.config @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs index 4b9c0bd10b..9d42b10ae8 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs @@ -1,4 +1,5 @@ using MediaBrowser.Common.Kernel; +using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Controller; using MediaBrowser.Model.Logging; using System.ComponentModel.Composition; @@ -26,16 +27,22 @@ namespace MediaBrowser.WebDashboard.Api /// private readonly Kernel _kernel; + /// + /// Gets or sets the task manager. + /// + /// The task manager. + private readonly ITaskManager _taskManager; + /// /// Initializes a new instance of the class. /// /// The kernel. /// The logger. - [ImportingConstructor] - public DashboardInfoWebSocketListener([Import("kernel")] Kernel kernel, [Import("logger")] ILogger logger) + public DashboardInfoWebSocketListener(Kernel kernel, ILogger logger, ITaskManager taskManager) : base(logger) { _kernel = kernel; + _taskManager = taskManager; } /// @@ -45,7 +52,7 @@ namespace MediaBrowser.WebDashboard.Api /// Task{IEnumerable{TaskInfo}}. protected override Task GetDataToSend(object state) { - return Task.FromResult(DashboardService.GetDashboardInfo(_kernel, Logger)); + return Task.FromResult(DashboardService.GetDashboardInfo(_kernel, Logger, _taskManager)); } } } diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 7bf5bbab7f..aca9313064 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -78,6 +78,21 @@ namespace MediaBrowser.WebDashboard.Api [Export(typeof(IRestfulService))] public class DashboardService : BaseRestService { + /// + /// Gets or sets the task manager. + /// + /// The task manager. + private readonly ITaskManager _taskManager; + + /// + /// Initializes a new instance of the class. + /// + /// The task manager. + public DashboardService(ITaskManager taskManager) + { + _taskManager = taskManager; + } + /// /// Adds the routes. /// @@ -98,7 +113,7 @@ namespace MediaBrowser.WebDashboard.Api { var kernel = (Kernel)Kernel; - return GetDashboardInfo(kernel, Logger); + return GetDashboardInfo(kernel, Logger, _taskManager); } /// @@ -106,8 +121,9 @@ namespace MediaBrowser.WebDashboard.Api /// /// The kernel. /// The logger. + /// The task manager. /// DashboardInfo. - public static DashboardInfo GetDashboardInfo(Kernel kernel, ILogger logger) + public static DashboardInfo GetDashboardInfo(Kernel kernel, ILogger logger, ITaskManager taskManager) { var connections = kernel.UserManager.ActiveConnections.ToArray(); @@ -117,11 +133,11 @@ namespace MediaBrowser.WebDashboard.Api { SystemInfo = kernel.GetSystemInfo(), - RunningTasks = kernel.ScheduledTasks.Where(i => i.State == TaskState.Running || i.State == TaskState.Cancelling) + RunningTasks = taskManager.ScheduledTasks.Where(i => i.State == TaskState.Running || i.State == TaskState.Cancelling) .Select(ScheduledTaskHelpers.GetTaskInfo) .ToArray(), - ApplicationUpdateTaskId = kernel.ScheduledTasks.OfType().First().Id, + ApplicationUpdateTaskId = taskManager.ScheduledTasks.OfType().First().Id, ActiveConnections = connections, diff --git a/MediaBrowser.sln b/MediaBrowser.sln index 902792c2e9..9e009cd006 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Logging.NLog", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ClickOnce", "MediaBrowser.ClickOnce\MediaBrowser.ClickOnce.csproj", "{CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Networking", "MediaBrowser.Networking\MediaBrowser.Networking.csproj", "{7C11010E-179A-49B7-BFB2-F1656F5E71AD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -318,6 +320,20 @@ Global {CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}.Release|Win32.ActiveCfg = Release|Any CPU {CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}.Release|x64.ActiveCfg = Release|Any CPU {CC96BF3E-0BDA-4809-BC4B-BB6D418F4A84}.Release|x86.ActiveCfg = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|Win32.ActiveCfg = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|x64.ActiveCfg = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Debug|x86.ActiveCfg = Debug|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|Any CPU.Build.0 = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|Win32.ActiveCfg = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|x64.ActiveCfg = Release|Any CPU + {7C11010E-179A-49B7-BFB2-F1656F5E71AD}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- cgit v1.2.3 From e30b96217333cadb78dcc0a47545afd145c683a7 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Sat, 23 Feb 2013 10:22:59 -0500 Subject: fix missing del command in post build ignore of coreplugins is not working... --- MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.ServerApplication') diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index e16e97931a..9f9b87b052 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -390,7 +390,7 @@ xcopy "$(TargetDir)x86" "$(SolutionDir)..\Deploy\Server\System\x86" /y mkdir "$(SolutionDir)..\Deploy\Server\System\CorePlugins" xcopy "$(TargetDir)CorePlugins" "$(SolutionDir)..\Deploy\Server\System\CorePlugins" /y -del +del "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)7za" a -tzip "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)..\Deploy\Server\*" ) -- cgit v1.2.3