Skip to content

Commit 19371f9

Browse files
buehlerbuehler
authored
Merge branch 'main' into patch-1
2 parents e54015e + fe1d636 commit 19371f9

9 files changed

Lines changed: 34 additions & 24 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-grpc": {
6-
"version": "2.71.0",
6+
"version": "2.80.0",
77
"commands": [
88
"dotnet-grpc"
99
]

‎.github/workflows/dotnet-release.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,39 @@ on:
99
jobs:
1010
semantic-release:
1111
runs-on: ubuntu-latest
12+
permissions:
13+
id-token: write
14+
contents: write
15+
issues: write
1216
steps:
13-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1418
- uses: bufbuild/buf-setup-action@v1
1519
with:
1620
github_token: ${{ secrets.GITHUB_TOKEN }}
17-
- uses: extractions/setup-just@v1
21+
- uses: extractions/setup-just@v4
1822
with:
1923
github-token: ${{ secrets.GITHUB_TOKEN }}
2024
- name: Setup .NET
21-
uses: actions/setup-dotnet@v3
25+
uses: actions/setup-dotnet@v5
2226
with:
2327
dotnet-version: 8.x
2428
- name: Setup dotnet tools
2529
run: dotnet tool restore
2630
- name: Generate gRPC code
2731
run: just generate-grpc
32+
33+
- name: NuGet login
34+
uses: NuGet/login@v1
35+
id: login
36+
with:
37+
user: ${{ secrets.NUGET_USER }}
38+
2839
- name: Semantic Release
29-
uses: cycjimmy/semantic-release-action@v3
40+
uses: cycjimmy/semantic-release-action@v6
3041
with:
3142
semantic_version: 19
3243
extra_plugins: |
3344
semantic-release-net
3445
env:
3546
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
NUGET_TOKEN: ${{ secrets.NUGET_API_KEY }}
47+
NUGET_TOKEN: ${{ steps.login.outputs.NUGET_API_KEY }}

‎.github/workflows/dotnet-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
version:
1616
- 8.x
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
- uses: bufbuild/buf-setup-action@v1
2020
with:
2121
github_token: ${{ secrets.GITHUB_TOKEN }}
22-
- uses: extractions/setup-just@v1
22+
- uses: extractions/setup-just@v4
2323
with:
2424
github-token: ${{ secrets.GITHUB_TOKEN }}
2525
- name: Setup .NET
26-
uses: actions/setup-dotnet@v3
26+
uses: actions/setup-dotnet@v5
2727
with:
2828
dotnet-version: ${{ matrix.version }}
2929
- name: Setup dotnet tools

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
Version="9.32.0.97167"
4646
PrivateAssets="all"
4747
Condition="$(MSBuildProjectExtension) == '.csproj'" />
48-
<PackageReference Include="Roslynator.Analyzers" Version="4.14.1" PrivateAssets="All" />
48+
<PackageReference Include="Roslynator.Analyzers" Version="4.15.0" PrivateAssets="All" />
4949
</ItemGroup>
5050

5151
<ItemGroup>

‎src/Zitadel/Authentication/Options/ZitadelIntrospectionOptions.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using IdentityModel.AspNetCore.OAuth2Introspection;
22

3-
using Zitadel.Credentials;
4-
53
namespace Zitadel.Authentication.Options;
64

75
/// <summary>
@@ -26,5 +24,5 @@ public class ZitadelIntrospectionOptions : OAuth2IntrospectionOptions
2624
/// the client assertion is added.
2725
/// </para>
2826
/// </summary>
29-
public Application? JwtProfile { get; set; }
27+
public global::Zitadel.Credentials.Application? JwtProfile { get; set; }
3028
}

‎src/Zitadel/Zitadel.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
21-
<PackageReference Include="Google.Protobuf" Version="3.33.0" />
21+
<PackageReference Include="Google.Protobuf" Version="3.34.1" />
2222
<PackageReference Include="Grpc" Version="2.46.6"/>
23-
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.71.0" />
24-
<PackageReference Include="Grpc.Net.Common" Version="2.71.0" />
23+
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.80.0" />
24+
<PackageReference Include="Grpc.Net.Common" Version="2.80.0" />
2525
<PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0"/>
26-
<PackageReference Include="jose-jwt" Version="5.2.0" />
26+
<PackageReference Include="jose-jwt" Version="5.3.0" />
2727
</ItemGroup>
2828

2929
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
30-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.21"/>
31-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.21"/>
30+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.26"/>
31+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.26"/>
3232
</ItemGroup>
3333

3434
</Project>

‎tests/Zitadel.Test/Credentials/Application.Test.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using Xunit;
44

5-
using Zitadel.Credentials;
5+
using ZitadelApplication = Zitadel.Credentials.Application;
66

77
namespace Zitadel.Test.Credentials;
88

@@ -11,14 +11,14 @@ public class ApplicationTest
1111
[Fact]
1212
public async Task Load_App_From_Json()
1313
{
14-
var app = await Application.LoadFromJsonStringAsync(TestData.ApplicationJson);
14+
var app = await ZitadelApplication.LoadFromJsonStringAsync(TestData.ApplicationJson);
1515
app.AppId.Should().Be("170101999168127233");
1616
}
1717

1818
[Fact]
1919
public async Task Create_Signed_Jwt()
2020
{
21-
var app = await Application.LoadFromJsonStringAsync(TestData.ApplicationJson);
21+
var app = await ZitadelApplication.LoadFromJsonStringAsync(TestData.ApplicationJson);
2222
var token = await app.GetSignedJwtAsync(TestData.ApiUrl);
2323

2424
token.Should().StartWith("ey");

‎tests/Zitadel.Test/TestData.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Zitadel.Credentials;
2+
using ZitadelApplication = Zitadel.Credentials.Application;
23

34
namespace Zitadel.Test;
45

@@ -39,7 +40,7 @@ public static class TestData
3940
}
4041
""";
4142

42-
public static Application Application => Application.LoadFromJsonString(ApplicationJson);
43+
public static ZitadelApplication Application => ZitadelApplication.LoadFromJsonString(ApplicationJson);
4344

4445
public static ServiceAccount ServiceAccount => ServiceAccount.LoadFromJsonString(ServiceAccountJson);
4546
}

‎tests/Zitadel.Test/Zitadel.Test.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
<ItemGroup>
4-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.21" />
4+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.26" />
55
<PackageReference Include="Moq" Version="4.20.72" />
66
<PackageReference Update="FluentAssertions" Version="6.12.2" />
77
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.14.1" />

0 commit comments

Comments
 (0)