Skip to content
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

Jump to bottom

Upgrade all projects to .NET6.0 #2616

Merged
merged 20 commits into from
Dec 26, 2021
Merged

Upgrade all projects to .NET6.0 #2616

merged 20 commits into from
Dec 26, 2021

Conversation

yopichy
Copy link
Contributor

@yopichy yopichy commented Dec 20, 2021

No description provided.

@dnfadmin
Copy link

dnfadmin commented Dec 20, 2021 •
edited
Loading

CLA assistant check
All CLA requirements met.

@yopichy
Copy link
Contributor Author

yopichy commented Dec 20, 2021

@sfmskywalker CI .NET SDK does not support targeting .NET 6.0

@sfmskywalker
Copy link
Member

@yopichy Thank you for this! I'll update the CI settings.

@sfmskywalker
Copy link
Member

@yopichy Question about this PR: will .NET 5 project still be able to use the Elsa core libraries, Entity Framework etc?

@yopichy
Copy link
Contributor Author

yopichy commented Dec 21, 2021 •
edited
Loading

@sfmskywalker
Elsa core works with NET 5, but not with EF.
If i removing EFCore.BulkExtensions then it can run on NET 5, but for now I keep the bulk command feature in this PR.
But if you want compatibility with NET 5 I can make it, but sacrifice the bulk command feature or have to replace EFCore.BulkExtensions

EFCore.BulkExtensions Compability:
image

@sfmskywalker
Copy link
Member

@yopichy We should definitely keep support for .NET 5 for the time being. We should be able to conditionally target both versions of e.g. EFCore.BulkExtensions, right?

E.g.

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0'">
    <PackageReference Include="EFCore.BulkExtensions" Version="6.x" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0'">
    <PackageReference Include="EFCore.BulkExtensions" Version="5.x" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
    <PackageReference Include="EFCore.BulkExtensions" Version="3.x" />
</ItemGroup>

@yopichy
Copy link
Contributor Author

yopichy commented Dec 21, 2021

@sfmskywalker ok i'll try it

@sfmskywalker
Copy link
Member

@yopichy Thank you 🙏🏻

@yopichy
Copy link
Contributor Author

yopichy commented Dec 21, 2021

@yopichy Thank you 🙏🏻

Done

mohdali
mohdali requested changes Dec 23, 2021
View reviewed changes
Copy link
Member

@mohdali mohdali left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some changes are required to maintain 3.1 support

src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj Show resolved Hide resolved
src/activities/Elsa.Activities.Temporal.Common/Elsa.Activities.Temporal.Common.csproj Outdated Show resolved Hide resolved
...hooks.Persistence.EntityFramework.Core/Elsa.Webhooks.Persistence.EntityFramework.Core.csproj Show resolved Hide resolved
...istence.EntityFramework.SqlServer/Elsa.Webhooks.Persistence.EntityFramework.SqlServer.csproj Show resolved Hide resolved
...s.Persistence.EntityFramework.Sqlite/Elsa.Webhooks.Persistence.EntityFramework.Sqlite.csproj Show resolved Hide resolved
src/core/Elsa/Elsa.csproj Outdated Show resolved Hide resolved
...amples/aspnet/Elsa.Samples.ContextualWorkflowHttp/Elsa.Samples.ContextualWorkflowHttp.csproj Outdated Show resolved Hide resolved
src/server/Elsa.Server.Api/Elsa.Server.Api.csproj Show resolved Hide resolved
test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj Outdated Show resolved Hide resolved
mohdali
mohdali requested changes Dec 23, 2021
View reviewed changes
Copy link
Member

@mohdali mohdali left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minimal changes to get monolith to start running on 3.1, additional changes still required

src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj Show resolved Hide resolved
src/activities/Elsa.Activities.Http/Elsa.Activities.Http.csproj Show resolved Hide resolved
...ework/Elsa.Persistence.EntityFramework.Sqlite/Elsa.Persistence.EntityFramework.Sqlite.csproj Show resolved Hide resolved
@yopichy
Copy link
Contributor Author

yopichy commented Dec 24, 2021

@mohdali @sfmskywalker i'll updated according to suggestion ASAP

@mohdali
Copy link
Member

mohdali commented Dec 24, 2021

@yopichy thank you very much. I went ahead and pushed some updates to implement some of the changes. hope it helps.

@yopichy
Copy link
Contributor Author

yopichy commented Dec 25, 2021

Thanks for the help @mohdali

@sfmskywalker sfmskywalker merged commit 4933a2e into elsa-workflows:master Dec 26, 2021
@DoomerDGR8
Copy link

This major change affect the Elsa 2.x only?

@sfmskywalker
Copy link
Member

More specifically, it only affects 2.4.1 and up.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mohdali mohdali mohdali requested changes

@sfmskywalker sfmskywalker sfmskywalker approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@yopichy @dnfadmin @sfmskywalker @mohdali @DoomerDGR8