diff --git a/Directory.Packages.props b/Directory.Packages.props index 12bf94c..e061317 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,88 +1,88 @@ - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Elsa.Samples.sln b/Elsa.Samples.sln index f63e6ce..8ca30c1 100644 --- a/Elsa.Samples.sln +++ b/Elsa.Samples.sln @@ -120,9 +120,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleDropIn", "src\drop-ins\SampleDropIn\SampleDropIn.csproj", "{21BA87B6-C615-4335-96D5-BE99E15DE64C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "blazor", "blazor", "{A548F792-8343-446D-B21F-EE7C14E3472A}" - ProjectSection(SolutionItems) = preProject - src\blazor\Directory.Build.props = src\blazor\Directory.Build.props - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaStudioBlazorServerApp", "src\blazor\ElsaStudioBlazorServerApp\ElsaStudioBlazorServerApp.csproj", "{03E13DFD-5B6C-4915-934C-B7A1D1D3BC09}" EndProject diff --git a/src/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs b/src/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs index e24b4e3..be1ed0b 100644 --- a/src/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs +++ b/src/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs @@ -41,6 +41,7 @@ identity.UseConfigurationBasedApplicationProvider(options => identitySection.Bind(options)); identity.UseConfigurationBasedRoleProvider(options => identitySection.Bind(options)); }) + .UseScheduling() .UseDefaultAuthentication(); elsa.UseTenants(tenantsFeature => diff --git a/src/blazor/Directory.Build.props b/src/blazor/Directory.Build.props deleted file mode 100644 index 6e364c5..0000000 --- a/src/blazor/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - net9.0 - enable - enable - - \ No newline at end of file diff --git a/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Program.cs b/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Program.cs index acced28..e04beb2 100644 --- a/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Program.cs +++ b/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Program.cs @@ -4,13 +4,12 @@ using Elsa.Studio.Localization.Time; using Elsa.Studio.Localization.Time.Providers; using Elsa.Studio.Login.BlazorServer.Extensions; +using Elsa.Studio.Login.Extensions; using Elsa.Studio.Login.HttpMessageHandlers; using Elsa.Studio.Models; -using Elsa.Studio.Shell; using Elsa.Studio.Shell.Extensions; using Elsa.Studio.Webhooks.Extensions; using Elsa.Studio.WorkflowContexts.Extensions; -using Elsa.Studio.Workflows.Designer.Extensions; using Elsa.Studio.Workflows.Extensions; using ElsaStudioBlazorServerWithTenantInRouteApp; @@ -35,6 +34,7 @@ services.AddRemoteBackend(backendApiConfig); services.AddTransient(); services.AddLoginModule(); +services.UseElsaIdentity(); services.AddDashboardModule(); services.AddWorkflowsModule(); services.AddWorkflowContextsModule(); diff --git a/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Properties/launchSettings.json b/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Properties/launchSettings.json index 248d69c..4dd0bc8 100644 --- a/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Properties/launchSettings.json +++ b/src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Properties/launchSettings.json @@ -1,14 +1,15 @@ { "$schema": "http://json.schemastore.org/launchsettings.json", - "profiles": { - "https": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": false, - "applicationUrl": "https://localhost:7034", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7034", + "launchUrl": "https://localhost:7034/tenant-2", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" } } } +}