Skip to content

Commit

Permalink
revert: remove MAUI
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Jul 9, 2021
1 parent f9166fa commit 79fb161
Show file tree
Hide file tree
Showing 18 changed files with 95 additions and 230 deletions.
48 changes: 2 additions & 46 deletions TheIdServer.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29230.47
# Visual Studio Version 17
VisualStudioVersion = 17.0.31423.177
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF545B54-78FB-42D0-A842-A1490A579B37}"
EndProject
Expand Down Expand Up @@ -197,10 +197,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.Blaz
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aguacongas.TheIdServer.WsFederationSample", "sample\Aguacongas.TheIdServer.WsFederationSample\Aguacongas.TheIdServer.WsFederationSample.csproj", "{5E930A54-0AA1-4053-AFBD-319914929634}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aguacongas.TheIdServer.MAUI", "src\Aguacongas.TheIdServer.MAUI\Aguacongas.TheIdServer.MAUI\Aguacongas.TheIdServer.MAUI.csproj", "{499B2B85-6779-42D0-BAF5-7CD51C08135F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aguacongas.TheIdServer.MAUI.WinUI3", "src\Aguacongas.TheIdServer.MAUI\Aguacongas.TheIdServer.MAUI.WinUI3\Aguacongas.TheIdServer.MAUI.WinUI3.csproj", "{AB8DE3B0-3BBA-4926-8730-07435641D713}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1381,44 +1377,6 @@ Global
{5E930A54-0AA1-4053-AFBD-319914929634}.Release|x64.Build.0 = Release|Any CPU
{5E930A54-0AA1-4053-AFBD-319914929634}.Release|x86.ActiveCfg = Release|Any CPU
{5E930A54-0AA1-4053-AFBD-319914929634}.Release|x86.Build.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|arm64.ActiveCfg = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|arm64.Build.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|arm64.Deploy.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|x64.ActiveCfg = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|x64.Build.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|x64.Deploy.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|x86.ActiveCfg = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|x86.Build.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Debug|x86.Deploy.0 = Debug|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|Any CPU.Build.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|Any CPU.Deploy.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|arm64.ActiveCfg = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|arm64.Build.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|arm64.Deploy.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|x64.ActiveCfg = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|x64.Build.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|x64.Deploy.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|x86.ActiveCfg = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|x86.Build.0 = Release|Any CPU
{499B2B85-6779-42D0-BAF5-7CD51C08135F}.Release|x86.Deploy.0 = Release|Any CPU
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|Any CPU.ActiveCfg = Debug|x86
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|arm64.ActiveCfg = Debug|arm64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|arm64.Build.0 = Debug|arm64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|x64.ActiveCfg = Debug|x64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|x64.Build.0 = Debug|x64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|x86.ActiveCfg = Debug|x86
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Debug|x86.Build.0 = Debug|x86
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|Any CPU.ActiveCfg = Release|x86
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|arm64.ActiveCfg = Release|arm64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|arm64.Build.0 = Release|arm64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|x64.ActiveCfg = Release|x64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|x64.Build.0 = Release|x64
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|x86.ActiveCfg = Release|x86
{AB8DE3B0-3BBA-4926-8730-07435641D713}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1502,8 +1460,6 @@ Global
{F8C34BAD-9874-430D-BE30-2639DA637B6D} = {8A3B91E5-02A3-42F0-B2E7-E419B5086FFA}
{5DD4CFFB-D038-4E12-AA1E-B190699C273D} = {8A3B91E5-02A3-42F0-B2E7-E419B5086FFA}
{5E930A54-0AA1-4053-AFBD-319914929634} = {98BBB159-779B-497B-927B-723592E84860}
{499B2B85-6779-42D0-BAF5-7CD51C08135F} = {DF545B54-78FB-42D0-A842-A1490A579B37}
{AB8DE3B0-3BBA-4926-8730-07435641D713} = {DF545B54-78FB-42D0-A842-A1490A579B37}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5283BE0B-F6F2-4458-B12F-64C78CFF8CBA}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<!-- iOS, Android, MacCatalyst -->
Expand All @@ -22,10 +22,7 @@

