OCC-245: Upgrade to latest OC preview to test System.Text.Json #454

sarahelsaig · 2024-05-30T09:33:36Z

…hic deserialization anymore.

sarahelsaig · 2024-07-25T21:32:12Z

The build timed out again.

I've just found this threadPerHost setting for ZAP, which likely could fix the hang/timeout problem if set to 1. I will add the option to UITT and test it tomorrow.

Piedone · 2024-07-25T21:35:00Z

Hmm, interesting, thanks!

"Change parameter name to value in order to match the identifier as it has been declared in the base type."

sarahelsaig · 2024-07-26T10:40:56Z

Unfortunately threadPerHost does not work. The only way I was able to mitigate this problem was to reduce the run time of the active scan by setting maxActiveScanDurationInMinutes from 10 to 5.

docs/releases/3.0.0.md

Piedone · 2024-07-26T13:29:02Z

@MikeAlhayek do you want to check this?

src/Libraries/OrchardCore.Commerce.MoneyDataType/Serialization/AmountConverter.cs

MikeAlhayek · 2024-07-26T16:14:14Z

src/Modules/OrchardCore.Commerce/Constants/OrchardCoreCommerceConfigureOrder.cs

+
+public static class OrchardCoreCommerceConfigureOrder
+{
+    public const int Default = 0;


Orchard core defines the default. I think you should use that default and build on the top of it. You should not define your own default just in case OC ever changes the default.

https://github.com/OrchardCMS/OrchardCore/blob/84ae5cb0c8e0ec297a645f32b39695c3ea7003a3/src/OrchardCore/OrchardCore.Abstractions/OrchardCoreConstants.cs#L34

I kept the constant, but set its value to OrchardCoreConstants.ConfigureOrder.Default so any other constants are defined in relation to the one from OC.

src/Modules/OrchardCore.Commerce/Liquid/AmountToStringLiquidFilter.cs

src/Modules/OrchardCore.Commerce/Migrations/OrderMigrations.cs

MikeAlhayek · 2024-07-26T16:20:14Z

src/Modules/OrchardCore.Commerce/Startup.cs

@@ -59,6 +60,8 @@ namespace OrchardCore.Commerce;

 public class Startup : StartupBase
 {
+    public override int Order => OrchardCoreCommerceConfigureOrder.Default;


Suggested change

public override int Order => OrchardCoreCommerceConfigureOrder.Default;

public override int Order => OrchardCore.OrchardCoreConstantsConfigureOrder.Default;

I see this is not necessary because that's the default value of StartupBase.Order anyway. I've deleted this line instead.

src/Modules/OrchardCore.Commerce/Startup.cs

Co-authored-by: Mike Alhayek <[email protected]>

…wtonsoft.Json from the code base (#502) * OCC-245: Upgrade to latest OC preview to test System.Text.Json (#454) Co-authored-by: Mike Alhayek <[email protected]> Co-authored-by: Zoltán Lehóczky <[email protected]> * Upgrade OC packages and drivers (#480) * Upgrade OC packages and drivers * Update src/Modules/OrchardCore.Commerce/Drivers/PriceDisplaySettingsDisplayDriver.cs Co-authored-by: Sára El-Saig <[email protected]> * Update src/Modules/OrchardCore.Commerce.ContentFields/Settings/AddressFieldSettingsDriver.cs Co-authored-by: Sára El-Saig <[email protected]> * Update src/Modules/OrchardCore.Commerce.ContentFields/Settings/PriceFieldSettingsDriver.cs Co-authored-by: Sára El-Saig <[email protected]> * Update src/Modules/OrchardCore.Commerce.Payment.Stripe/Drivers/StripeApiSettingsDisplayDriver.cs Co-authored-by: Sára El-Saig <[email protected]> * Fix all drivers --------- Co-authored-by: Sára El-Saig <[email protected]> * OCC-280: Use new HL extension methods (#482) * Post merge fixup. * NEST-536: Update OC version (#474) * 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 <[email protected]> * Re-enabling non preview packages and upgrading to OC 2.0.0 * Using System.Text.Json. * Setting the .Web project to OC 2.0.2. * Update src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj --------- Co-authored-by: Sára El-Saig <[email protected]> Co-authored-by: Mike Alhayek <[email protected]> Co-authored-by: Zoltán Lehóczky <[email protected]> Co-authored-by: Hisham Bin Ateya <[email protected]>

sarahelsaig added 30 commits May 17, 2024 00:05

Fix "MD001: heading-increment" and "MD009: no-trailing-spaces".

6175523

Update package versions and use single variable for OC versions.

e019969

Merge remote-tracking branch 'origin/issue/OFFI-33' into issue/OCC-252

cd19878

Fix using.

7eebeb6

Fix xUnit1045 warning.

32b6d2e

Remove obsolete custom htmlvalidate config file.

153a95c

Add orchardcore-preview to the nuget config.

b1681db

Update references.

367ba07

Remove Newtonsoft from cshtml files.

86122d1

Migrate ProductAttributeValueConverter to STJ.

922dd73

Fix various OC 2.0 changes (excl. PopulateSettings related stuff).

abd80f1

Use CopySettingsTo.

6545756

Update to the latest OC preview version.

7884080

Merge remote-tracking branch 'origin/main' into issue/OCC-245

2d5539f

Remove no longer needed compatibility suppression files.

e829bab

Update Nuget.config.

26b710c

Fix remaining build errors in NEST.

0887f75

Move Payment into abstractions because we can't do arbitrary polymorp…

0f396fd

…hic deserialization anymore.

Remove Legacy*Converter.cs files.

e388924

Fix errors.

8409ebf

Get rid of remaining using Newtonsoft.Json.

9c3d50f

Replace obsolete method call.

4210f13

Update OC package version in OCC.

934808d

Fix incorrect WhenWritingNull usage.

1c2e2fa

update OC version

9560f29

Update OC version.

d0d60b1

LocalizedHtmlStringConverter is not needed.

5144dac

Update OC preview version.

7795943

Fix price serialization.

775d66f

Move NullCurrencySelector to the last injection order.

cf45fa5

sarahelsaig added 6 commits July 25, 2024 00:28

Rename Behaviour to Behavior

c085400

Remove incorrect comment.

7b2431e

Add 3.0.0 change notes.

2483e96

Get rid of the last shreds of IPayment.

92f2609

Reduce security scan max duration.

2ea9013

Hopefully dotnet-test-process-timeout can be dropped now.

c62ebb8

sarahelsaig added 4 commits July 26, 2024 11:06

Make active scan single threaded to prevent deadlocks.

d146996

Converters don't need to be internal.

9afdb73

Revert threadPerHost, it's not effective.

d50e7e2

Fix error CA1725

b5b8e76

"Change parameter name to value in order to match the identifier as it has been declared in the base type."

Add docs on the Liquid filter changes.

e713c5f

Piedone approved these changes Jul 26, 2024

View reviewed changes

docs/releases/3.0.0.md Outdated Show resolved Hide resolved

Typos/grammar

b43204e

MikeAlhayek approved these changes Jul 26, 2024

View reviewed changes

sarahelsaig and others added 4 commits July 26, 2024 18:38

Apply suggestions from code review

55bf922

Co-authored-by: Mike Alhayek <[email protected]>

Fix warnings.

409c039

Clean up configuration order usage.

2babc78

Update HL and UITT preview versions.

5a21eaf

Piedone approved these changes Jul 26, 2024

View reviewed changes

Piedone requested a review from MikeAlhayek July 26, 2024 22:21

MikeAlhayek approved these changes Jul 26, 2024

View reviewed changes

sarahelsaig added 2 commits July 27, 2024 23:48

Update HL and UITT preview versions.

9e397dd

Merge branch 'task/system-text-json-migration' into issue/OCC-245

f06dd9f

Piedone approved these changes Jul 28, 2024

View reviewed changes

Piedone merged commit 08018a8 into task/system-text-json-migration Jul 28, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCC-245: Upgrade to latest OC preview to test System.Text.Json #454

OCC-245: Upgrade to latest OC preview to test System.Text.Json #454

sarahelsaig commented May 30, 2024 •

edited by github-actions bot

Loading

sarahelsaig commented Jul 25, 2024

Piedone commented Jul 25, 2024

sarahelsaig commented Jul 26, 2024

Piedone commented Jul 26, 2024

MikeAlhayek Jul 26, 2024

sarahelsaig Jul 26, 2024

MikeAlhayek Jul 26, 2024

sarahelsaig Jul 26, 2024

	public override int Order => OrchardCoreCommerceConfigureOrder.Default;
	public override int Order => OrchardCore.OrchardCoreConstantsConfigureOrder.Default;

OCC-245: Upgrade to latest OC preview to test System.Text.Json #454

OCC-245: Upgrade to latest OC preview to test System.Text.Json #454

Conversation

sarahelsaig commented May 30, 2024 • edited by github-actions bot Loading

sarahelsaig commented Jul 25, 2024

Piedone commented Jul 25, 2024

sarahelsaig commented Jul 26, 2024

Piedone commented Jul 26, 2024

MikeAlhayek Jul 26, 2024

Choose a reason for hiding this comment

sarahelsaig Jul 26, 2024

Choose a reason for hiding this comment

MikeAlhayek Jul 26, 2024

Choose a reason for hiding this comment

sarahelsaig Jul 26, 2024

Choose a reason for hiding this comment

sarahelsaig commented May 30, 2024 •

edited by github-actions bot

Loading