Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to .net5.0 and update nuget depedencies #12

Merged
merged 1 commit into from
Nov 16, 2020
Merged

chore: upgrade to .net5.0 and update nuget depedencies #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:2.2-stretch AS builder
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS builder

RUN apt-get update && \
apt-get install -y automake ca-certificates g++ git libtool libtesseract3 make pkg-config && \
Expand Down
8 changes: 4 additions & 4 deletions PgsToSrt/BluRaySup/BluRaySupParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
using System.IO;
using System.Text;
using Nikse.SubtitleEdit.Core.BluRaySup;
using Point = SixLabors.Primitives.Point;
using Rectangle = SixLabors.Primitives.Rectangle;
using Size = SixLabors.Primitives.Size;
using Point = SixLabors.ImageSharp.Point;
using Rectangle = SixLabors.ImageSharp.Rectangle;
using Size = SixLabors.ImageSharp.Size;

namespace PgsToSrt.BluRaySup
{
Expand Down Expand Up @@ -127,7 +127,7 @@ public static Image<Rgba32> DecodeImage(PcsObject pcs, IList<OdsData> data, List

var pal = DecodePalette(palettes);
var bm = new Image<Rgba32>(w, h);
var pixelSpan = bm.GetPixelSpan();
bm.TryGetSinglePixelSpan(out var pixelSpan);

int ofs = 0;
int xpos = 0;
Expand Down
13 changes: 7 additions & 6 deletions PgsToSrt/PgsToSrt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.0</FileVersion>
<Version>1.1.0</Version>
Expand All @@ -14,11 +14,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
<PackageReference Include="NLog" Version="4.5.11" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.3.0" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0007" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
<PackageReference Include="NLog" Version="4.7.5" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0010" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions libse/LibSE.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down