diff --git a/various/clients/Maui/MauiApp1/MauiApp1.sln b/various/clients/Maui/net10/MauiApp1.sln similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1.sln rename to various/clients/Maui/net10/MauiApp1.sln diff --git a/various/clients/Maui/MauiApp1/MauiApp1/App.xaml b/various/clients/Maui/net10/MauiApp1/App.xaml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/App.xaml rename to various/clients/Maui/net10/MauiApp1/App.xaml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/App.xaml.cs b/various/clients/Maui/net10/MauiApp1/App.xaml.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/App.xaml.cs rename to various/clients/Maui/net10/MauiApp1/App.xaml.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/AppShell.xaml b/various/clients/Maui/net10/MauiApp1/AppShell.xaml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/AppShell.xaml rename to various/clients/Maui/net10/MauiApp1/AppShell.xaml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/AppShell.xaml.cs b/various/clients/Maui/net10/MauiApp1/AppShell.xaml.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/AppShell.xaml.cs rename to various/clients/Maui/net10/MauiApp1/AppShell.xaml.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/MainPage.xaml b/various/clients/Maui/net10/MauiApp1/MainPage.xaml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/MainPage.xaml rename to various/clients/Maui/net10/MauiApp1/MainPage.xaml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/MainPage.xaml.cs b/various/clients/Maui/net10/MauiApp1/MainPage.xaml.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/MainPage.xaml.cs rename to various/clients/Maui/net10/MauiApp1/MainPage.xaml.cs diff --git a/various/clients/Maui/net10/MauiApp1/MauiApp1.csproj b/various/clients/Maui/net10/MauiApp1/MauiApp1.csproj new file mode 100644 index 00000000..f2374486 --- /dev/null +++ b/various/clients/Maui/net10/MauiApp1/MauiApp1.csproj @@ -0,0 +1,69 @@ + + + + net10.0-android;net10.0-ios;net10.0-maccatalyst + $(TargetFrameworks);net10.0-windows10.0.19041.0 + + + + + Exe + MauiApp1 + true + true + enable + enable + + NU1608 + true + + + MauiApp1 + + + com.companyname.mauiapp1 + + + 1.0 + 1 + + + None + + 15.0 + 15.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/various/clients/Maui/net10/MauiApp1/MauiAuthenticationBrowser.cs b/various/clients/Maui/net10/MauiApp1/MauiAuthenticationBrowser.cs new file mode 100644 index 00000000..45e98c57 --- /dev/null +++ b/various/clients/Maui/net10/MauiApp1/MauiAuthenticationBrowser.cs @@ -0,0 +1,34 @@ +using Duende.IdentityModel.Client; +using Duende.IdentityModel.OidcClient.Browser; + +namespace MauiApp1; + +public class MauiAuthenticationBrowser : Duende.IdentityModel.OidcClient.Browser.IBrowser +{ + public async Task InvokeAsync(BrowserOptions options, CancellationToken cancellationToken = default) + { + try + { + var result = await WebAuthenticator.Default.AuthenticateAsync( + new Uri(options.StartUrl), + new Uri(options.EndUrl), + cancellationToken); + + var url = new RequestUrl("myapp://callback") + .Create(new Parameters(result.Properties)); + + return new BrowserResult + { + Response = url, + ResultType = BrowserResultType.Success, + }; + } + catch (TaskCanceledException) + { + return new BrowserResult + { + ResultType = BrowserResultType.UserCancel + }; + } + } +} diff --git a/various/clients/Maui/net10/MauiApp1/MauiProgram.cs b/various/clients/Maui/net10/MauiApp1/MauiProgram.cs new file mode 100644 index 00000000..a5bc2ad8 --- /dev/null +++ b/various/clients/Maui/net10/MauiApp1/MauiProgram.cs @@ -0,0 +1,43 @@ +// Copyright (c) Duende Software. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using Duende.IdentityModel.OidcClient; +using Microsoft.Extensions.Logging; + +namespace MauiApp1; +public static class MauiProgram +{ + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }); + +#if DEBUG + builder.Logging.AddDebug(); + builder.Services.AddLogging(configure => configure.AddDebug()); +#endif + + // setup OidcClient + builder.Services.AddSingleton(new OidcClient(new() + { + Authority = "https://demo.duendesoftware.com", + + ClientId = "interactive.public", + Scope = "openid profile api", + RedirectUri = "myapp://callback", + + Browser = new MauiAuthenticationBrowser() + })); + + // add main page + builder.Services.AddSingleton(); + + return builder.Build(); + } +} diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/AndroidManifest.xml b/various/clients/Maui/net10/MauiApp1/Platforms/Android/AndroidManifest.xml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/AndroidManifest.xml rename to various/clients/Maui/net10/MauiApp1/Platforms/Android/AndroidManifest.xml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/MainActivity.cs b/various/clients/Maui/net10/MauiApp1/Platforms/Android/MainActivity.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/MainActivity.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/Android/MainActivity.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/MainApplication.cs b/various/clients/Maui/net10/MauiApp1/Platforms/Android/MainApplication.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/MainApplication.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/Android/MainApplication.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/Resources/values/colors.xml b/various/clients/Maui/net10/MauiApp1/Platforms/Android/Resources/values/colors.xml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/Resources/values/colors.xml rename to various/clients/Maui/net10/MauiApp1/Platforms/Android/Resources/values/colors.xml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/WebAuthenticationCallbackActivity.cs b/various/clients/Maui/net10/MauiApp1/Platforms/Android/WebAuthenticationCallbackActivity.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Android/WebAuthenticationCallbackActivity.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/Android/WebAuthenticationCallbackActivity.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/AppDelegate.cs b/various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/AppDelegate.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/AppDelegate.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/AppDelegate.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/Entitlements.plist b/various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/Entitlements.plist similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/Entitlements.plist rename to various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/Entitlements.plist diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/Info.plist b/various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/Info.plist similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/Info.plist rename to various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/Info.plist diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/Program.cs b/various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/Program.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/MacCatalyst/Program.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/MacCatalyst/Program.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Tizen/Main.cs b/various/clients/Maui/net10/MauiApp1/Platforms/Tizen/Main.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Tizen/Main.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/Tizen/Main.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Tizen/tizen-manifest.xml b/various/clients/Maui/net10/MauiApp1/Platforms/Tizen/tizen-manifest.xml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Tizen/tizen-manifest.xml rename to various/clients/Maui/net10/MauiApp1/Platforms/Tizen/tizen-manifest.xml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/App.xaml b/various/clients/Maui/net10/MauiApp1/Platforms/Windows/App.xaml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/App.xaml rename to various/clients/Maui/net10/MauiApp1/Platforms/Windows/App.xaml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/App.xaml.cs b/various/clients/Maui/net10/MauiApp1/Platforms/Windows/App.xaml.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/App.xaml.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/Windows/App.xaml.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/Package.appxmanifest b/various/clients/Maui/net10/MauiApp1/Platforms/Windows/Package.appxmanifest similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/Package.appxmanifest rename to various/clients/Maui/net10/MauiApp1/Platforms/Windows/Package.appxmanifest diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/app.manifest b/various/clients/Maui/net10/MauiApp1/Platforms/Windows/app.manifest similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/Windows/app.manifest rename to various/clients/Maui/net10/MauiApp1/Platforms/Windows/app.manifest diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/iOS/AppDelegate.cs b/various/clients/Maui/net10/MauiApp1/Platforms/iOS/AppDelegate.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/iOS/AppDelegate.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/iOS/AppDelegate.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/iOS/Info.plist b/various/clients/Maui/net10/MauiApp1/Platforms/iOS/Info.plist similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/iOS/Info.plist rename to various/clients/Maui/net10/MauiApp1/Platforms/iOS/Info.plist diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Platforms/iOS/Program.cs b/various/clients/Maui/net10/MauiApp1/Platforms/iOS/Program.cs similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Platforms/iOS/Program.cs rename to various/clients/Maui/net10/MauiApp1/Platforms/iOS/Program.cs diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Properties/launchSettings.json b/various/clients/Maui/net10/MauiApp1/Properties/launchSettings.json similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Properties/launchSettings.json rename to various/clients/Maui/net10/MauiApp1/Properties/launchSettings.json diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/AppIcon/appicon.svg b/various/clients/Maui/net10/MauiApp1/Resources/AppIcon/appicon.svg similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/AppIcon/appicon.svg rename to various/clients/Maui/net10/MauiApp1/Resources/AppIcon/appicon.svg diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/AppIcon/appiconfg.svg b/various/clients/Maui/net10/MauiApp1/Resources/AppIcon/appiconfg.svg similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/AppIcon/appiconfg.svg rename to various/clients/Maui/net10/MauiApp1/Resources/AppIcon/appiconfg.svg diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Fonts/OpenSans-Regular.ttf b/various/clients/Maui/net10/MauiApp1/Resources/Fonts/OpenSans-Regular.ttf similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Fonts/OpenSans-Regular.ttf rename to various/clients/Maui/net10/MauiApp1/Resources/Fonts/OpenSans-Regular.ttf diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Fonts/OpenSans-Semibold.ttf b/various/clients/Maui/net10/MauiApp1/Resources/Fonts/OpenSans-Semibold.ttf similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Fonts/OpenSans-Semibold.ttf rename to various/clients/Maui/net10/MauiApp1/Resources/Fonts/OpenSans-Semibold.ttf diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Images/dotnet_bot.png b/various/clients/Maui/net10/MauiApp1/Resources/Images/dotnet_bot.png similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Images/dotnet_bot.png rename to various/clients/Maui/net10/MauiApp1/Resources/Images/dotnet_bot.png diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Raw/AboutAssets.txt b/various/clients/Maui/net10/MauiApp1/Resources/Raw/AboutAssets.txt similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Raw/AboutAssets.txt rename to various/clients/Maui/net10/MauiApp1/Resources/Raw/AboutAssets.txt diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Splash/splash.svg b/various/clients/Maui/net10/MauiApp1/Resources/Splash/splash.svg similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Splash/splash.svg rename to various/clients/Maui/net10/MauiApp1/Resources/Splash/splash.svg diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Styles/Colors.xaml b/various/clients/Maui/net10/MauiApp1/Resources/Styles/Colors.xaml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Styles/Colors.xaml rename to various/clients/Maui/net10/MauiApp1/Resources/Styles/Colors.xaml diff --git a/various/clients/Maui/MauiApp1/MauiApp1/Resources/Styles/Styles.xaml b/various/clients/Maui/net10/MauiApp1/Resources/Styles/Styles.xaml similarity index 100% rename from various/clients/Maui/MauiApp1/MauiApp1/Resources/Styles/Styles.xaml rename to various/clients/Maui/net10/MauiApp1/Resources/Styles/Styles.xaml diff --git a/various/clients/Maui/net9/MauiApp1.sln b/various/clients/Maui/net9/MauiApp1.sln new file mode 100644 index 00000000..01c69d07 --- /dev/null +++ b/various/clients/Maui/net9/MauiApp1.sln @@ -0,0 +1,27 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34322.80 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiApp1", "MauiApp1\MauiApp1.csproj", "{F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}.Release|Any CPU.Build.0 = Release|Any CPU + {F47CF5D7-9D19-48C1-9AC3-0F26B4133D92}.Release|Any CPU.Deploy.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CF4F4884-6B6D-4CA0-9BD0-FCD86EFD26F4} + EndGlobalSection +EndGlobal diff --git a/various/clients/Maui/net9/MauiApp1/App.xaml b/various/clients/Maui/net9/MauiApp1/App.xaml new file mode 100644 index 00000000..8fb5f38c --- /dev/null +++ b/various/clients/Maui/net9/MauiApp1/App.xaml @@ -0,0 +1,14 @@ + + + + + + + + + + + diff --git a/various/clients/Maui/net9/MauiApp1/App.xaml.cs b/various/clients/Maui/net9/MauiApp1/App.xaml.cs new file mode 100644 index 00000000..d1708ffe --- /dev/null +++ b/various/clients/Maui/net9/MauiApp1/App.xaml.cs @@ -0,0 +1,9 @@ + +namespace MauiApp1; + +public partial class App : Application +{ + public App() => InitializeComponent(); + + protected override Window CreateWindow(IActivationState? activationState) => new Window(new AppShell()); +} diff --git a/various/clients/Maui/net9/MauiApp1/AppShell.xaml b/various/clients/Maui/net9/MauiApp1/AppShell.xaml new file mode 100644 index 00000000..5dd865e4 --- /dev/null +++ b/various/clients/Maui/net9/MauiApp1/AppShell.xaml @@ -0,0 +1,15 @@ + + + + + + diff --git a/various/clients/Maui/net9/MauiApp1/AppShell.xaml.cs b/various/clients/Maui/net9/MauiApp1/AppShell.xaml.cs new file mode 100644 index 00000000..c9116c8e --- /dev/null +++ b/various/clients/Maui/net9/MauiApp1/AppShell.xaml.cs @@ -0,0 +1,9 @@ +namespace MauiApp1; + +public partial class AppShell : Shell +{ + public AppShell() + { + InitializeComponent(); + } +} diff --git a/various/clients/Maui/net9/MauiApp1/MainPage.xaml b/various/clients/Maui/net9/MauiApp1/MainPage.xaml new file mode 100644 index 00000000..58a7aa4a --- /dev/null +++ b/various/clients/Maui/net9/MauiApp1/MainPage.xaml @@ -0,0 +1,33 @@ + + + + + + +