Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
KircMax committed Oct 21, 2024
2 parents cb9b44b + 8871e87 commit 4951bd7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Run tests
run: dotnet test --collect:"XPlat Code Coverage"
- name: Upload coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Code coverage ${{ matrix.os }}
path: "**/coverage.cobertura.xml"
Expand All @@ -55,12 +55,12 @@ jobs:
uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: Code coverage windows-latest
path: coverage-windows
- name: Generate coverage report
uses: danielpalme/[email protected].0
uses: danielpalme/[email protected].3
with:
reports: "**/coverage.cobertura.xml"
targetdir: "coverage-report"
Expand All @@ -85,7 +85,7 @@ jobs:
- name: Create packages
run: dotnet pack --configuration Release --output ./packages
- name: Upload a Build Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: NuGet packages
path: packages/*.*
Expand All @@ -101,15 +101,15 @@ jobs:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v4
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: NuGet packages
path: packages
- name: Print Files in packages folder
run: dir packages
- name: Push packages
run: dotnet nuget push "packages/*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
- uses: dotnet/[email protected].0
- uses: dotnet/[email protected].2
id: nbgv

- name: Create GitHub release
Expand All @@ -120,7 +120,7 @@ jobs:
tag_name: v${{ steps.nbgv.outputs.SemVer2 }}
release_name: v${{ steps.nbgv.outputs.SemVer2 }}
- name: Comment relevant issues and merge requests
uses: apexskier/[email protected].2
uses: apexskier/[email protected].6
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
comment-template: |
Expand Down
2 changes: 1 addition & 1 deletion src/Webserver.API/Webserver.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MimeMapping" Version="2.0.0" />
<PackageReference Include="MimeMapping" Version="3.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/Webserver.API.UnitTests/Webserver.Api.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MimeMapping" Version="2.0.0" />
<PackageReference Include="MimeMapping" Version="3.0.1" />
<PackageReference Include="nunit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
</ItemGroup>

Expand Down

0 comments on commit 4951bd7

Please sign in to comment.