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

Fix module template Startup namespaces (Lombiq Technologies: OCORE-111) #12896

Merged
merged 7 commits into from
Dec 14, 2022
Merged

Fix module template Startup namespaces (Lombiq Technologies: OCORE-111) #12896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f4977a
Fix module template Startup namespaces
Piedone Nov 28, 2022
059f82c
Remove duplicate
Piedone Nov 28, 2022
bf61e36
Merge remote-tracking branch 'official/main' into issue/OCORE-111
Piedone Dec 2, 2022
bb434e4
Adding missing namespace imports to the MVC module template too
Piedone Dec 2, 2022
c7a83b6
Adding "implicit usings" from Module.Targets as a test
Piedone Dec 6, 2022
0e2529b
Revert "Adding "implicit usings" from Module.Targets as a test"
Piedone Dec 14, 2022
ac24658
Merge remote-tracking branch 'official/main' into issue/OCORE-111
Piedone Dec 14, 2022
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
5 changes: 5 additions & 0 deletions ...emplates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#if (AddPart)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#if (AddPart)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, with the new central imports indeed not, though I'm awaiting feedback on that.

using Fluid;
#endif
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#endif

using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
#if (AddPart)
using OrchardCore.ContentManagement;
using OrchardCore.ContentManagement.Display.ContentDisplay;
Expand Down
3 changes: 3 additions & 0 deletions ...emplates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using OrchardCore.Modules;

namespace OrchardCore.Templates.Mvc.Module
Expand Down