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 · 8e1d080 · 8e1d080
2 parents 08a1675 + e48fa9b
commit 8e1d080
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,10 +21,31 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '8.0.400'
+          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
+        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
+        run: dotnet --info
 
       - name: List workloads
         run: dotnet workload list
@@ -40,9 +61,7 @@ jobs:
 
       - name: Restore NuGet
         run: dotnet 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/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "8.0.404",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/Auth0.OidcClient.Core/Auth0.OidcClient.Core.csproj b/src/Auth0.OidcClient.Core/Auth0.OidcClient.Core.csproj
@@ -15,6 +15,6 @@
   <ItemGroup>
     <PackageReference Include="IdentityModel.OidcClient" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.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
@@ -7,9 +7,9 @@
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">17.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">17.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">34.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">16.4.7142</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">16.4.7142</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">33.0.95</SupportedOSPlatformVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>