Upgrade to .NET 8

auth0 · Nov 29, 2024 · 65c03c6 · 65c03c6
2 parents 0ab1562 + 8275296
commit 65c03c6
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 30 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,18 +20,41 @@ jobs:
 
       - name: Install .NET
         uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.404'
+
+      - name: dotnet version details before uninstall
+        run: dotnet --info
+
+      - name: List workloads before uninstall
+        run: dotnet workload list
+
+      - name: Uninstall .NET Android and iOS workload
+        run: dotnet workload uninstall android ios maui
 
       - name: Install .NET Android and iOS workload
         run: dotnet workload install android ios maui
 
-      - name: Setup NuGet
-        uses: nuget/setup-nuget@v1
+      - name: List workloads
+        run: dotnet workload list
 
-      - name: Restore NuGet
-        run: nuget restore Auth0.OidcClient.All.sln
+      - name: Update workloads
+        run: dotnet workload update
 
+      - name: List workloads after update
+        run: dotnet workload list
+
+      - name: dotnet version details
+        run: dotnet --info
+
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+
       - name: Setup MSBuild
         uses: microsoft/[email protected]
+
+      - name: Restore NuGet
+        run: nuget restore Auth0.OidcClient.All.sln
 
       - name: Build
         run: msbuild Auth0.OidcClient.All.sln -t:rebuild -verbosity:diag -property:Configuration=Release

diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml
@@ -4,7 +4,7 @@ on:
   workflow_call:
     inputs:
       dotnet-version:
-        default: '6.0.x'
+        default: '8.0.x'
         type: string
       project-path:
         required: true

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: 6.0.x
+          dotnet-version: 8.0.x
 
       - uses: actions/download-artifact@v4
         with:

diff --git a/Auth0.OidcClient.All.sln b/Auth0.OidcClient.All.sln
@@ -46,9 +46,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.WinForms",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.WPF", "src\Auth0.OidcClient.WPF\Auth0.OidcClient.WPF.csproj", "{C3030559-6BD9-408C-BB21-6637D9883188}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests", "test\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj", "{5DB6D1AB-3252-4833-B97F-1194502F01BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests", "test\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj", "{5DB6D1AB-3252-4833-B97F-1194502F01BF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Auth0.OidcClient.MAUI.Platforms.Windows", "src\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj", "{5B9F23A7-E4B7-4FB7-B7DC-F208176799D1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.MAUI.Platforms.Windows", "src\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj", "{5B9F23A7-E4B7-4FB7-B7DC-F208176799D1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.404B",
+    "version": "8.0.404",
     "rollForward": "latestFeature"
   }
-  }
+}
diff --git a/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj b/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha4">
   <PropertyGroup>
-    <TargetFrameworks>MonoAndroid12.0;net8.0-android</TargetFrameworks>
+    <TargetFrameworks>MonoAndroid12.0;net8.0-android33.0.95</TargetFrameworks>
     <RootNamespace>Auth0.OidcClient</RootNamespace>
     <AssemblyName>Auth0.OidcClient</AssemblyName>
     <Product>Auth0.OidcClient</Product>

diff --git a/src/Auth0.OidcClient.MAUI.Platforms.Windows/Auth0.OidcClient.MAUI.Platforms.Windows.csproj b/src/Auth0.OidcClient.MAUI.Platforms.Windows/Auth0.OidcClient.MAUI.Platforms.Windows.csproj
@@ -7,7 +7,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</TargetPlatformMinVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj b/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>net8.0;net8.0-android33.0.95;net8.0-ios16.4.7142;net8.0-maccatalyst16.4.7142</TargetFrameworks>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.20348.0</TargetFrameworks>
 		<UseMaui>true</UseMaui>
 		<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.20348.0</TargetPlatformMinVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 
 
 		<RootNamespace>Auth0.OidcClient</RootNamespace>

diff --git a/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj b/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras/3.0.44">
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.20348.0</TargetFrameworks>
+    <TargetFrameworks>uap10.0.19041.0</TargetFrameworks>
     <RootNamespace>Auth0.OidcClient</RootNamespace>
     <AssemblyName>Auth0.OidcClient</AssemblyName>
     <AssemblyTitle>Auth0.OidcClient.UWP</AssemblyTitle>
@@ -12,8 +12,8 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <PlatformTarget>AnyCPU</PlatformTarget>
 	<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.20348.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.20348.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj b/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj
@@ -12,7 +12,6 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <DefineConstants>$(DefineConstants);</DefineConstants>    
     <LangVersion>default</LangVersion>    
-    <UserSecretsId>e271153b-0df2-4197-83a5-30cd3e05c2e3</UserSecretsId>
   </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
     <DebugType>portable</DebugType>

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
@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+	  <WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,5 +30,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/test/UWP/Package.appxmanifest b/test/UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="e2787c3f-97ee-4dbd-b932-f3034873dd17" Publisher="CN=Auth0Test" Version="1.0.0.0" />
+  <Identity Name="e2787c3f-97ee-4dbd-b932-f3034873dd17" Publisher="CN=Auth0test" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="e2787c3f-97ee-4dbd-b932-f3034873dd17" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>UWPTestApp</DisplayName>

diff --git a/test/UWP/UWP.csproj b/test/UWP/UWP.csproj
@@ -11,13 +11,15 @@
     <AssemblyName>UWPTestApp</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.20348.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>7A9E1B153ED9BCFE56FC2959315F0D0286C79F6F</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>C13F885330EA8E8B6C408C346DBF6762795E3608</PackageCertificateThumbprint>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -90,7 +92,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-	<None Include="project.json" />
+    <None Include="project.json" />
     <None Include="UWP_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
@@ -137,6 +139,14 @@
       <Name>Auth0.OidcClient.UWP</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="IdentityModel.OidcClient">
+      <Version>6.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.12</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

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