Commit Graph

209 Commits

Author SHA1 Message Date
crobibero 5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
Claus Vium e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
crobibero b216b91e21 Bump Microsoft.NET.Test.Sdk and add missing reference 2020-08-31 08:14:22 -06:00
crobibero bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
Bond-009 4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease
Use Prerelease System.Text.Json
2020-08-26 18:59:46 +02:00
crobibero 8b96881aa1 Clean up json Converters 2020-08-26 08:22:48 -06:00
crobibero 582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -06:00
crobibero 5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
2020-08-24 20:04:13 -04:00
crobibero 9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
Bond-009 03c89fa717
Merge pull request #3953 from crobibero/dotnetglob
bump DotNet.Glob
2020-08-21 22:32:47 +02:00
crobibero 89c9ca68f9 bump DotNet.Glob 2020-08-21 11:50:45 -06:00
Bond_009 301e029d42 Add unsupported ffmpeg version to tests 2020-08-20 17:45:40 +02:00
Bond_009 cb5cb075a9 Simplify FFmpeg detection code 2020-08-20 17:16:09 +02:00
Bond-009 5160e627f1
Merge branch 'master' into feature/ffmpeg-version-check 2020-08-20 16:40:03 +02:00
Patrick Barron a77cf53573 Allow plugins to register services. 2020-08-16 17:25:14 -04:00
crobibero 6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
dependabot[bot] 4fd2b7a879
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-10 12:01:45 +00:00
crobibero fffa94fc33 Apply fixes from review 2020-08-06 08:17:45 -06:00
crobibero 2b7cefdf15 Remove references to MediaBrowser.Api 2020-08-04 08:42:09 -06:00
crobibero 9e00aa3014 fix openapi validation errors 2020-08-03 14:38:51 -06:00
crobibero f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Odd Stråbø 7fa80ac3e0 Add more tests, update comment 2020-07-26 23:03:16 +02:00
Odd Stråbø 11d5410dbb Don't ignore dot directories.
Use `.ignore` file to hide directory from library scan.

Also, please tell me we handle sample matching somewhere else? This is a mess.
2020-07-25 23:50:49 +02:00
crobibero 1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Patrick Barron 4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
dkanada 87d7c4a62e
Merge pull request #3500 from nyanmisaka/vpp-qsv
Add FFmpeg 4.3 detection and solve the green line on QSV HWA
2020-07-14 20:31:13 +09:00
dependabot[bot] aefe011d7d
Bump AutoFixture from 4.12.0 to 4.13.0
Bumps [AutoFixture](https://github.com/AutoFixture/AutoFixture) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/AutoFixture/AutoFixture/releases)
- [Commits](https://github.com/AutoFixture/AutoFixture/compare/v4.12.0...v4.13.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-13 12:04:07 +00:00
dependabot[bot] 88d06aa156
Bump Moq from 4.14.4 to 4.14.5
Bumps [Moq](https://github.com/moq/moq4) from 4.14.4 to 4.14.5.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.4...v4.14.5)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-06 12:02:46 +00:00
nyanmisaka f5c5352861 add FFmpeg 4.3 detection and tests 2020-07-04 19:14:49 +08:00
Max Git 3588ee5229 Merge branch 'master' into feature/ffmpeg-version-check 2020-07-02 23:50:13 +02:00
dependabot[bot] 248a2d61dd
Bump Moq from 4.14.3 to 4.14.4
Bumps [Moq](https://github.com/moq/moq4) from 4.14.3 to 4.14.4.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.3...v4.14.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-30 02:20:44 +00:00
crobibero 80b43fb805 bump autofixture 2020-06-29 07:27:15 -06:00
dependabot[bot] 4e2115cd83
Bump AutoFixture from 4.11.0 to 4.12.0
Bumps [AutoFixture](https://github.com/AutoFixture/AutoFixture) from 4.11.0 to 4.12.0.
- [Release notes](https://github.com/AutoFixture/AutoFixture/releases)
- [Commits](https://github.com/AutoFixture/AutoFixture/compare/v4.11.0...v4.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-29 12:24:58 +00:00
crobibero 9772749d8f Add more ignorepatterns and tests 2020-06-26 11:04:35 -06:00
Max Git c35c401d65 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-23 09:20:50 +02:00
crobibero 1d7d480efe fix tests 2020-06-22 08:14:07 -06:00
dependabot[bot] 3e57898d6b
Bump Moq from 4.14.1 to 4.14.3
Bumps [Moq](https://github.com/moq/moq4) from 4.14.1 to 4.14.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.1...v4.14.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 12:01:53 +00:00
David 82c1da34be Fix tests 2020-06-20 18:29:29 +02:00
crobibero 29917699f0 Further cleanup and add final tests 2020-06-16 16:55:02 -06:00
crobibero b22fdbf59e Add tests and cleanup 2020-06-16 16:42:10 -06:00
crobibero 774fdbd031 Fix tests. 2020-06-16 14:12:40 -06:00
Max Git a57d664c7d Merge branch 'master' into feature/ffmpeg-version-check 2020-06-16 00:53:10 +02:00
dependabot[bot] 979137f567
Bump coverlet.collector from 1.2.1 to 1.3.0
Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](https://github.com/coverlet-coverage/coverlet/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-15 12:01:24 +00:00
Max Git 3fbc387257 Fix stylecop error like on master. 2020-06-15 12:15:05 +02:00
Max Git 37e737e012 Merge from master & fix conflict 2020-06-15 12:12:03 +02:00
crobibero 589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada 155ee5ee9d
Merge pull request #3329 from telans/code-analyzer-tests
Enable code analyzers for tests
2020-06-15 10:50:08 +09:00
telans 4cb8fbfbbf
fix StyleCop warning in Jellyfin.MediaEncoding.Tests 2020-06-14 18:56:47 +12:00
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00