Skip to content

Commit 03eafbc

Browse files
committed
Optimize NuGet push logic
1 parent 0081640 commit 03eafbc

File tree

5 files changed

+38
-44
lines changed

5 files changed

+38
-44
lines changed

.github/workflows/dotnet.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@ jobs:
1515
build:
1616

1717
runs-on: ubuntu-latest
18+
19+
permissions:
20+
id-token: write
1821

1922
steps:
20-
- uses: actions/checkout@v3
21-
- name: Setup .NET 6.0
22-
uses: actions/setup-dotnet@v3
23+
- uses: actions/checkout@v6
24+
- name: Setup .NET
25+
uses: actions/setup-dotnet@v5
2326
with:
24-
dotnet-version: 6.0.x
27+
dotnet-version: 10.0.x
2528
- name: Restore dependencies
2629
working-directory: ./src
2730
run: dotnet restore
@@ -35,8 +38,13 @@ jobs:
3538
- name: Build project and generate NuGet package
3639
run: |
3740
dotnet pack --configuration Release --output $GITHUB_WORKSPACE/out src/Nager.VideoStream/Nager.VideoStream.csproj
41+
- name: NuGet login
42+
uses: NuGet/login@v1
43+
id: login
44+
with:
45+
user: ${{secrets.NUGET_USER}}
3846
- name: Push NuGet package
3947
if: github.event_name != 'pull_request'
4048
run: |
4149
cd $GITHUB_WORKSPACE/out
42-
dotnet nuget push *.nupkg --source https://www.nuget.org/api/v2/package --api-key ${{secrets.NUGET_TOKEN}} --skip-duplicate --no-symbols
50+
dotnet nuget push *.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{steps.login.outputs.NUGET_API_KEY}} --skip-duplicate --no-symbols

src/Nager.VideoStream.TestConsole/Nager.VideoStream.TestConsole.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

src/Nager.VideoStream.sln

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/Nager.VideoStream.slnx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<Solution>
2+
<Project Path="Nager.VideoStream.TestConsole/Nager.VideoStream.TestConsole.csproj" />
3+
<Project Path="Nager.VideoStream/Nager.VideoStream.csproj" />
4+
</Solution>

src/Nager.VideoStream/Nager.VideoStream.csproj

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net48;net6</TargetFrameworks>
54
<Authors>Tino Hager</Authors>
6-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
7-
<RepositoryUrl>https://github.com/nager/Nager.VideoStream</RepositoryUrl>
8-
<PackageTags>video stream rtsp frame camera</PackageTags>
5+
<Company>nager.at</Company>
96
<Description>Read frames from a rtsp video stream or from a video file</Description>
7+
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
109
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11-
<Version>1.2.0</Version>
12-
<PackageReleaseNotes>Add icon to nuget package</PackageReleaseNotes>
10+
11+
<LangVersion>12.0</LangVersion>
1312
<IncludeSymbols>true</IncludeSymbols>
14-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
13+
14+
<Nullable>enable</Nullable>
15+
1516
<PackageIcon>camera.png</PackageIcon>
17+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
18+
<!--<PackageReadmeFile>README.md</PackageReadmeFile>-->
19+
<!--<PackageReleaseNotes>A changelog is available at https://github.com/nager/Nager.VideoStream/releases</PackageReleaseNotes>-->
20+
<PackageProjectUrl>https://github.com/nager/Nager.VideoStream</PackageProjectUrl>
21+
<PackageTags>video;stream;rtsp;frame;camera</PackageTags>
22+
23+
<RepositoryUrl>https://github.com/nager/Nager.VideoStream</RepositoryUrl>
24+
25+
<TargetFrameworks>net481;netstandard2.0;net10.0</TargetFrameworks>
26+
27+
<!-- Version is automatically replaced by build process -->
28+
<Version>1.3.0</Version>
1629
</PropertyGroup>
1730

1831
<ItemGroup>

0 commit comments

Comments
 (0)