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

Convert v1.9 to v2.0 #15938

Merged
merged 16 commits into from
May 2, 2024
Merged

Convert v1.9 to v2.0 #15938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a48057f
Convert v1.9 to v2.0
MikeAlhayek May 1, 2024
b45218e
Update src/docs/releases/2.0.0.md
MikeAlhayek May 1, 2024
5b782ce
fix build
MikeAlhayek May 1, 2024
ddd67d3
Revert "Remove redirect to index after update. (#15679)" (#15925)
MikeAlhayek Apr 30, 2024
dccc82e
Move UserType to OC.Users.Core (#15926)
hishamco May 1, 2024
78d246a
mkdocs-git-revision-date-localized-plugin 1.2.5
agriffard May 1, 2024
9cbd208
Update OpenIddict 5.5.0 (#15910)
hishamco May 1, 2024
a5030ac
Remove leftover issue_metrics workflow (#15932)
Piedone May 1, 2024
3c4a5ec
Update Jint 3.1.1 (#15912)
hishamco May 1, 2024
3630bd8
Prevent AliasPart index from throwing a null exception (#15934)
MikeAlhayek May 1, 2024
211ae34
Reduce allocations in ShellScope (#15937)
sebastienros May 1, 2024
45f393b
Add a way to queue releasing shell context from setting display drive…
MikeAlhayek May 1, 2024
f6019c6
Use dotnet ForEachAsync implementation (#15936)
sebastienros May 1, 2024
2c35277
Replace IDataMigrationManager.UpdateAsync(string) with IDataMigration…
hishamco May 1, 2024
482438e
Merge remote-tracking branch 'origin/main' into ma/1.9to2.0
MikeAlhayek May 2, 2024
94039f2
update
MikeAlhayek May 2, 2024
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
2 changes: 1 addition & 1 deletion mkdocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ validation:
# Add files here that are intentionally not in the navigation and thus omitted_files shouldn't warn about them.
not_in_nav: |
samples/
releases/1.9.0.md
releases/2.0.0.md

# Extensions
markdown_extensions:
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Build/OrchardCore.Commons.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<LangVersion>12.0</LangVersion>
<VersionPrefix>1.9.0</VersionPrefix>
<VersionPrefix>2.0.0</VersionPrefix>
<VersionSuffix>preview</VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<WarningsNotAsErrors>612,618</WarningsNotAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Email/Migrations/EmailMigrations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class EmailMigrations : DataMigration
public int Create()
#pragma warning restore CA1822
{
// In version 1.9, the OrchardCore.Email.Smtp was split from OrchardCore.Email. To ensure we keep the change
// In version 2.0, the OrchardCore.Email.Smtp was split from OrchardCore.Email. To ensure we keep the change
// backward compatible, we added this migration step to auto-enable the new SMTP feature for sites that use the
// Email service and have SmtpSettings.
ShellScope.AddDeferredTask(async scope =>
Expand Down
6 changes: 5 additions & 1 deletion src/docs/releases/1.9.0.md → src/docs/releases/2.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Orchard Core 1.9.0
# Orchard Core 2.0.0
MikeAlhayek marked this conversation as resolved.
Show resolved Hide resolved

Release date: Not yet released

## Upgrade Instructions

Before upgrading to Orchard Core 2.0, you should first upgrade to 1.8, address any warnings, and only then upgrade to 2.0. Be sure to review the list of breaking changes documented below to ensure a seamless transition.
Copy link
Contributor

Choose a reason for hiding this comment

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

Add a space after the period for better readability.

- Before upgrading to Orchard Core 2.0, you should first upgrade to 1.8, address any warnings, and only then upgrade to 2.0. Be sure to review the list of breaking changes documented below to ensure a seamless transition.
+ Before upgrading to Orchard Core 2.0, you should first upgrade to 1.8, address any warnings, and only then upgrade to 2.0. Be sure to review the list of breaking changes documented below to ensure a seamless transition.
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
Before upgrading to Orchard Core 2.0, you should first upgrade to 1.8, address any warnings, and only then upgrade to 2.0. Be sure to review the list of breaking changes documented below to ensure a seamless transition.
Before upgrading to Orchard Core 2.0, you should first upgrade to 1.8, address any warnings, and only then upgrade to 2.0. Be sure to review the list of breaking changes documented below to ensure a seamless transition.


## Breaking Changes

### Drop `Newtonsoft.Json` Support
Expand Down