Skip to content

Commit 7e5c367

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix/ChannelClosedException
2 parents 50a9789 + 63a1d79 commit 7e5c367

4 files changed

Lines changed: 24 additions & 15 deletions

File tree

.github/workflows/main.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,38 @@ on: [ "push", "pull_request" ]
44

55
jobs:
66
build:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-latest
8+
9+
permissions:
10+
id-token: write
811

912
steps:
10-
- uses: actions/checkout@v3
11-
with:
12-
submodules: true
13+
- uses: actions/checkout@v7
1314

1415
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
16+
uses: actions/setup-dotnet@v5
1617
with:
17-
dotnet-version: 7.x
18+
dotnet-version: 8.x
1819

1920
- name: Run the Cake script
20-
uses: cake-build/cake-action@94fa55b4f83cee90f2621654eba6a056ae71df90
21+
uses: cake-build/cake-action@v3
2122
with:
2223
verbosity: Diagnostic
2324

24-
- uses: actions/upload-artifact@v3
25+
- uses: actions/upload-artifact@v7
2526
with:
2627
name: nuget packages
2728
path: ./*/bin/Release*/*.nupkg
2829

30+
# Use NuGet trusted publishing: https://learn.microsoft.com/en-us/nuget/nuget-org/trusted-publishing
31+
- name: NuGet login
32+
uses: NuGet/login@v1
33+
id: login
34+
if: github.ref_type == 'tag'
35+
with:
36+
user: "${{ secrets.NUGET_USER }}"
37+
2938
- name: Push NuGet package
3039
if: github.ref_type == 'tag'
3140
run: |
32-
dotnet nuget push ./{Hazel,Impostor.Hazel.Abstractions}/bin/Release/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }}
41+
dotnet nuget push ./{Hazel,Impostor.Hazel.Abstractions}/bin/Release/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ steps.login.outputs.NUGET_API_KEY }}

Hazel/Hazel.csproj

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

33
<PropertyGroup>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<DefineConstants>HAZEL_BAG</DefineConstants>
77
<RootNamespace>Impostor.Hazel</RootNamespace>
88
<AssemblyName>Impostor.Hazel</AssemblyName>
@@ -16,8 +16,8 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.1" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
2121
<PackageReference Include="Serilog" Version="2.12.0" />
2222
</ItemGroup>
2323

Impostor.Hazel.Abstractions/Impostor.Hazel.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

Impostor.Hazel.Tests/Impostor.Hazel.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

0 commit comments

Comments
 (0)