Skip to content

Upgrade to 3.5 packages #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeanbaptistedalle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to 3.5 packages #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 86 additions & 86 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,88 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Elsa.Studio" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Core" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Core.BlazorServer" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Localization.BlazorServer" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Login.BlazorServer" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Localization" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Localization.BlazorWasm" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Shell" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Webhooks" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.Workflows" Version="3.4.0-preview.857" />
<PackageVersion Include="Elsa.Studio.WorkflowContexts" Version="3.4.0-preview.857" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Elsa" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Integrations.Agents.Activities" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Agents.Api" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Agents.Core" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Agents.Models" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Agents.Persistence" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Agents.Persistence.EntityFrameworkCore" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Agents.Persistence.EntityFrameworkCore.Sqlite" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.AzureServiceBus" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.OrchardCore" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Integrations.Telnyx" Version="3.4.0-preview.12" />
<PackageVersion Include="Elsa.Api.Client" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.CSharp" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Dapper" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.DropIns" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.DropIns.Core" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Elasticsearch" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Email" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.EntityFrameworkCore" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.EntityFrameworkCore.Sqlite" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.EntityFrameworkCore.PostgreSql" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Hangfire" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Http" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Identity" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.JavaScript" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.JavaScript.Libraries" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Scheduling" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Liquid" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.MassTransit" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.MassTransit.AzureServiceBus" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.MassTransit.RabbitMq" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.MongoDb" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.SasTokens" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Tenants" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Tenants.AspNetCore" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Testing.Shared.Integration" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Webhooks" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.WorkflowContexts" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.WorkflowProviders.BlobStorage" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Workflows.Api" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Workflows.Runtime" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Workflows.Runtime.Distributed" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Workflows.Runtime.ProtoActor" Version="3.4.0-preview.2685" />
<PackageVersion Include="Elsa.Quartz" Version="3.4.0-preview.2685" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.2" PrivateAssets="all" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.2"/>
<PackageVersion Include="Microsoft.JSInterop" Version="9.0.2" />
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
<PackageVersion Include="Azure.ResourceManager" Version="1.13.0" />
<PackageVersion Include="Bogus" Version="35.6.2" />
<PackageVersion Include="Proto.Cluster.AzureContainerApps" Version="1.7.0" />
<PackageVersion Include="Proto.Persistence.Sqlite" Version="1.7.0" />
</ItemGroup>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Elsa.Studio" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Core" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Core.BlazorServer" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Localization.BlazorServer" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Login.BlazorServer" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Core.BlazorWasm" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Localization" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Localization.BlazorWasm" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Login.BlazorWasm" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Shell" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Webhooks" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.Workflows" Version="3.5.0-rc2" />
<PackageVersion Include="Elsa.Studio.WorkflowContexts" Version="3.5.0-rc2" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Elsa" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Integrations.Agents.Activities" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Agents.Api" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Agents.Core" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Agents.Models" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Agents.Persistence" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Agents.Persistence.EntityFrameworkCore" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Agents.Persistence.EntityFrameworkCore.Sqlite" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.AzureServiceBus" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.OrchardCore" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Integrations.Telnyx" Version="3.4.0-3.4.0.23" />
<PackageVersion Include="Elsa.Api.Client" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.CSharp" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Dapper" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.DropIns" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.DropIns.Core" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Elasticsearch" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Email" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.EntityFrameworkCore" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.EntityFrameworkCore.Sqlite" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.EntityFrameworkCore.PostgreSql" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Hangfire" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Http" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Identity" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.JavaScript" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.JavaScript.Libraries" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Scheduling" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Liquid" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.MassTransit" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.MassTransit.AzureServiceBus" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.MassTransit.RabbitMq" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.MongoDb" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.SasTokens" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Tenants" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Tenants.AspNetCore" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Testing.Shared.Integration" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Webhooks" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.WorkflowContexts" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.WorkflowProviders.BlobStorage" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Workflows.Api" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Workflows.Runtime" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Workflows.Runtime.Distributed" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Workflows.Runtime.ProtoActor" Version="3.5.0-rc1" />
<PackageVersion Include="Elsa.Quartz" Version="3.5.0-rc1" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.5" />
<PackageVersion Include="Microsoft.JSInterop" Version="9.0.5" />
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
<PackageVersion Include="Azure.ResourceManager" Version="1.13.0" />
<PackageVersion Include="Bogus" Version="35.6.2" />
<PackageVersion Include="Proto.Cluster.AzureContainerApps" Version="1.7.0" />
<PackageVersion Include="Proto.Persistence.Sqlite" Version="1.7.0" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions Elsa.Samples.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/aspnet/Elsa.Samples.AspNet.Tenants/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
identity.UseConfigurationBasedApplicationProvider(options => identitySection.Bind(options));
identity.UseConfigurationBasedRoleProvider(options => identitySection.Bind(options));
})
.UseScheduling()
.UseDefaultAuthentication();

elsa.UseTenants(tenantsFeature =>
Expand Down
7 changes: 0 additions & 7 deletions src/blazor/Directory.Build.props
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -35,6 +34,7 @@
services.AddRemoteBackend(backendApiConfig);
services.AddTransient<TenantDelegatingHandler>();
services.AddLoginModule();
services.UseElsaIdentity();
services.AddDashboardModule();
services.AddWorkflowsModule();
services.AddWorkflowContextsModule();
Expand Down
19 changes: 10 additions & 9 deletions src/blazor/ElsaStudioBlazorServerWithTenantInRouteApp/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}