Skip to content

Commit 9a3093a

Browse files
committed
Optimize NuGet push logic
1 parent 7e8a7d2 commit 9a3093a

7 files changed

Lines changed: 28 additions & 68 deletions

File tree

.github/FUNDING.yml

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

.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@v2
21-
- name: Setup .NET 6
22-
uses: actions/setup-dotnet@v1
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
@@ -43,8 +46,13 @@ jobs:
4346
- name: Build project and generate NuGet package
4447
run: |
4548
dotnet pack --configuration Release --output $GITHUB_WORKSPACE/out src/Nager.DataFragmentationHandler/Nager.DataFragmentationHandler.csproj
49+
- name: NuGet login
50+
uses: NuGet/login@v1
51+
id: login
52+
with:
53+
user: ${{secrets.NUGET_USER}}
4654
- name: Push NuGet package
4755
if: github.event_name != 'pull_request'
4856
run: |
4957
cd $GITHUB_WORKSPACE/out
50-
dotnet nuget push *.nupkg --source https://www.nuget.org/api/v2/package --api-key ${{secrets.NUGET_TOKEN}} --skip-duplicate --no-symbols
58+
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.DataFragmentationHandler.UnitTest/DataPackageHandlerTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ public class DataPackageHandlerTest
1515
private readonly SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(0);
1616

1717
[TestMethod]
18-
[ExpectedException(typeof(BufferSizeTooSmallException))]
1918
public void DataPackageHandler_BufferSizeTooSmall()
2019
{
2120
var loggerMock = LoggerHelper.GetLogger<DataPackageHandler>();
2221
var dataPackageAnalyzerMock = new Mock<IDataPackageAnalyzer>();
2322

2423
var dataPackageHandler = new DataPackageHandler(dataPackageAnalyzerMock.Object, bufferSize: 5, loggerMock.Object);
25-
dataPackageHandler.AddData(new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 });
24+
Assert.ThrowsExactly<BufferSizeTooSmallException>(() =>
25+
{
26+
dataPackageHandler.AddData(new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 });
27+
});
2628
}
2729

2830
[TestMethod]

src/Nager.DataFragmentationHandler.UnitTest/Nager.DataFragmentationHandler.UnitTest.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
11-
<PackageReference Include="Moq" Version="4.17.2" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
13-
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
14-
<PackageReference Include="coverlet.collector" Version="3.1.2">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
11+
<PackageReference Include="Moq" Version="4.20.72" />
12+
<PackageReference Include="MSTest.TestAdapter" Version="4.1.0" />
13+
<PackageReference Include="MSTest.TestFramework" Version="4.1.0" />
14+
<PackageReference Include="coverlet.collector" Version="8.0.0">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

src/Nager.DataFragmentationHandler.sln

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<Solution>
2+
<Project Path="Nager.DataFragmentationHandler.UnitTest/Nager.DataFragmentationHandler.UnitTest.csproj" />
3+
<Project Path="Nager.DataFragmentationHandler/Nager.DataFragmentationHandler.csproj" />
4+
</Solution>

src/Nager.DataFragmentationHandler/Nager.DataFragmentationHandler.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

0 commit comments

Comments
 (0)