diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-08-13 00:33:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 00:33:18 +0200 |
| commit | e5a29824e5126bead4194fff3e9f7d95133c9fb7 (patch) | |
| tree | 679f8fe5926fef2f518567df049703a4092b4acc /Jellyfin.Server.Implementations | |
| parent | 1f99c9b90c5b791bb41ff711ad20b390f4f2268f (diff) | |
| parent | f83a5bb08eeb503b1ff40507b966af1b266fbaa7 (diff) | |
Merge branch 'master' into minor15
Diffstat (limited to 'Jellyfin.Server.Implementations')
| -rw-r--r-- | Jellyfin.Server.Implementations/Activity/ActivityManager.cs | 5 | ||||
| -rw-r--r-- | Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs index 27360afb0a..a3a2a8baff 100644 --- a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs +++ b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs @@ -86,15 +86,12 @@ namespace Jellyfin.Server.Implementations.Activity private static ActivityLogEntry ConvertToOldModel(ActivityLog entry) { - return new ActivityLogEntry + return new ActivityLogEntry(entry.Name, entry.Type, entry.UserId) { Id = entry.Id, - Name = entry.Name, Overview = entry.Overview, ShortOverview = entry.ShortOverview, - Type = entry.Type, ItemId = entry.ItemId, - UserId = entry.UserId, Date = entry.DateCreated, Severity = entry.LogSeverity }; diff --git a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj index eeeb1d19bf..728f9021dc 100644 --- a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj +++ b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj @@ -4,14 +4,6 @@ <TargetFramework>net5.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateDocumentationFile>true</GenerateDocumentationFile> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <Nullable>enable</Nullable> - <AnalysisMode>AllEnabledByDefault</AnalysisMode> - <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - - <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> - <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <!-- Code analysers--> @@ -27,13 +19,13 @@ <ItemGroup> <PackageReference Include="System.Linq.Async" Version="5.0.0" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.7" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7"> + <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.8" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.8" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.8"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7"> + <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.8"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> |