From 34ba38bbafd65b341edd4fea683709061c92691e Mon Sep 17 00:00:00 2001 From: Kailash B Date: Tue, 26 Nov 2024 16:09:30 +0000 Subject: [PATCH] Upgrade to .NET 8 --- .github/workflows/build.yml | 12 +- .github/workflows/nuget-release.yml | 2 +- .github/workflows/release.yml | 4 +- .github/workflows/rl-secure.yml | 2 +- .github/workflows/snyk.yml | 4 +- Auth0.OidcClient.All.sln | 4 +- global.json | 10 +- .../Auth0.OidcClient.AndroidX.csproj | 2 +- ...0.OidcClient.MAUI.Platforms.Windows.csproj | 4 +- .../Auth0.OidcClient.MAUI.csproj | 14 +- .../Auth0.OidcClient.UWP.csproj | 12 +- .../Auth0.OidcClient.WPF.csproj | 2 +- .../Auth0.OidcClient.WinForms.csproj | 2 +- .../Auth0.OidcClient.iOS.csproj | 4 +- test/Android/Android.csproj | 2 +- test/Android/Resources/Resource.Designer.cs | 184 +++++++++++++++++- .../Auth0.OidcClient.Core.UnitTests.csproj | 2 +- ...nt.MAUI.Platforms.Windows.UnitTests.csproj | 34 ++-- test/UWP/Package.appxmanifest | 2 +- test/UWP/UWP.csproj | 18 +- test/UWP/UWP_TemporaryKey.pfx | Bin 2512 -> 2550 bytes test/UWP/project.json | 4 +- 22 files changed, 263 insertions(+), 61 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 446eaf98..c4983522 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,16 +20,24 @@ 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: workload update version + run: dotnet workload update --version 8.0.404 + + - name: Dotnet framework and workload versions + run: dotnet --info - name: Setup NuGet uses: nuget/setup-nuget@v1 - name: Restore NuGet run: nuget restore Auth0.OidcClient.All.sln - + - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.1 diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml index 6343a97d..837be6f8 100644 --- 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/release.yml b/.github/workflows/release.yml index bbc4c3b0..8da5d348 100644 --- 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 index 2eba1f70..90c0a145 100644 --- 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.404' - uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml index 52893e98..d3e9f686 100644 --- 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/Auth0.OidcClient.All.sln b/Auth0.OidcClient.All.sln index 5de1d953..f781469a 100644 --- 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 index 0e340014..80f1cefd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { - "sdk": { - "version": "6.0.417", - "rollForward": "latestFeature" - } - } \ No newline at end of file + "sdk": { + "version": "8.0.404", + "rollForward": "latestFeature" + } +} \ No newline at end of file diff --git a/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj b/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj index b39e0f87..6de1f934 100644 --- a/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj +++ b/src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj @@ -1,6 +1,6 @@  - MonoAndroid12.0;net6.0-android + MonoAndroid12.0;net8.0-android Auth0.OidcClient Auth0.OidcClient Auth0.OidcClient 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 index 21cf175d..3d0f9f40 100644 --- 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 @@ -1,12 +1,12 @@  - net6.0-windows10.0.19041.0 + net8.0-windows10.0.20348.0 true true enable - 10.0.17763.0 + 10.0.20348.0 10.0.17763.0 diff --git a/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj b/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj index 00fe8142..77672f7c 100644 --- a/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj +++ b/src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj @@ -1,17 +1,17 @@  - net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.20348.0 true true enable - 13.0 - 14.0 - 29.0 + 16.4.7142 + 16.4.7142 + 33.0.95 - 10.0.17763.0 + 10.0.20348.0 10.0.17763.0 @@ -28,7 +28,7 @@ - + diff --git a/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj b/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj index 01247109..e06c970d 100644 --- a/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj +++ b/src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj @@ -1,7 +1,7 @@  - uap10.0.16299 + uap10.0.19041.0 Auth0.OidcClient Auth0.OidcClient Auth0.OidcClient.UWP @@ -11,15 +11,15 @@ 3.4.1 en-US AnyCPU - UAP - 10.0.17763.0 - 10.0.16299.0 + UAP + 10.0.19041.0 + 10.0.19041.0 DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP prompt 4 true ..\..\build\Auth0OidcClientStrongName.snk - + true full @@ -32,7 +32,7 @@ true bin\Release\Auth0.OidcClient.XML - + {1F79DB59-F3A8-45B7-972B-ECD15259D1C9} Auth0.OidcClient.Core diff --git a/src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj b/src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj index 5173e8b1..5c527338 100644 --- a/src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj +++ b/src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.csproj @@ -1,6 +1,6 @@  - net462;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net8.0-windows library Auth0.OidcClient Auth0.OidcClient diff --git a/src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj b/src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj index 3abfb09e..8d12cc95 100644 --- a/src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj +++ b/src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.csproj @@ -1,6 +1,6 @@  - net462;netcoreapp3.1;net6.0-windows + net462;netcoreapp3.1;net8.0-windows Library Auth0.OidcClient Auth0.OidcClient diff --git a/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj b/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj index 8ad9d319..9536cafd 100644 --- a/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj +++ b/src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj @@ -1,6 +1,6 @@  - xamarin.ios10;net6.0-ios + xamarin.ios10;net8.0-ios Auth0.OidcClient Auth0.OidcClient Auth0.OidcClient.iOS @@ -11,7 +11,7 @@ en false $(DefineConstants); - default + default portable diff --git a/test/Android/Android.csproj b/test/Android/Android.csproj index ac43e13e..274ffd68 100644 --- a/test/Android/Android.csproj +++ b/test/Android/Android.csproj @@ -100,4 +100,4 @@ --> - + \ No newline at end of file diff --git a/test/Android/Resources/Resource.Designer.cs b/test/Android/Resources/Resource.Designer.cs index 53e75e9e..ccab2019 100644 --- a/test/Android/Resources/Resource.Designer.cs +++ b/test/Android/Resources/Resource.Designer.cs @@ -2,7 +2,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,7 +14,7 @@ namespace AndroidTestApp { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")] public partial class Resource { @@ -26,6 +25,187 @@ static Resource() public static void UpdateIdValues() { + global::Auth0.OidcClient.Resource.Attribute.alpha = global::AndroidTestApp.Resource.Attribute.alpha; + global::Auth0.OidcClient.Resource.Attribute.coordinatorLayoutStyle = global::AndroidTestApp.Resource.Attribute.coordinatorLayoutStyle; + global::Auth0.OidcClient.Resource.Attribute.font = global::AndroidTestApp.Resource.Attribute.font; + global::Auth0.OidcClient.Resource.Attribute.fontProviderAuthority = global::AndroidTestApp.Resource.Attribute.fontProviderAuthority; + global::Auth0.OidcClient.Resource.Attribute.fontProviderCerts = global::AndroidTestApp.Resource.Attribute.fontProviderCerts; + global::Auth0.OidcClient.Resource.Attribute.fontProviderFetchStrategy = global::AndroidTestApp.Resource.Attribute.fontProviderFetchStrategy; + global::Auth0.OidcClient.Resource.Attribute.fontProviderFetchTimeout = global::AndroidTestApp.Resource.Attribute.fontProviderFetchTimeout; + global::Auth0.OidcClient.Resource.Attribute.fontProviderPackage = global::AndroidTestApp.Resource.Attribute.fontProviderPackage; + global::Auth0.OidcClient.Resource.Attribute.fontProviderQuery = global::AndroidTestApp.Resource.Attribute.fontProviderQuery; + global::Auth0.OidcClient.Resource.Attribute.fontStyle = global::AndroidTestApp.Resource.Attribute.fontStyle; + global::Auth0.OidcClient.Resource.Attribute.fontVariationSettings = global::AndroidTestApp.Resource.Attribute.fontVariationSettings; + global::Auth0.OidcClient.Resource.Attribute.fontWeight = global::AndroidTestApp.Resource.Attribute.fontWeight; + global::Auth0.OidcClient.Resource.Attribute.keylines = global::AndroidTestApp.Resource.Attribute.keylines; + global::Auth0.OidcClient.Resource.Attribute.layout_anchor = global::AndroidTestApp.Resource.Attribute.layout_anchor; + global::Auth0.OidcClient.Resource.Attribute.layout_anchorGravity = global::AndroidTestApp.Resource.Attribute.layout_anchorGravity; + global::Auth0.OidcClient.Resource.Attribute.layout_behavior = global::AndroidTestApp.Resource.Attribute.layout_behavior; + global::Auth0.OidcClient.Resource.Attribute.layout_dodgeInsetEdges = global::AndroidTestApp.Resource.Attribute.layout_dodgeInsetEdges; + global::Auth0.OidcClient.Resource.Attribute.layout_insetEdge = global::AndroidTestApp.Resource.Attribute.layout_insetEdge; + global::Auth0.OidcClient.Resource.Attribute.layout_keyline = global::AndroidTestApp.Resource.Attribute.layout_keyline; + global::Auth0.OidcClient.Resource.Attribute.statusBarBackground = global::AndroidTestApp.Resource.Attribute.statusBarBackground; + global::Auth0.OidcClient.Resource.Attribute.ttcIndex = global::AndroidTestApp.Resource.Attribute.ttcIndex; + global::Auth0.OidcClient.Resource.Color.browser_actions_bg_grey = global::AndroidTestApp.Resource.Color.browser_actions_bg_grey; + global::Auth0.OidcClient.Resource.Color.browser_actions_divider_color = global::AndroidTestApp.Resource.Color.browser_actions_divider_color; + global::Auth0.OidcClient.Resource.Color.browser_actions_text_color = global::AndroidTestApp.Resource.Color.browser_actions_text_color; + global::Auth0.OidcClient.Resource.Color.browser_actions_title_color = global::AndroidTestApp.Resource.Color.browser_actions_title_color; + global::Auth0.OidcClient.Resource.Color.notification_action_color_filter = global::AndroidTestApp.Resource.Color.notification_action_color_filter; + global::Auth0.OidcClient.Resource.Color.notification_icon_bg_color = global::AndroidTestApp.Resource.Color.notification_icon_bg_color; + global::Auth0.OidcClient.Resource.Color.ripple_material_light = global::AndroidTestApp.Resource.Color.ripple_material_light; + global::Auth0.OidcClient.Resource.Color.secondary_text_default_material_light = global::AndroidTestApp.Resource.Color.secondary_text_default_material_light; + global::Auth0.OidcClient.Resource.Dimension.browser_actions_context_menu_max_width = global::AndroidTestApp.Resource.Dimension.browser_actions_context_menu_max_width; + global::Auth0.OidcClient.Resource.Dimension.browser_actions_context_menu_min_padding = global::AndroidTestApp.Resource.Dimension.browser_actions_context_menu_min_padding; + global::Auth0.OidcClient.Resource.Dimension.compat_button_inset_horizontal_material = global::AndroidTestApp.Resource.Dimension.compat_button_inset_horizontal_material; + global::Auth0.OidcClient.Resource.Dimension.compat_button_inset_vertical_material = global::AndroidTestApp.Resource.Dimension.compat_button_inset_vertical_material; + global::Auth0.OidcClient.Resource.Dimension.compat_button_padding_horizontal_material = global::AndroidTestApp.Resource.Dimension.compat_button_padding_horizontal_material; + global::Auth0.OidcClient.Resource.Dimension.compat_button_padding_vertical_material = global::AndroidTestApp.Resource.Dimension.compat_button_padding_vertical_material; + global::Auth0.OidcClient.Resource.Dimension.compat_control_corner_material = global::AndroidTestApp.Resource.Dimension.compat_control_corner_material; + global::Auth0.OidcClient.Resource.Dimension.compat_notification_large_icon_max_height = global::AndroidTestApp.Resource.Dimension.compat_notification_large_icon_max_height; + global::Auth0.OidcClient.Resource.Dimension.compat_notification_large_icon_max_width = global::AndroidTestApp.Resource.Dimension.compat_notification_large_icon_max_width; + global::Auth0.OidcClient.Resource.Dimension.notification_action_icon_size = global::AndroidTestApp.Resource.Dimension.notification_action_icon_size; + global::Auth0.OidcClient.Resource.Dimension.notification_action_text_size = global::AndroidTestApp.Resource.Dimension.notification_action_text_size; + global::Auth0.OidcClient.Resource.Dimension.notification_big_circle_margin = global::AndroidTestApp.Resource.Dimension.notification_big_circle_margin; + global::Auth0.OidcClient.Resource.Dimension.notification_content_margin_start = global::AndroidTestApp.Resource.Dimension.notification_content_margin_start; + global::Auth0.OidcClient.Resource.Dimension.notification_large_icon_height = global::AndroidTestApp.Resource.Dimension.notification_large_icon_height; + global::Auth0.OidcClient.Resource.Dimension.notification_large_icon_width = global::AndroidTestApp.Resource.Dimension.notification_large_icon_width; + global::Auth0.OidcClient.Resource.Dimension.notification_main_column_padding_top = global::AndroidTestApp.Resource.Dimension.notification_main_column_padding_top; + global::Auth0.OidcClient.Resource.Dimension.notification_media_narrow_margin = global::AndroidTestApp.Resource.Dimension.notification_media_narrow_margin; + global::Auth0.OidcClient.Resource.Dimension.notification_right_icon_size = global::AndroidTestApp.Resource.Dimension.notification_right_icon_size; + global::Auth0.OidcClient.Resource.Dimension.notification_right_side_padding_top = global::AndroidTestApp.Resource.Dimension.notification_right_side_padding_top; + global::Auth0.OidcClient.Resource.Dimension.notification_small_icon_background_padding = global::AndroidTestApp.Resource.Dimension.notification_small_icon_background_padding; + global::Auth0.OidcClient.Resource.Dimension.notification_small_icon_size_as_large = global::AndroidTestApp.Resource.Dimension.notification_small_icon_size_as_large; + global::Auth0.OidcClient.Resource.Dimension.notification_subtext_size = global::AndroidTestApp.Resource.Dimension.notification_subtext_size; + global::Auth0.OidcClient.Resource.Dimension.notification_top_pad = global::AndroidTestApp.Resource.Dimension.notification_top_pad; + global::Auth0.OidcClient.Resource.Dimension.notification_top_pad_large_text = global::AndroidTestApp.Resource.Dimension.notification_top_pad_large_text; + global::Auth0.OidcClient.Resource.Drawable.notification_action_background = global::AndroidTestApp.Resource.Drawable.notification_action_background; + global::Auth0.OidcClient.Resource.Drawable.notification_bg = global::AndroidTestApp.Resource.Drawable.notification_bg; + global::Auth0.OidcClient.Resource.Drawable.notification_bg_low = global::AndroidTestApp.Resource.Drawable.notification_bg_low; + global::Auth0.OidcClient.Resource.Drawable.notification_bg_low_normal = global::AndroidTestApp.Resource.Drawable.notification_bg_low_normal; + global::Auth0.OidcClient.Resource.Drawable.notification_bg_low_pressed = global::AndroidTestApp.Resource.Drawable.notification_bg_low_pressed; + global::Auth0.OidcClient.Resource.Drawable.notification_bg_normal = global::AndroidTestApp.Resource.Drawable.notification_bg_normal; + global::Auth0.OidcClient.Resource.Drawable.notification_bg_normal_pressed = global::AndroidTestApp.Resource.Drawable.notification_bg_normal_pressed; + global::Auth0.OidcClient.Resource.Drawable.notification_icon_background = global::AndroidTestApp.Resource.Drawable.notification_icon_background; + global::Auth0.OidcClient.Resource.Drawable.notification_template_icon_bg = global::AndroidTestApp.Resource.Drawable.notification_template_icon_bg; + global::Auth0.OidcClient.Resource.Drawable.notification_template_icon_low_bg = global::AndroidTestApp.Resource.Drawable.notification_template_icon_low_bg; + global::Auth0.OidcClient.Resource.Drawable.notification_tile_bg = global::AndroidTestApp.Resource.Drawable.notification_tile_bg; + global::Auth0.OidcClient.Resource.Drawable.notify_panel_notification_icon_bg = global::AndroidTestApp.Resource.Drawable.notify_panel_notification_icon_bg; + global::Auth0.OidcClient.Resource.Id.actions = global::AndroidTestApp.Resource.Id.actions; + global::Auth0.OidcClient.Resource.Id.action_container = global::AndroidTestApp.Resource.Id.action_container; + global::Auth0.OidcClient.Resource.Id.action_divider = global::AndroidTestApp.Resource.Id.action_divider; + global::Auth0.OidcClient.Resource.Id.action_image = global::AndroidTestApp.Resource.Id.action_image; + global::Auth0.OidcClient.Resource.Id.action_text = global::AndroidTestApp.Resource.Id.action_text; + global::Auth0.OidcClient.Resource.Id.all = global::AndroidTestApp.Resource.Id.all; + global::Auth0.OidcClient.Resource.Id.async = global::AndroidTestApp.Resource.Id.async; + global::Auth0.OidcClient.Resource.Id.blocking = global::AndroidTestApp.Resource.Id.blocking; + global::Auth0.OidcClient.Resource.Id.bottom = global::AndroidTestApp.Resource.Id.bottom; + global::Auth0.OidcClient.Resource.Id.browser_actions_header_text = global::AndroidTestApp.Resource.Id.browser_actions_header_text; + global::Auth0.OidcClient.Resource.Id.browser_actions_menu_items = global::AndroidTestApp.Resource.Id.browser_actions_menu_items; + global::Auth0.OidcClient.Resource.Id.browser_actions_menu_item_icon = global::AndroidTestApp.Resource.Id.browser_actions_menu_item_icon; + global::Auth0.OidcClient.Resource.Id.browser_actions_menu_item_text = global::AndroidTestApp.Resource.Id.browser_actions_menu_item_text; + global::Auth0.OidcClient.Resource.Id.browser_actions_menu_view = global::AndroidTestApp.Resource.Id.browser_actions_menu_view; + global::Auth0.OidcClient.Resource.Id.center = global::AndroidTestApp.Resource.Id.center; + global::Auth0.OidcClient.Resource.Id.center_horizontal = global::AndroidTestApp.Resource.Id.center_horizontal; + global::Auth0.OidcClient.Resource.Id.center_vertical = global::AndroidTestApp.Resource.Id.center_vertical; + global::Auth0.OidcClient.Resource.Id.chronometer = global::AndroidTestApp.Resource.Id.chronometer; + global::Auth0.OidcClient.Resource.Id.clip_horizontal = global::AndroidTestApp.Resource.Id.clip_horizontal; + global::Auth0.OidcClient.Resource.Id.clip_vertical = global::AndroidTestApp.Resource.Id.clip_vertical; + global::Auth0.OidcClient.Resource.Id.end = global::AndroidTestApp.Resource.Id.end; + global::Auth0.OidcClient.Resource.Id.fill = global::AndroidTestApp.Resource.Id.fill; + global::Auth0.OidcClient.Resource.Id.fill_horizontal = global::AndroidTestApp.Resource.Id.fill_horizontal; + global::Auth0.OidcClient.Resource.Id.fill_vertical = global::AndroidTestApp.Resource.Id.fill_vertical; + global::Auth0.OidcClient.Resource.Id.forever = global::AndroidTestApp.Resource.Id.forever; + global::Auth0.OidcClient.Resource.Id.icon = global::AndroidTestApp.Resource.Id.icon; + global::Auth0.OidcClient.Resource.Id.icon_group = global::AndroidTestApp.Resource.Id.icon_group; + global::Auth0.OidcClient.Resource.Id.info = global::AndroidTestApp.Resource.Id.info; + global::Auth0.OidcClient.Resource.Id.italic = global::AndroidTestApp.Resource.Id.italic; + global::Auth0.OidcClient.Resource.Id.left = global::AndroidTestApp.Resource.Id.left; + global::Auth0.OidcClient.Resource.Id.line1 = global::AndroidTestApp.Resource.Id.line1; + global::Auth0.OidcClient.Resource.Id.line3 = global::AndroidTestApp.Resource.Id.line3; + global::Auth0.OidcClient.Resource.Id.none = global::AndroidTestApp.Resource.Id.none; + global::Auth0.OidcClient.Resource.Id.normal = global::AndroidTestApp.Resource.Id.normal; + global::Auth0.OidcClient.Resource.Id.notification_background = global::AndroidTestApp.Resource.Id.notification_background; + global::Auth0.OidcClient.Resource.Id.notification_main_column = global::AndroidTestApp.Resource.Id.notification_main_column; + global::Auth0.OidcClient.Resource.Id.notification_main_column_container = global::AndroidTestApp.Resource.Id.notification_main_column_container; + global::Auth0.OidcClient.Resource.Id.right = global::AndroidTestApp.Resource.Id.right; + global::Auth0.OidcClient.Resource.Id.right_icon = global::AndroidTestApp.Resource.Id.right_icon; + global::Auth0.OidcClient.Resource.Id.right_side = global::AndroidTestApp.Resource.Id.right_side; + global::Auth0.OidcClient.Resource.Id.start = global::AndroidTestApp.Resource.Id.start; + global::Auth0.OidcClient.Resource.Id.tag_transition_group = global::AndroidTestApp.Resource.Id.tag_transition_group; + global::Auth0.OidcClient.Resource.Id.tag_unhandled_key_event_manager = global::AndroidTestApp.Resource.Id.tag_unhandled_key_event_manager; + global::Auth0.OidcClient.Resource.Id.tag_unhandled_key_listeners = global::AndroidTestApp.Resource.Id.tag_unhandled_key_listeners; + global::Auth0.OidcClient.Resource.Id.text = global::AndroidTestApp.Resource.Id.text; + global::Auth0.OidcClient.Resource.Id.text2 = global::AndroidTestApp.Resource.Id.text2; + global::Auth0.OidcClient.Resource.Id.time = global::AndroidTestApp.Resource.Id.time; + global::Auth0.OidcClient.Resource.Id.title = global::AndroidTestApp.Resource.Id.title; + global::Auth0.OidcClient.Resource.Id.top = global::AndroidTestApp.Resource.Id.top; + global::Auth0.OidcClient.Resource.Integer.status_bar_notification_info_maxnum = global::AndroidTestApp.Resource.Integer.status_bar_notification_info_maxnum; + global::Auth0.OidcClient.Resource.Layout.browser_actions_context_menu_page = global::AndroidTestApp.Resource.Layout.browser_actions_context_menu_page; + global::Auth0.OidcClient.Resource.Layout.browser_actions_context_menu_row = global::AndroidTestApp.Resource.Layout.browser_actions_context_menu_row; + global::Auth0.OidcClient.Resource.Layout.notification_action = global::AndroidTestApp.Resource.Layout.notification_action; + global::Auth0.OidcClient.Resource.Layout.notification_action_tombstone = global::AndroidTestApp.Resource.Layout.notification_action_tombstone; + global::Auth0.OidcClient.Resource.Layout.notification_template_custom_big = global::AndroidTestApp.Resource.Layout.notification_template_custom_big; + global::Auth0.OidcClient.Resource.Layout.notification_template_icon_group = global::AndroidTestApp.Resource.Layout.notification_template_icon_group; + global::Auth0.OidcClient.Resource.Layout.notification_template_part_chronometer = global::AndroidTestApp.Resource.Layout.notification_template_part_chronometer; + global::Auth0.OidcClient.Resource.Layout.notification_template_part_time = global::AndroidTestApp.Resource.Layout.notification_template_part_time; + global::Auth0.OidcClient.Resource.String.status_bar_notification_info_overflow = global::AndroidTestApp.Resource.String.status_bar_notification_info_overflow; + global::Auth0.OidcClient.Resource.Style.TextAppearance_Compat_Notification = global::AndroidTestApp.Resource.Style.TextAppearance_Compat_Notification; + global::Auth0.OidcClient.Resource.Style.TextAppearance_Compat_Notification_Info = global::AndroidTestApp.Resource.Style.TextAppearance_Compat_Notification_Info; + global::Auth0.OidcClient.Resource.Style.TextAppearance_Compat_Notification_Line2 = global::AndroidTestApp.Resource.Style.TextAppearance_Compat_Notification_Line2; + global::Auth0.OidcClient.Resource.Style.TextAppearance_Compat_Notification_Time = global::AndroidTestApp.Resource.Style.TextAppearance_Compat_Notification_Time; + global::Auth0.OidcClient.Resource.Style.TextAppearance_Compat_Notification_Title = global::AndroidTestApp.Resource.Style.TextAppearance_Compat_Notification_Title; + global::Auth0.OidcClient.Resource.Style.Widget_Compat_NotificationActionContainer = global::AndroidTestApp.Resource.Style.Widget_Compat_NotificationActionContainer; + global::Auth0.OidcClient.Resource.Style.Widget_Compat_NotificationActionText = global::AndroidTestApp.Resource.Style.Widget_Compat_NotificationActionText; + global::Auth0.OidcClient.Resource.Style.Widget_Support_CoordinatorLayout = global::AndroidTestApp.Resource.Style.Widget_Support_CoordinatorLayout; + global::Auth0.OidcClient.Resource.Styleable.ColorStateListItem = global::AndroidTestApp.Resource.Styleable.ColorStateListItem; + global::Auth0.OidcClient.Resource.Styleable.ColorStateListItem_alpha = global::AndroidTestApp.Resource.Styleable.ColorStateListItem_alpha; + global::Auth0.OidcClient.Resource.Styleable.ColorStateListItem_android_alpha = global::AndroidTestApp.Resource.Styleable.ColorStateListItem_android_alpha; + global::Auth0.OidcClient.Resource.Styleable.ColorStateListItem_android_color = global::AndroidTestApp.Resource.Styleable.ColorStateListItem_android_color; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_keylines = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_keylines; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline; + global::Auth0.OidcClient.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::AndroidTestApp.Resource.Styleable.CoordinatorLayout_statusBarBackground; + global::Auth0.OidcClient.Resource.Styleable.FontFamily = global::AndroidTestApp.Resource.Styleable.FontFamily; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont = global::AndroidTestApp.Resource.Styleable.FontFamilyFont; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_android_font = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_android_font; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_android_fontStyle = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_android_fontStyle; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_android_fontVariationSettings = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_android_fontVariationSettings; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_android_fontWeight = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_android_fontWeight; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_android_ttcIndex = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_android_ttcIndex; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_font = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_font; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_fontStyle = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_fontStyle; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_fontVariationSettings = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_fontVariationSettings; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_fontWeight = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_fontWeight; + global::Auth0.OidcClient.Resource.Styleable.FontFamilyFont_ttcIndex = global::AndroidTestApp.Resource.Styleable.FontFamilyFont_ttcIndex; + global::Auth0.OidcClient.Resource.Styleable.FontFamily_fontProviderAuthority = global::AndroidTestApp.Resource.Styleable.FontFamily_fontProviderAuthority; + global::Auth0.OidcClient.Resource.Styleable.FontFamily_fontProviderCerts = global::AndroidTestApp.Resource.Styleable.FontFamily_fontProviderCerts; + global::Auth0.OidcClient.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::AndroidTestApp.Resource.Styleable.FontFamily_fontProviderFetchStrategy; + global::Auth0.OidcClient.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::AndroidTestApp.Resource.Styleable.FontFamily_fontProviderFetchTimeout; + global::Auth0.OidcClient.Resource.Styleable.FontFamily_fontProviderPackage = global::AndroidTestApp.Resource.Styleable.FontFamily_fontProviderPackage; + global::Auth0.OidcClient.Resource.Styleable.FontFamily_fontProviderQuery = global::AndroidTestApp.Resource.Styleable.FontFamily_fontProviderQuery; + global::Auth0.OidcClient.Resource.Styleable.GradientColor = global::AndroidTestApp.Resource.Styleable.GradientColor; + global::Auth0.OidcClient.Resource.Styleable.GradientColorItem = global::AndroidTestApp.Resource.Styleable.GradientColorItem; + global::Auth0.OidcClient.Resource.Styleable.GradientColorItem_android_color = global::AndroidTestApp.Resource.Styleable.GradientColorItem_android_color; + global::Auth0.OidcClient.Resource.Styleable.GradientColorItem_android_offset = global::AndroidTestApp.Resource.Styleable.GradientColorItem_android_offset; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_centerColor = global::AndroidTestApp.Resource.Styleable.GradientColor_android_centerColor; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_centerX = global::AndroidTestApp.Resource.Styleable.GradientColor_android_centerX; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_centerY = global::AndroidTestApp.Resource.Styleable.GradientColor_android_centerY; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_endColor = global::AndroidTestApp.Resource.Styleable.GradientColor_android_endColor; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_endX = global::AndroidTestApp.Resource.Styleable.GradientColor_android_endX; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_endY = global::AndroidTestApp.Resource.Styleable.GradientColor_android_endY; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_gradientRadius = global::AndroidTestApp.Resource.Styleable.GradientColor_android_gradientRadius; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_startColor = global::AndroidTestApp.Resource.Styleable.GradientColor_android_startColor; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_startX = global::AndroidTestApp.Resource.Styleable.GradientColor_android_startX; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_startY = global::AndroidTestApp.Resource.Styleable.GradientColor_android_startY; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_tileMode = global::AndroidTestApp.Resource.Styleable.GradientColor_android_tileMode; + global::Auth0.OidcClient.Resource.Styleable.GradientColor_android_type = global::AndroidTestApp.Resource.Styleable.GradientColor_android_type; } public partial class Attribute diff --git a/test/Auth0.OidcClient.Core.UnitTests/Auth0.OidcClient.Core.UnitTests.csproj b/test/Auth0.OidcClient.Core.UnitTests/Auth0.OidcClient.Core.UnitTests.csproj index f73b75c7..40e943d5 100644 --- a/test/Auth0.OidcClient.Core.UnitTests/Auth0.OidcClient.Core.UnitTests.csproj +++ b/test/Auth0.OidcClient.Core.UnitTests/Auth0.OidcClient.Core.UnitTests.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 false true ..\..\build\Auth0OidcClientStrongName.snk diff --git a/test/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj b/test/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj index dace9666..31e4869b 100644 --- a/test/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj +++ b/test/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj @@ -1,33 +1,33 @@  - net6.0-windows10.0.19041.0 + net8.0-windows10.0.20348.0 enable enable - false true + 10.0.20348.38 - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - diff --git a/test/UWP/Package.appxmanifest b/test/UWP/Package.appxmanifest index d289e053..d86bdfae 100644 --- a/test/UWP/Package.appxmanifest +++ b/test/UWP/Package.appxmanifest @@ -1,6 +1,6 @@  - + UWPTestApp diff --git a/test/UWP/UWP.csproj b/test/UWP/UWP.csproj index f5f0546c..d8fad9af 100644 --- a/test/UWP/UWP.csproj +++ b/test/UWP/UWP.csproj @@ -11,13 +11,15 @@ UWPTestApp en-US UAP - 10.0.17763.0 - 10.0.17763.0 + 10.0.19041.0 + 10.0.19041.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - UWP_TemporaryKey.pfx - 7A9E1B153ED9BCFE56FC2959315F0D0286C79F6F + + + C13F885330EA8E8B6C408C346DBF6762795E3608 + True true @@ -137,6 +139,14 @@ Auth0.OidcClient.UWP + + + 5.2.1 + + + 6.2.12 + + 14.0 diff --git a/test/UWP/UWP_TemporaryKey.pfx b/test/UWP/UWP_TemporaryKey.pfx index a193dbf190d69af33a79352b37256d038308f042..7af10077c201a20132634ce50b014c013948a4cc 100644 GIT binary patch delta 2478 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