From 5b34d04a3585ef2e08a3d37aaf77a4f23184a909 Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Fri, 17 Feb 2023 00:12:32 +0100 Subject: [PATCH 1/3] Add PackageOutputPath and format --- .github/workflows/release.yml | 2 +- ...re.Extensions.System.Drawing.Common.csproj | 31 ++++++++-------- FFMpegCore/FFMpegCore.csproj | 35 ++++++++++--------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c7725b..03504f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,5 +19,5 @@ jobs: run: dotnet pack FFMpegCore.sln --output build -c Release - name: Publish NuGet package - run: dotnet nuget push build/*.nupkg --source nuget.org --api-key ${{ secrets.NUGET_TOKEN }} + run: dotnet nuget push *.nupkg --source nuget.org --api-key ${{ secrets.NUGET_TOKEN }} diff --git a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj index aafb577..13cdc1a 100644 --- a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj +++ b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj @@ -1,21 +1,22 @@ - - true - Image extension for FFMpegCore using System.Common.Drawing - 5.0.0 - - - ffmpeg ffprobe convert video audio mediafile resize analyze muxing - Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev - + + true + Image extension for FFMpegCore using System.Common.Drawing + 5.0.0 + ../nupkg + + + ffmpeg ffprobe convert video audio mediafile resize analyze muxing + Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev + - - - + + + - - - + + + diff --git a/FFMpegCore/FFMpegCore.csproj b/FFMpegCore/FFMpegCore.csproj index 5db9cc8..843bdba 100644 --- a/FFMpegCore/FFMpegCore.csproj +++ b/FFMpegCore/FFMpegCore.csproj @@ -1,23 +1,24 @@  - - true - A .NET Standard FFMpeg/FFProbe wrapper for easily integrating media analysis and conversion into your .NET applications - 5.0.1 - - - ffmpeg ffprobe convert video audio mediafile resize analyze muxing - Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev - README.md - + + true + A .NET Standard FFMpeg/FFProbe wrapper for easily integrating media analysis and conversion into your .NET applications + 5.0.1 + ../nupkg + + + ffmpeg ffprobe convert video audio mediafile resize analyze muxing + Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev + README.md + - - - + + + - - - - + + + + From daa512c294f3ec2021b6d30c5f8a0cae9cc793aa Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Fri, 17 Feb 2023 00:13:34 +0100 Subject: [PATCH 2/3] Format remaining csproj files --- FFMpegCore.Examples/FFMpegCore.Examples.csproj | 18 +++++++++--------- FFMpegCore.Test/FFMpegCore.Test.csproj | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/FFMpegCore.Examples/FFMpegCore.Examples.csproj b/FFMpegCore.Examples/FFMpegCore.Examples.csproj index db3c66e..555f4b7 100644 --- a/FFMpegCore.Examples/FFMpegCore.Examples.csproj +++ b/FFMpegCore.Examples/FFMpegCore.Examples.csproj @@ -1,14 +1,14 @@ - - Exe - net6.0 - false - + + Exe + net6.0 + false + - - - - + + + + diff --git a/FFMpegCore.Test/FFMpegCore.Test.csproj b/FFMpegCore.Test/FFMpegCore.Test.csproj index def07d2..0243372 100644 --- a/FFMpegCore.Test/FFMpegCore.Test.csproj +++ b/FFMpegCore.Test/FFMpegCore.Test.csproj @@ -12,19 +12,19 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - - + + From 8fff02d8d6ab09c5045fa4f2c75466804720a44e Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Fri, 17 Feb 2023 00:14:23 +0100 Subject: [PATCH 3/3] Add --skip-duplicate --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03504f0..9ec3258 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,5 +19,5 @@ jobs: run: dotnet pack FFMpegCore.sln --output build -c Release - name: Publish NuGet package - run: dotnet nuget push *.nupkg --source nuget.org --api-key ${{ secrets.NUGET_TOKEN }} + run: dotnet nuget push *.nupkg --skip-duplicate --source nuget.org --api-key ${{ secrets.NUGET_TOKEN }}