diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-09-25 19:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-25 19:21:37 +0200 |
| commit | 2ee3e9e00f62ff8b0139f1273d7666d0f6c549a4 (patch) | |
| tree | 354f808d6687abcd3b5f862c0cb8c9e4fd754966 /src | |
| parent | d81c9a7a8cbab8967bfc66086c6f0f80bf7fc0c2 (diff) | |
| parent | 4643fd5dcbc6d1a4fbe973efc68d92ca71e3ab3b (diff) | |
Merge pull request #6590 from jellyfin/dotnet6
Diffstat (limited to 'src')
| -rw-r--r-- | src/Jellyfin.Extensions/Jellyfin.Extensions.csproj | 4 | ||||
| -rw-r--r-- | src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj index 2d9ce06fe..3d9538d1b 100644 --- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj +++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net5.0</TargetFramework> + <TargetFramework>net6.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateDocumentationFile>true</GenerateDocumentationFile> <PublishRepositoryUrl>true</PublishRepositoryUrl> @@ -22,7 +22,7 @@ <!-- Include all symbols in the main nupkg until Azure Artifact Feed starts supporting ingesting NuGet symbol packages. --> <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> </PropertyGroup> - + <ItemGroup> <Compile Include="../../SharedVersion.cs" /> </ItemGroup> diff --git a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs index c39805aa3..3c7d504b1 100644 --- a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs +++ b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs @@ -44,7 +44,7 @@ namespace Jellyfin.Extensions.Json.Converters { try { - parsedValues[i] = _typeConverter.ConvertFrom(stringEntries[i].Trim()); + parsedValues[i] = _typeConverter.ConvertFrom(stringEntries[i].Trim()) ?? throw new FormatException(); convertedCount++; } catch (FormatException) |