Skip to content

Commit eff6e8f

Browse files
committed
Merge branch 'feature/dotnet-8-upgrade' of https://github.com/auth0/auth0-oidc-client-net into feature/dotnet-8-upgrade
2 parents 08a1675 + e48fa9b commit eff6e8f

File tree

6 files changed

+17
-19
lines changed

6 files changed

+17
-19
lines changed

.github/workflows/build.yml

+6-12
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,22 @@ jobs:
2121
- name: Install .NET
2222
uses: actions/setup-dotnet@v3
2323
with:
24-
dotnet-version: '8.0.400'
24+
dotnet-version: '8.0.404'
2525

2626
- name: Install .NET Android and iOS workload
27-
run: dotnet workload install android ios maui
27+
run: dotnet workload install android ios maui --version 8.0.404
2828

29-
- name: List workloads
30-
run: dotnet workload list
31-
32-
- name: Update workloads
33-
run: dotnet workload update
34-
35-
- name: List workloads after update
36-
run: dotnet workload list
29+
- name: Dotnet framework and workload versions
30+
run: dotnet --info
3731

3832
- name: Setup NuGet
3933
uses: nuget/setup-nuget@v1
4034

4135
- name: Restore NuGet
4236
run: dotnet restore Auth0.OidcClient.All.sln
43-
37+
4438
- name: Setup MSBuild
45-
uses: microsoft/[email protected]
39+
uses: microsoft/[email protected]
4640

4741
- name: Build
4842
run: msbuild Auth0.OidcClient.All.sln -t:rebuild -verbosity:diag -property:Configuration=Release

.github/workflows/release.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ jobs:
3434

3535
- name: Install .NET
3636
uses: actions/setup-dotnet@v3
37+
with:
38+
dotnet-version: '8.0.404'
3739

3840
- name: Install .NET Android and iOS workload
39-
run: dotnet workload install android ios maui
41+
run: dotnet workload install android ios maui --version 8.0.404
4042

4143
- name: Setup NuGet
4244
uses: nuget/setup-nuget@v1

.github/workflows/snyk.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ jobs:
4242

4343
- name: Install .NET
4444
uses: actions/setup-dotnet@v3
45+
with:
46+
dotnet-version: '8.0.404'
4547

4648
- name: Install .NET Android and iOS workload
47-
run: dotnet workload install android ios maui
49+
run: dotnet workload install android ios maui --version 8.0.404
4850

4951
- name: Setup NuGet
5052
uses: nuget/setup-nuget@v1

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.400",
3+
"version": "8.0.404",
44
"rollForward": "latestFeature"
55
}
66
}

src/Auth0.OidcClient.Core/Auth0.OidcClient.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<ItemGroup>
1616
<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
18-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.1" />
18+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.34.0" />
1919
</ItemGroup>
2020
</Project>

src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<SingleProject>true</SingleProject>
88
<ImplicitUsings>enable</ImplicitUsings>
99

10-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">17.2</SupportedOSPlatformVersion>
11-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">17.2</SupportedOSPlatformVersion>
12-
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">34.0</SupportedOSPlatformVersion>
10+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">16.4.7142</SupportedOSPlatformVersion>
11+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">16.4.7142</SupportedOSPlatformVersion>
12+
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">33.0.95</SupportedOSPlatformVersion>
1313

1414
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</SupportedOSPlatformVersion>
1515
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>

0 commit comments

Comments
 (0)