Merge branch 'feature/dotnet-8-upgrade' of https://github.com/auth0/a…

…uth0-oidc-client-net into feature/dotnet-8-upgrade
auth0 · Nov 29, 2024 · afe5b46 · afe5b46
2 parents 8e1d080 + eff6e8f
commit afe5b46
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 60 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,46 +22,24 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '8.0.404'
-
-      - name: dotnet version details before
-        run: dotnet --info
-
-      - name: List workloads before uninstall
-        run: dotnet workload list
-
-      - name: workload version
-        run: dotnet workload --version
 
       - name: Install .NET Android and iOS workload
         run: dotnet workload install android ios maui --version 8.0.404
 
       - name: workload update version
         run: dotnet workload update --version 8.0.404
 
-      - name: workload version after update
-        run: dotnet workload --version
-
-      - name: List workloads
-        run: dotnet workload list
-
-      - name: dotnet version details
+      - name: Dotnet framework and workload versions
         run: dotnet --info
 
-      - name: List workloads
-        run: dotnet workload list
-
-      - name: Update workloads
-        run: dotnet workload update
-
-      - name: List workloads after update
-        run: dotnet workload list
-
       - name: Setup NuGet
         uses: nuget/setup-nuget@v1
 
       - name: Restore NuGet
-        run: dotnet restore Auth0.OidcClient.All.sln
-
+        run: nuget restore Auth0.OidcClient.All.sln
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Build
         run: msbuild Auth0.OidcClient.All.sln -t:rebuild -verbosity:diag -property:Configuration=Release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,9 +34,11 @@ jobs:
 
       - name: Install .NET
         uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.404'
 
       - name: Install .NET Android and iOS workload
-        run: dotnet workload install android ios maui
+        run: dotnet workload install android ios maui --version 8.0.404
 
       - name: Setup NuGet
         uses: nuget/setup-nuget@v1

diff --git a/.github/workflows/rl-secure.yml b/.github/workflows/rl-secure.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: '8.0.404'
 
       - uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
@@ -42,9 +42,11 @@ jobs:
 
       - name: Install .NET
         uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.404'
 
       - name: Install .NET Android and iOS workload
-        run: dotnet workload install android ios maui
+        run: dotnet workload install android ios maui --version 8.0.404
 
       - name: Setup NuGet
         uses: nuget/setup-nuget@v1

diff --git a/src/Auth0.OidcClient.Android/Auth0.OidcClient.Android.csproj b/src/Auth0.OidcClient.Android/Auth0.OidcClient.Android.csproj
@@ -46,7 +46,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="IdentityModel.OidcClient" Version="6.0.0">
+    <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1">
     </PackageReference>
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3">
     </PackageReference>

diff --git a/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj b/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Browser">
       <Version>1.3.0.6</Version>

diff --git a/src/Auth0.OidcClient.Core/Auth0.OidcClient.Core.csproj b/src/Auth0.OidcClient.Core/Auth0.OidcClient.Core.csproj
@@ -13,8 +13,7 @@
     <AssemblyOriginatorKeyFile>..\..\build\Auth0OidcClientStrongName.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.34.0" />
     </ItemGroup>
 </Project>
diff --git a/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj b/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj
@@ -26,7 +26,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
+	  <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.20348.0'">
 	  <ProjectReference Include="..\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj" />

diff --git a/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj b/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj
@@ -39,6 +39,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
+    <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj b/src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
 	<Choose>

diff --git a/src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj b/src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <Choose>

diff --git a/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj b/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/test/Android/Android.csproj b/test/Android/Android.csproj
@@ -89,7 +89,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

diff --git a/...MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj b/...MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj
@@ -11,20 +11,20 @@
 
   <ItemGroup>
 	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+  <PackageReference Include="Microsoft.NETCore.App" Version="2.2.8" />
+  <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+  <PackageReference Include="System.Net.Http" Version="4.3.4" />
+  <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+	<PackageReference Include="Moq" Version="4.18.4" />
+	<PackageReference Include="xunit" Version="2.4.2" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PrivateAssets>all</PrivateAssets>
+  </PackageReference>
+  <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PrivateAssets>all</PrivateAssets>
+  </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/UWP/UWP.csproj b/test/UWP/UWP.csproj
@@ -141,7 +141,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>

diff --git a/test/UWP/project.json b/test/UWP/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "IdentityModel.OidcClient": "6.0.0",
+    "IdentityModel.OidcClient": "5.2.1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "6.2.12"
   },
   "frameworks": {
-    "uap10.0.20348": {}
+    "uap10.0.19041": {}
   },
   "runtimes": {
     "win10-arm": {},

diff --git a/test/WPF/WPF.csproj b/test/WPF/WPF.csproj
@@ -107,7 +107,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/test/WinForms/WinForms.csproj b/test/WinForms/WinForms.csproj
@@ -123,7 +123,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/test/iOS/iOS.csproj b/test/iOS/iOS.csproj
@@ -129,7 +129,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient">
-      <Version>6.0.0</Version>
+      <Version>5.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>