diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 995b5cdf11..4f54b52498 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -36,29 +38,25 @@
Always
-
- False
+
+
+
+
+
+
+
..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
-
- False
+
..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll
-
- False
+
..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll
-
- False
+
..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
-
-
-
-
-
-
-
+
@@ -131,15 +129,15 @@
- {9142eefa-7570-41e1-bfcc-468bb571af2f}
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
MediaBrowser.Common
- {17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}
MediaBrowser.Controller
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index a96f2c354b..79514b5cbd 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -35,18 +37,6 @@
Always
-
- False
- ..\packages\NLog.2.0.1.2\lib\net45\NLog.dll
-
-
- False
- ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
-
-
- False
- ..\packages\SimpleInjector.2.3.5\lib\net40-client\SimpleInjector.dll
-
@@ -54,6 +44,15 @@
+
+ ..\packages\NLog.2.0.1.2\lib\net45\NLog.dll
+
+
+ ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
+
+
+ ..\packages\SimpleInjector.2.3.5\lib\net40-client\SimpleInjector.dll
+
@@ -88,11 +87,11 @@
- {9142eefa-7570-41e1-bfcc-468bb571af2f}
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
MediaBrowser.Common
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 1611c55da0..8acd1a83cb 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -32,26 +34,19 @@
prompt
4
-
-
-
-
-
- False
+
+
+
+
..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll
-
- False
+
..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll
-
- False
+
..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
-
-
-
@@ -113,7 +108,7 @@
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index b5ad862bee..0b27a350bd 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -42,6 +44,8 @@
x86
prompt
MinimumRecommendedRules.ruleset
+ 4
+ false
bin\x86\Release\
@@ -51,12 +55,9 @@
x86
prompt
MinimumRecommendedRules.ruleset
+ 4
-
- False
- ..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
-
@@ -66,6 +67,9 @@
+
+ ..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
+
@@ -174,11 +178,11 @@
- {9142eefa-7570-41e1-bfcc-468bb571af2f}
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
MediaBrowser.Common
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 8fb471c2d1..fa4fc29862 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -14,6 +14,8 @@
..\
true
..\packages\Fody.1.17.0.0
+ 10.0.0
+ 2.0
true
@@ -162,14 +164,13 @@
-
- False
- ..\packages\PropertyChanged.Fody.1.41.0.0\Lib\NET35\PropertyChanged.dll
- False
-
+
+ ..\packages\PropertyChanged.Fody.1.41.0.0\Lib\NET35\PropertyChanged.dll
+ False
+
diff --git a/MediaBrowser.Mono.sln b/MediaBrowser.Mono.sln
new file mode 100644
index 0000000000..0dc78ca2a2
--- /dev/null
+++ b/MediaBrowser.Mono.sln
@@ -0,0 +1,68 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Model", "MediaBrowser.Model\MediaBrowser.Model.csproj", "{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Common", "MediaBrowser.Common\MediaBrowser.Common.csproj", "{9142EEFA-7570-41E1-BFCC-468BB571AF2F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Common.Implementations", "MediaBrowser.Common.Implementations\MediaBrowser.Common.Implementations.csproj", "{C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Controller", "MediaBrowser.Controller\MediaBrowser.Controller.csproj", "{17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Providers", "MediaBrowser.Providers\MediaBrowser.Providers.csproj", "{442B5058-DCAF-4263-BB6A-F21E31120A1B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Implementations", "MediaBrowser.Server.Implementations\MediaBrowser.Server.Implementations.csproj", "{2E781478-814D-4A48-9D80-BFF206441A65}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.WebDashboard", "MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj", "{5624B7B5-B5A7-41D8-9F10-CC5611109619}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Api", "MediaBrowser.Api\MediaBrowser.Api.csproj", "{4FD51AC5-2C16-4308-A993-C3A84F3B4582}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Mono", "MediaBrowser.Server.Mono\MediaBrowser.Server.Mono.csproj", "{A7FE75CD-3CB4-4E71-A5BF-5347721EC8E0}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|x86.ActiveCfg = Debug|x86
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Debug|x86.Build.0 = Debug|x86
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.ActiveCfg = Release|x86
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}.Release|x86.Build.0 = Release|x86
+ {2E781478-814D-4A48-9D80-BFF206441A65}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2E781478-814D-4A48-9D80-BFF206441A65}.Debug|x86.Build.0 = Debug|Any CPU
+ {2E781478-814D-4A48-9D80-BFF206441A65}.Release|x86.ActiveCfg = Release|Any CPU
+ {2E781478-814D-4A48-9D80-BFF206441A65}.Release|x86.Build.0 = Release|Any CPU
+ {442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {442B5058-DCAF-4263-BB6A-F21E31120A1B}.Debug|x86.Build.0 = Debug|Any CPU
+ {442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|x86.ActiveCfg = Release|Any CPU
+ {442B5058-DCAF-4263-BB6A-F21E31120A1B}.Release|x86.Build.0 = Release|Any CPU
+ {4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Debug|x86.Build.0 = Debug|Any CPU
+ {4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x86.ActiveCfg = Release|Any CPU
+ {4FD51AC5-2C16-4308-A993-C3A84F3B4582}.Release|x86.Build.0 = Release|Any CPU
+ {5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5624B7B5-B5A7-41D8-9F10-CC5611109619}.Debug|x86.Build.0 = Debug|Any CPU
+ {5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x86.ActiveCfg = Release|Any CPU
+ {5624B7B5-B5A7-41D8-9F10-CC5611109619}.Release|x86.Build.0 = Release|Any CPU
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|x86.Build.0 = Debug|Any CPU
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x86.ActiveCfg = Release|Any CPU
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|x86.Build.0 = Release|Any CPU
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Debug|x86.Build.0 = Debug|Any CPU
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x86.ActiveCfg = Release|Any CPU
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}.Release|x86.Build.0 = Release|Any CPU
+ {A7FE75CD-3CB4-4E71-A5BF-5347721EC8E0}.Debug|x86.ActiveCfg = Debug|x86
+ {A7FE75CD-3CB4-4E71-A5BF-5347721EC8E0}.Debug|x86.Build.0 = Debug|x86
+ {A7FE75CD-3CB4-4E71-A5BF-5347721EC8E0}.Release|x86.ActiveCfg = Release|x86
+ {A7FE75CD-3CB4-4E71-A5BF-5347721EC8E0}.Release|x86.Build.0 = Release|x86
+ {C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Debug|x86.Build.0 = Debug|Any CPU
+ {C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|x86.ActiveCfg = Release|Any CPU
+ {C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = MediaBrowser.Server.Mono\MediaBrowser.Server.Mono.csproj
+ EndGlobalSection
+EndGlobal
diff --git a/MediaBrowser.Mono.userprefs b/MediaBrowser.Mono.userprefs
new file mode 100644
index 0000000000..95fb57a897
--- /dev/null
+++ b/MediaBrowser.Mono.userprefs
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 139c622fc3..ef94d77d16 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -32,10 +34,6 @@
4
-
- False
- ..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
-
@@ -44,6 +42,9 @@
+
+ ..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
+
@@ -116,15 +117,15 @@
- {9142eefa-7570-41e1-bfcc-468bb571af2f}
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
MediaBrowser.Common
- {17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}
MediaBrowser.Controller
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
index eb89210ffc..b9e033d230 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -41,8 +41,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Task.
public async Task Run(IProgress progress, CancellationToken cancellationToken)
{
- var allItems = _libraryManager.RootFolder.RecursiveChildren.OfType().ToList();
-
var userLibraries = _userManager.Users
.Select(i => new Tuple>(i.Id, i.RootFolder.GetRecursiveChildren(i).OfType().ToList()))
.ToList();
@@ -79,6 +77,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
await UpdateItemByNameCounts(name, cancellationToken, masterDictionary[name]).ConfigureAwait(false);
}
+ catch (OperationCanceledException)
+ {
+ // Don't clutter the log
+ }
catch (Exception ex)
{
_logger.ErrorException("Error updating counts for {0}", ex, name);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
index 9a34dd1b06..e4d989c334 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -42,16 +42,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Task.
public async Task Run(IProgress progress, CancellationToken cancellationToken)
{
- var allItems = _libraryManager.RootFolder.RecursiveChildren
- .Where(i => !(i is IHasMusicGenres) && !(i is Game))
- .ToList();
-
var userLibraries = _userManager.Users
.Select(i => new Tuple>(i.Id, i.RootFolder.GetRecursiveChildren(i).Where(m => !(m is IHasMusicGenres) && !(m is Game)).ToList()))
.ToList();
- var allLibraryItems = allItems;
-
var masterDictionary = new Dictionary>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
@@ -84,6 +78,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
await UpdateItemByNameCounts(name, cancellationToken, masterDictionary[name]).ConfigureAwait(false);
}
+ catch (OperationCanceledException)
+ {
+ // Don't clutter the log
+ }
catch (Exception ex)
{
_logger.ErrorException("Error updating counts for {0}", ex, name);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index 1b211d5f40..1edc247622 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -42,16 +42,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Task.
public async Task Run(IProgress progress, CancellationToken cancellationToken)
{
- var allItems = _libraryManager.RootFolder.RecursiveChildren
- .Where(i => i is IHasMusicGenres)
- .ToList();
-
var userLibraries = _userManager.Users
.Select(i => new Tuple>(i.Id, i.RootFolder.GetRecursiveChildren(i).Where(m => m is IHasMusicGenres).ToList()))
.ToList();
- var allLibraryItems = allItems;
-
var masterDictionary = new Dictionary>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
@@ -84,6 +78,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
await UpdateItemByNameCounts(name, cancellationToken, masterDictionary[name]).ConfigureAwait(false);
}
+ catch (OperationCanceledException)
+ {
+ // Don't clutter the log
+ }
catch (Exception ex)
{
_logger.ErrorException("Error updating counts for {0}", ex, name);
diff --git a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
index a4d880329b..05689f8e53 100644
--- a/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -41,14 +41,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Task.
public async Task Run(IProgress progress, CancellationToken cancellationToken)
{
- var allItems = _libraryManager.RootFolder.RecursiveChildren.ToList();
-
var userLibraries = _userManager.Users
.Select(i => new Tuple>(i.Id, i.RootFolder.GetRecursiveChildren(i).ToList()))
.ToList();
- var allLibraryItems = allItems;
-
var masterDictionary = new Dictionary>>(StringComparer.OrdinalIgnoreCase);
// Populate counts of items
@@ -81,6 +77,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
await UpdateItemByNameCounts(name, cancellationToken, masterDictionary[name]).ConfigureAwait(false);
}
+ catch (OperationCanceledException)
+ {
+ // Don't clutter the log
+ }
catch (Exception ex)
{
_logger.ErrorException("Error updating counts for {0}", ex, name);
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 3c20217509..e44089cc16 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -35,77 +37,65 @@
..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll
-
- False
- ..\packages\MediaBrowser.BdInfo.1.0.0.2\lib\net45\BdInfo.dll
-
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll
-
- False
+
+
+
+
+ ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll
+
+
+ ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll
+
+
+ ..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll
+
+
+
+
+
+
+
+ ..\packages\MediaBrowser.BdInfo.1.0.0.2\lib\net45\BdInfo.dll
+
+
..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll
-
- False
+
..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.dll
-
- False
+
..\packages\ServiceStack.Api.Swagger.3.9.59\lib\net35\ServiceStack.Api.Swagger.dll
-
- False
+
..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll
-
- False
+
..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll
-
- False
+
..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.SqlServer.dll
-
- False
+
..\packages\ServiceStack.Redis.3.9.43\lib\net35\ServiceStack.Redis.dll
-
- False
+
..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.ServiceInterface.dll
-
- False
+
..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
-
-
-
- False
+
..\packages\System.Data.SQLite.x86.1.0.88.0\lib\net45\System.Data.SQLite.dll
-
- False
+
..\packages\System.Data.SQLite.x86.1.0.88.0\lib\net45\System.Data.SQLite.Linq.dll
-
-
- ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll
-
-
- ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll
-
-
- ..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll
-
-
-
-
-
-
@@ -223,19 +213,19 @@
- {c4d2573a-3fd3-441f-81af-174ac4cd4e1d}
+ {C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}
MediaBrowser.Common.Implementations
- {9142eefa-7570-41e1-bfcc-468bb571af2f}
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
MediaBrowser.Common
- {17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}
MediaBrowser.Controller
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model
diff --git a/MediaBrowser.Server.Mono/MainWindow.cs b/MediaBrowser.Server.Mono/MainWindow.cs
new file mode 100644
index 0000000000..229f44dab9
--- /dev/null
+++ b/MediaBrowser.Server.Mono/MainWindow.cs
@@ -0,0 +1,16 @@
+using System;
+using Gtk;
+
+public partial class MainWindow: Gtk.Window
+{
+ public MainWindow (): base (Gtk.WindowType.Toplevel)
+ {
+ Build ();
+ }
+
+ protected void OnDeleteEvent (object sender, DeleteEventArgs a)
+ {
+ Application.Quit ();
+ a.RetVal = true;
+ }
+}
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
new file mode 100644
index 0000000000..a97ab4facd
--- /dev/null
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -0,0 +1,91 @@
+
+
+
+ Debug
+ x86
+ 10.0.0
+ 2.0
+ {A7FE75CD-3CB4-4E71-A5BF-5347721EC8E0}
+ WinExe
+ MediaBrowser.Server.Mono
+ MediaBrowser.Server.Mono
+ v4.5
+
+
+ true
+ full
+ false
+ bin\Debug
+ DEBUG;
+ prompt
+ 4
+ x86
+ false
+
+
+ full
+ true
+ bin\Release
+ prompt
+ 4
+ x86
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gui.stetic
+
+
+
+
+
+
+
+
+
+
+
+
+ {5624B7B5-B5A7-41D8-9F10-CC5611109619}
+ MediaBrowser.WebDashboard
+
+
+ {2E781478-814D-4A48-9D80-BFF206441A65}
+ MediaBrowser.Server.Implementations
+
+
+ {442B5058-DCAF-4263-BB6A-F21E31120A1B}
+ MediaBrowser.Providers
+
+
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
+ MediaBrowser.Model
+
+
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}
+ MediaBrowser.Controller
+
+
+ {C4D2573A-3FD3-441F-81AF-174AC4CD4E1D}
+ MediaBrowser.Common.Implementations
+
+
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
+ MediaBrowser.Common
+
+
+ {4FD51AC5-2C16-4308-A993-C3A84F3B4582}
+ MediaBrowser.Api
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs
new file mode 100644
index 0000000000..72dee11621
--- /dev/null
+++ b/MediaBrowser.Server.Mono/Program.cs
@@ -0,0 +1,16 @@
+using System;
+using Gtk;
+
+namespace MediaBrowser.Server.Mono
+{
+ class MainClass
+ {
+ public static void Main (string[] args)
+ {
+ Application.Init ();
+ MainWindow win = new MainWindow ();
+ win.Show ();
+ Application.Run ();
+ }
+ }
+}
diff --git a/MediaBrowser.Server.Mono/Properties/AssemblyInfo.cs b/MediaBrowser.Server.Mono/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..0a2e932200
--- /dev/null
+++ b/MediaBrowser.Server.Mono/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+[assembly: AssemblyTitle ("MediaBrowser.Server.Mono")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("Luke")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+[assembly: AssemblyVersion ("1.0.*")]
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/MediaBrowser.Server.Mono/gtk-gui/MainWindow.cs b/MediaBrowser.Server.Mono/gtk-gui/MainWindow.cs
new file mode 100644
index 0000000000..c481dfc8c7
--- /dev/null
+++ b/MediaBrowser.Server.Mono/gtk-gui/MainWindow.cs
@@ -0,0 +1,20 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+public partial class MainWindow
+{
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget MainWindow
+ this.Name = "MainWindow";
+ this.Title = global::Mono.Unix.Catalog.GetString ("MainWindow");
+ this.WindowPosition = ((global::Gtk.WindowPosition)(4));
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.DefaultWidth = 400;
+ this.DefaultHeight = 300;
+ this.Show ();
+ this.DeleteEvent += new global::Gtk.DeleteEventHandler (this.OnDeleteEvent);
+ }
+}
diff --git a/MediaBrowser.Server.Mono/gtk-gui/generated.cs b/MediaBrowser.Server.Mono/gtk-gui/generated.cs
new file mode 100644
index 0000000000..9ef3363981
--- /dev/null
+++ b/MediaBrowser.Server.Mono/gtk-gui/generated.cs
@@ -0,0 +1,29 @@
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace Stetic
+{
+ internal class Gui
+ {
+ private static bool initialized;
+
+ internal static void Initialize (Gtk.Widget iconRenderer)
+ {
+ if ((Stetic.Gui.initialized == false)) {
+ Stetic.Gui.initialized = true;
+ }
+ }
+ }
+
+ internal class ActionGroups
+ {
+ public static Gtk.ActionGroup GetActionGroup (System.Type type)
+ {
+ return Stetic.ActionGroups.GetActionGroup (type.FullName);
+ }
+
+ public static Gtk.ActionGroup GetActionGroup (string name)
+ {
+ return null;
+ }
+ }
+}
diff --git a/MediaBrowser.Server.Mono/gtk-gui/gui.stetic b/MediaBrowser.Server.Mono/gtk-gui/gui.stetic
new file mode 100644
index 0000000000..d564b44466
--- /dev/null
+++ b/MediaBrowser.Server.Mono/gtk-gui/gui.stetic
@@ -0,0 +1,19 @@
+
+
+
+ 2.12
+
+
+
+
+
+
+
+ MainWindow
+ CenterOnParent
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 1fbc019525..6a599da453 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -13,6 +13,8 @@
512
..\
true
+ 10.0.0
+ 2.0
true
@@ -35,24 +37,21 @@
Always
-
- False
- ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll
-
-
- False
- ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll
-
-
- False
- ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
-
+
+ ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll
+
+
+ ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll
+
+
+ ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll
+
@@ -67,15 +66,15 @@
- {9142eefa-7570-41e1-bfcc-468bb571af2f}
+ {9142EEFA-7570-41E1-BFCC-468BB571AF2F}
MediaBrowser.Common
- {17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}
+ {17E1F4E6-8ABD-4FE5-9ECF-43D4B6087BA2}
MediaBrowser.Controller
- {7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}
+ {7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}
MediaBrowser.Model