Skip to content

Commit afe5b46

Browse files
kailash-bkailash-b
committed
Merge branch 'feature/dotnet-8-upgrade' of https://github.com/auth0/auth0-oidc-client-net into feature/dotnet-8-upgrade
2 parents 8e1d080 + eff6e8f commit afe5b46

File tree

19 files changed

+41
-60
lines changed

19 files changed

+41
-60
lines changed

‎.github/workflows/build.yml

+5-27
Original file line numberDiff line numberDiff line change
@@ -22,46 +22,24 @@ jobs:
2222
uses: actions/setup-dotnet@v3
2323
with:
2424
dotnet-version: '8.0.404'
25-
26-
- name: dotnet version details before
27-
run: dotnet --info
28-
29-
- name: List workloads before uninstall
30-
run: dotnet workload list
31-
32-
- name: workload version
33-
run: dotnet workload --version
3425

3526
- name: Install .NET Android and iOS workload
3627
run: dotnet workload install android ios maui --version 8.0.404
3728

3829
- name: workload update version
3930
run: dotnet workload update --version 8.0.404
4031

41-
- name: workload version after update
42-
run: dotnet workload --version
43-
44-
- name: List workloads
45-
run: dotnet workload list
46-
47-
- name: dotnet version details
32+
- name: Dotnet framework and workload versions
4833
run: dotnet --info
4934

50-
- name: List workloads
51-
run: dotnet workload list
52-
53-
- name: Update workloads
54-
run: dotnet workload update
55-
56-
- name: List workloads after update
57-
run: dotnet workload list
58-
5935
- name: Setup NuGet
6036
uses: nuget/setup-nuget@v1
6137

6238
- name: Restore NuGet
63-
run: dotnet restore Auth0.OidcClient.All.sln
64-
39+
run: nuget restore Auth0.OidcClient.All.sln
40+
41+
- name: Setup MSBuild
42+
uses: microsoft/[email protected]
6543

6644
- name: Build
6745
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/rl-secure.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup .NET
4545
uses: actions/setup-dotnet@v3
4646
with:
47-
dotnet-version: 8.0.x
47+
dotnet-version: '8.0.404'
4848

4949
- uses: actions/download-artifact@v4
5050
with:

‎.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

‎src/Auth0.OidcClient.Android/Auth0.OidcClient.Android.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</ProjectReference>
4747
</ItemGroup>
4848
<ItemGroup>
49-
<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0">
49+
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1">
5050
</PackageReference>
5151
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3">
5252
</PackageReference>

‎src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<PackageReference Include="IdentityModel.OidcClient">
43-
<Version>6.0.0</Version>
43+
<Version>5.2.1</Version>
4444
</PackageReference>
4545
<PackageReference Include="Xamarin.AndroidX.Browser">
4646
<Version>1.3.0.6</Version>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<AssemblyOriginatorKeyFile>..\..\build\Auth0OidcClientStrongName.snk</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
1515
<ItemGroup>
16-
<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
16+
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
1817
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.34.0" />
1918
</ItemGroup>
2019
</Project>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2727
</PropertyGroup>
2828
<ItemGroup>
29-
<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
29+
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
3030
</ItemGroup>
3131
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.20348.0'">
3232
<ProjectReference Include="..\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj" />

‎src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@
3939
</ProjectReference>
4040
</ItemGroup>
4141
<ItemGroup>
42-
<PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
42+
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
4343
</ItemGroup>
4444
</Project>

‎src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525
<ItemGroup>
2626
<PackageReference Include="IdentityModel.OidcClient">
27-
<Version>6.0.0</Version>
27+
<Version>5.2.1</Version>
2828
</PackageReference>
2929
</ItemGroup>
3030
<Choose>

‎src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525
<ItemGroup>
2626
<PackageReference Include="IdentityModel.OidcClient">
27-
<Version>6.0.0</Version>
27+
<Version>5.2.1</Version>
2828
</PackageReference>
2929
</ItemGroup>
3030
<Choose>

‎src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<PackageReference Include="IdentityModel.OidcClient">
43-
<Version>6.0.0</Version>
43+
<Version>5.2.1</Version>
4444
</PackageReference>
4545
</ItemGroup>
4646
</Project>

‎test/Android/Android.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</ItemGroup>
9090
<ItemGroup>
9191
<PackageReference Include="IdentityModel.OidcClient">
92-
<Version>6.0.0</Version>
92+
<Version>5.2.1</Version>
9393
</PackageReference>
9494
</ItemGroup>
9595
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎test/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
14-
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
15-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
16-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
17-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
18-
<PackageReference Include="Moq" Version="4.20.72" />
19-
<PackageReference Include="xunit" Version="2.9.2" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22-
<PrivateAssets>all</PrivateAssets>
23-
</PackageReference>
24-
<PackageReference Include="coverlet.collector" Version="6.0.2">
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
<PrivateAssets>all</PrivateAssets>
27-
</PackageReference>
14+
<PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
15+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
16+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
17+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
18+
<PackageReference Include="Moq" Version="4.18.4" />
19+
<PackageReference Include="xunit" Version="2.4.2" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
<PrivateAssets>all</PrivateAssets>
23+
</PackageReference>
24+
<PackageReference Include="coverlet.collector" Version="3.2.0">
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26+
<PrivateAssets>all</PrivateAssets>
27+
</PackageReference>
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎test/UWP/UWP.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
</ItemGroup>
142142
<ItemGroup>
143143
<PackageReference Include="IdentityModel.OidcClient">
144-
<Version>6.0.0</Version>
144+
<Version>5.2.1</Version>
145145
</PackageReference>
146146
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
147147
<Version>6.2.12</Version>

‎test/UWP/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"IdentityModel.OidcClient": "6.0.0",
3+
"IdentityModel.OidcClient": "5.2.1",
44
"Microsoft.NETCore.UniversalWindowsPlatform": "6.2.12"
55
},
66
"frameworks": {
7-
"uap10.0.20348": {}
7+
"uap10.0.19041": {}
88
},
99
"runtimes": {
1010
"win10-arm": {},

‎test/WPF/WPF.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
</ItemGroup>
108108
<ItemGroup>
109109
<PackageReference Include="IdentityModel.OidcClient">
110-
<Version>6.0.0</Version>
110+
<Version>5.2.1</Version>
111111
</PackageReference>
112112
</ItemGroup>
113113
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎test/WinForms/WinForms.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</ItemGroup>
124124
<ItemGroup>
125125
<PackageReference Include="IdentityModel.OidcClient">
126-
<Version>6.0.0</Version>
126+
<Version>5.2.1</Version>
127127
</PackageReference>
128128
</ItemGroup>
129129
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎test/iOS/iOS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
</ItemGroup>
130130
<ItemGroup>
131131
<PackageReference Include="IdentityModel.OidcClient">
132-
<Version>6.0.0</Version>
132+
<Version>5.2.1</Version>
133133
</PackageReference>
134134
</ItemGroup>
135135
<ItemGroup>

0 commit comments

Comments
 (0)