<ItemGroup>
<!-- App Icon -->
<MauiImage
Include="Resources\appicon.svg"
ForegroundFile="Resources\appiconfg.svg"
IsAppIcon="true" />
<MauiImage Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" IsAppIcon="true" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" />
Expand All @@ -43,6 +40,30 @@
<PackageReference Include="Microsoft.Maui" Version="6.0.100-preview.4.*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes\Aguacongas.TheIdServer.BlazorApp.Pages.ApiScopes.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope\Aguacongas.TheIdServer.BlazorApp.Pages.ApiScope.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Apis\Aguacongas.TheIdServer.BlazorApp.Pages.Apis.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Api\Aguacongas.TheIdServer.BlazorApp.Pages.Api.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Clients\Aguacongas.TheIdServer.BlazorApp.Pages.Clients.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Client\Aguacongas.TheIdServer.BlazorApp.Pages.Client.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Cultures\Aguacongas.TheIdServer.BlazorApp.Pages.Cultures.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Culture\Aguacongas.TheIdServer.BlazorApp.Pages.Culture.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders\Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProviders.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider\Aguacongas.TheIdServer.BlazorApp.Pages.ExternalProvider.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Identities\Aguacongas.TheIdServer.BlazorApp.Pages.Identities.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Identity\Aguacongas.TheIdServer.BlazorApp.Pages.Identity.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Import\Aguacongas.TheIdServer.BlazorApp.Pages.Import.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Keys\Aguacongas.TheIdServer.BlazorApp.Pages.Keys.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties\Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParties.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty\Aguacongas.TheIdServer.BlazorApp.Pages.RelyingParty.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Roles\Aguacongas.TheIdServer.BlazorApp.Pages.Roles.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Role\Aguacongas.TheIdServer.BlazorApp.Pages.Role.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.Users\Aguacongas.TheIdServer.BlazorApp.Pages.Users.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages.User\Aguacongas.TheIdServer.BlazorApp.Pages.User.csproj" />
<ProjectReference Include="..\..\BlazorApp\Aguacongas.TheIdServer.BlazorApp.Pages\Aguacongas.TheIdServer.BlazorApp.Pages.csproj" />
</ItemGroup>

<PropertyGroup>
<InvariantGlobalization Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">true</InvariantGlobalization>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
Expand All @@ -51,5 +72,8 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-android'">
<AndroidEnvironment Include="Android\AndroidEnvironment.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Shared\" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Aguacongas.TheIdServer.MAUI.Android
{
class WebAuthenticationCallbackActivity
{
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
@inherits LayoutComponentBase
@inject Notifier _notifier;
@inject IStringLocalizerAsync<MainLayout> Localizer

<div class="sidebar">
<NavMenu />
@inherits LayoutComponentBase

<div class="sidebar bg-light">
<NavMenu />
</div>

<div class="main">
<div class="top-row px-4">
<a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
</div>
<div class="main bg-light mb-2">
<div class="top-row px-4 auth">
<EntityInfo />
<LoginDisplay />
</div>

<div class="content px-4">
@Body
</div>
<div class="content px-4">
@Body
</div>
</div>
<Toaster />

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
using Aguacongas.TheIdServer.MAUI.Data;
using Microsoft.AspNetCore.Components.WebView.Maui;
using Microsoft.AspNetCore.Components.WebView.Maui;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Maui;
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Maui.Hosting;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.Extensions.Configuration;
using Aguacongas.TheIdServer.BlazorApp.Models;
using System.Collections.Generic;

namespace Aguacongas.TheIdServer.MAUI
{
Expand All @@ -20,10 +23,32 @@ public void Configure(IAppHostBuilder appBuilder)
{
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
})
.ConfigureServices(services =>
.ConfigureAppConfiguration(builder =>
{
builder.AddInMemoryCollection(new Dictionary<string, string>
{
["administratorEmail"] = "[email protected]",
["apiBaseUrl"] = "https://localhost:5443/api",
["authenticationPaths:remoteRegisterPath"] = "/identity/account/register",
["authenticationPaths:remoteProfilePath"] = "/identity/account/manage",
["loggingOptions:minimum"] = "",
["userOptions:roleClaim"] = "role",
["providerOptions:authority"] = "https://localhost:5443/",
["providerOptions:clientId"] = "https://localhost:5443/",
["providerOptions:defaultScopes:0"] = "openid",
["providerOptions:defaultScopes:1"] = "profile",
["providerOptions:defaultScopes:2"] = "theidserveradminapi",
["providerOptions:postLogoutRedirectUri"] = "/authentication/logout-callback",
["providerOptions:redirectUri"] = "/authentication/login-callback",
["providerOptions:responseType"] = "code",
["welcomeContenUrl"] = "/api/welcomefragment",
});
})
.ConfigureServices((context, services) =>
{
services.AddBlazorWebView();
services.AddSingleton<WeatherForecastService>();
var settings = context.Configuration.Get<Settings>();
WebAssemblyHostBuilderExtensions.ConfigureServices(services, context.Configuration, settings, settings.ApiBaseUrl);
});
}
}
Expand Down
Loading

0 comments on commit 79fb161

Please sign in to comment.