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

NEST-537: Upgrading to OC 2.1.0 #512

Merged
merged 32 commits into from
Jan 28, 2025
Merged

NEST-537: Upgrading to OC 2.1.0 #512

merged 32 commits into from
Jan 28, 2025

Conversation

BenedekFarkas
Copy link
Member

@BenedekFarkas BenedekFarkas commented Dec 12, 2024 •
edited by github-actions bot
Loading

sarahelsaig and others added 23 commits July 29, 2024 01:02
@sarahelsaig @MikeAlhayek @Piedone
OCC-245: Upgrade to latest OC preview to test System.Text.Json (#454)
08018a8 
Co-authored-by: Mike Alhayek <mike@crestapps.com>
Co-authored-by: Zoltán Lehóczky <zoltan.lehoczky@lombiq.com>
@sarahelsaig
Merge branch 'main' into task/system-text-json-migration
64b11ce
@sarahelsaig
Merge remote-tracking branch 'origin/main' into task/system-text-json…
79ab2df 
…-migration
@MikeAlhayek @sarahelsaig
Upgrade OC packages and drivers (#480)
263974d 
* Upgrade OC packages and drivers

* Update src/Modules/OrchardCore.Commerce/Drivers/PriceDisplaySettingsDisplayDriver.cs

Co-authored-by: Sára El-Saig <sara.el-saig@lombiq.com>

* Update src/Modules/OrchardCore.Commerce.ContentFields/Settings/AddressFieldSettingsDriver.cs

Co-authored-by: Sára El-Saig <sara.el-saig@lombiq.com>

* Update src/Modules/OrchardCore.Commerce.ContentFields/Settings/PriceFieldSettingsDriver.cs

Co-authored-by: Sára El-Saig <sara.el-saig@lombiq.com>

* Update src/Modules/OrchardCore.Commerce.Payment.Stripe/Drivers/StripeApiSettingsDisplayDriver.cs

Co-authored-by: Sára El-Saig <sara.el-saig@lombiq.com>

* Fix all drivers

---------

Co-authored-by: Sára El-Saig <sara.el-saig@lombiq.com>
@sarahelsaig
OCC-280: Use new HL extension methods (#482)
6d8f285
@sarahelsaig
Merge remote-tracking branch 'origin/main' into task/system-text-json…
daac6da 
…-migration
@sarahelsaig
Merge branch 'task/system-text-json-migration' of https://github.com/…
7637943 
…OrchardCMS/OrchardCore.Commerce into task/system-text-json-migration
@sarahelsaig
Merge remote-tracking branch 'origin/main' into task/system-text-json…
1774cf6 
…-migration
@sarahelsaig
Post merge fixup.
4d61740
@sarahelsaig @hishamco
NEST-536: Update OC version (#474)
363f6b2 
* Update OC version.

* Update OC preview version again (sigh).

* Delete temporary extension.

* Use the new AddDeployment extension that registers the underlying polymorphic JSON type too.

* Suppress.

* Update OC previews.

* Update OC preview version.

* Update OC preview version.

* Rename to localizer.

* Update OC preview version.

* Update OC preview version.

* Add new line

---------

Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
@Psichorex
Re-enabling non preview packages and upgrading to OC 2.0.0
f13672b
@Psichorex
Using System.Text.Json.
b185998
@Psichorex
Setting the .Web project to OC 2.0.2.
074e949
@sarahelsaig
Update src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj
6972646
@BenedekFarkas
Upgrading OC to 2.1.0 and Lombiq packages to latest stable
aa4699f
@BenedekFarkas
Upgrading OrchardCore.Commerce.Web to OC 2.1.2
3cbe3a3
@BenedekFarkas
Merge branch 'main' into issue/OCC-194
b05b615 
# Conflicts:
#	Directory.Packages.props
#	docs/releases/3.0.0.md
#	src/Modules/OrchardCore.Commerce.Payment.Stripe/Controllers/StripeController.cs
@BenedekFarkas
Merge branch 'issue/OCC-194' into issue/NEST-537
355c46a
@BenedekFarkas
Fixing merge
d0d9de7
@BenedekFarkas
Updating Lombiq packages to latest
58bd89a
@BenedekFarkas
Fixing code styling in stripe-payment-form.js
7f25b64
@BenedekFarkas
Upgrading web project to OC 2.1.3
ff24a6f
@BenedekFarkas
Using AddSiteDisplayDriver in Startup classes
0889de7
@BenedekFarkas BenedekFarkas self-assigned this Dec 12, 2024
@canadacubachina
Copy link

how about the situation of this PR. Can we just use the code until
Upgrading web project to OC 2.1.3

@BenedekFarkas
Copy link
Member Author

how about the situation of this PR. Can we just use the code until Upgrading web project to OC 2.1.3

@canadacubachina

It's work in progress, but hoping to finish the whole thing (this PR is part of a larger task with a dozen or so PRs) next week. Aside from the security scanning test failing, this looks stable. If you can give it a try and provide feedback, that would be awesome!
We'd also love to hear about how you're using it - if you can share that, please do so under Discussions!

@BenedekFarkas BenedekFarkas changed the title NEST-537: Upgrading DotNest to OC 2.1.3 NEST-537: Upgrading to OC 2.1.0 Jan 24, 2025
@github-actions GitHub Actions
Copy link

This pull request has merge conflicts. Please resolve those before requesting a review.

@LombiqBot LombiqBot merged commit 34d21f6 into main Jan 28, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sarahelsaig sarahelsaig sarahelsaig approved these changes

Assignees

@BenedekFarkas BenedekFarkas

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@BenedekFarkas @canadacubachina @sarahelsaig @LombiqBot @MikeAlhayek @Psichorex