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

NuGet.config

@@ -3,8 +3,7 @@
   <packageSources>
     <!-- Ignore global configuration -->
     <clear />
-    <!-- Here so the Visual Studio package manager won't default to the next feed below. -->
-    <add key="Lombiq" value="https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json" />
+    <add key="LombiqPreview" value="https://nuget.cloudsmith.io/lombiq/open-source-orchard-core-extensions/v3/index.json" />
     <add key="OrchardCorePreview" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
@@ -24,7 +23,7 @@
       <package pattern="TheTheme" />
       <package pattern="TheAdmin" />
     </packageSource>
-    <packageSource key="Lombiq">
+    <packageSource key="LombiqPreview">
       <package pattern="Lombiq.HelpfulLibraries*" />
       <package pattern="Lombiq.Tests.UI*" />
     </packageSource>

OrchardCore.Commerce.sln

@@ -11,10 +11,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		License.md = License.md
 		mkdocs.yml = mkdocs.yml
-		Nuget.config = Nuget.config
 		Readme.md = Readme.md
 		Reset-Local.ps1 = Reset-Local.ps1
 		Directory.Packages.props = Directory.Packages.props
+		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B2D057AA-E3F7-404D-A713-C3C59F9DE562}"
@@ -118,6 +118,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "guides", "guides", "{EF8008
 		docs\guides\create-webshop.md = docs\guides\create-webshop.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "releases", "releases", "{0A8AB166-9C4F-4161-BD69-362DBC73A11E}"
+	ProjectSection(SolutionItems) = preProject
+		docs\releases\3.0.0.md = docs\releases\3.0.0.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -214,6 +219,7 @@ Global
 		{28DB6CBB-1527-42A1-8EFE-3D95BF185884} = {90913510-3D7F-4BCC-B55E-56343128F049}
 		{73925C09-BF96-4727-91D8-57A88AD1601F} = {E6C02BDF-EEB0-4ABD-ADEC-9932F60923AE}
 		{EF8008F1-64F5-4053-A639-6285084AFA52} = {BEBA1764-178A-4722-A193-4DEF26DCE8D1}
+		{0A8AB166-9C4F-4161-BD69-362DBC73A11E} = {BEBA1764-178A-4722-A193-4DEF26DCE8D1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {456CBC78-579D-483F-A4C3-AF5C12AB3324}

docs/releases/3.0.0.md

@@ -0,0 +1,30 @@
+# Orchard Core Commerce 3.0.0
+
+Release date: Not yet released
+
+## Important Upgrade Instructions
+
+Prior to making the leap to Orchard Core Commerce 3.0.0, please read and follow the instructions for the [Orchard Core 2.0.0 release](https://docs.orchardcore.net/en/latest/releases/2.0.0/), as it contains several major breaking changes.
+
+## Breaking Changes
+
+### Dropped `Newtonsoft.Json` Support
+
+The most important breaking change in OC 2.0 is the end of support for [Newtonsoft Json.NET](https://www.newtonsoft.com/json) and the switch to the [System.Text.Json](https://www.nuget.org/packages/System.Text.Json) (STJ) library. For OCC, all Newtonsoft converters are removed, STJ converters were written or updated as necessary. Any models and interfaces that uses `JToken` or `JObject` (such as `OrderPart.AdditionalData` and `IUserService.AlterUserSettingAsync()`) now use `JsonNode` and `JsonObject` respectively.
+
+### Replaced `IPayment` with `Payment` Everywhere
+
+We've dropped the [`IPayment`](https://github.com/OrchardCMS/OrchardCore.Commerce/blob/34ae00470e954459f19f688c9bfc51d196c386ca/src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/IPayment.cs) interface, now services and models use `Payment` directly, which was also moved into the `OrchardCore.Commerce.Abstractions` library. Migrating to STJ meant that to retain the polymorphic deserialization support for models using `IPayment` would've taken on some additional complexity, while we already found the separate interface unnecessary.
+
+Update using references to `OrchardCore.Commerce.Abstractions.Models`. If you have a custom payment processor integration, update it to use `Payment`.
+
+### Liquid Filters
+
+The `order_line_item_view_models_and_tax_rates` Liquid filter has been removed. A new `order_part_to_order_summary` filter has been added instead, which can be treated as a drop-in replacement. In has additional `Amount` type properties `UnitTax`, `SubTotal`, `TaxTotal` and `Total`. These contain the calculated and appropriately rounded values.
+
+The new `amount_to_string` filter processes the input object as `Amount` (like the `amount` filter) and correctly formats it just like the `Amount.ToString()` override in C#. You can use `amount_to_string: dot: ","` to make it display comma as the decimal separator when it would use dot. Unlike `amount`, you can also use this filter on a number with the `currency: "three-letter-code""` argument (e.g. `{{ value | amount_to_string: currency: "EUR" }}`). This will display any numeric value as the given currency.
+
+## Change Logs
+
+Please check the GitHub release entry [here](https://github.com/OrchardCMS/OrchardCore.Commerce/releases/tag/v3.0.0).
+

mkdocs.yml

@@ -100,4 +100,6 @@ nav:
       - NumericProductAttributeField: features/numeric-product-attribute-field.md
   - Resources:
     - Libraries: resources/libraries/README.md
-  - Releases: https://github.com/OrchardCMS/OrchardCore.Commerce/releases
+  - Releases and Notes:
+    - GitHub: https://github.com/OrchardCMS/OrchardCore.Commerce/releases
+    - 3.0.0: docs/releases/3.0.0.md

src/Libraries/OrchardCore.Commerce.Abstractions/Models/OrderPart.cs

@@ -25,10 +25,8 @@ public class OrderPart : ContentPart
     public IList<OrderAdditionalCost> AdditionalCosts { get; } = new List<OrderAdditionalCost>();
 
     /// <summary>
-    /// Gets the amounts charged for this order. Typically a single credit card charge.
+    /// Gets the amounts charged for this order. Typically, a single credit card charge.
     /// </summary>
-    // Due to the significant intentional limitations of polymorphic deserialization in System.Text.Json this type now
-    // only supports Payment instead of any arbitrary IPayment implementation.
     public IList<Payment> Charges { get; } = new List<Payment>();
 
     public TextField Email { get; set; } = new();

src/Libraries/OrchardCore.Commerce.Abstractions/Models/Payment.cs

@@ -1,4 +1,3 @@
-using OrchardCore.Commerce.Abstractions.Abstractions;
 using OrchardCore.Commerce.MoneyDataType;
 using System;
 
@@ -9,5 +8,4 @@ public record Payment(
     string TransactionId,
     string ChargeText,
     Amount Amount,
-    DateTime CreatedUtc)
-    : IPayment;
+    DateTime CreatedUtc);

src/Libraries/OrchardCore.Commerce.Abstractions/Serialization/PrioritizedPriceConverter.cs

@@ -7,7 +7,7 @@
 
 namespace OrchardCore.Commerce.Abstractions.Serialization;
 
-internal sealed class PrioritizedPriceConverter : JsonConverter<PrioritizedPrice>
+public sealed class PrioritizedPriceConverter : JsonConverter<PrioritizedPrice>
 {
     public const string PriorityName = "priority";
     public const string AmountName = "amount";
@@ -48,12 +48,12 @@ public override PrioritizedPrice Read(ref Utf8JsonReader reader, Type typeToConv
         return null;
     }
 
-    public override void Write(Utf8JsonWriter writer, PrioritizedPrice prioritizedPrice, JsonSerializerOptions options)
+    public override void Write(Utf8JsonWriter writer, PrioritizedPrice value, JsonSerializerOptions options)
     {
         writer.WriteStartObject();
-        writer.WriteNumber(PriorityName, prioritizedPrice.Priority);
+        writer.WriteNumber(PriorityName, value.Priority);
         writer.WritePropertyName(AmountName);
-        JsonSerializer.Serialize(writer, prioritizedPrice.Price, options);
+        JsonSerializer.Serialize(writer, value.Price, options);
         writer.WriteEndObject();
     }
 }

src/Libraries/OrchardCore.Commerce.Abstractions/Serialization/ProductAttributeValueConverter.cs

@@ -7,7 +7,7 @@
 
 namespace OrchardCore.Commerce.Abstractions.Serialization;
 
-internal sealed class ProductAttributeValueConverter : JsonConverter<IProductAttributeValue>
+public sealed class ProductAttributeValueConverter : JsonConverter<IProductAttributeValue>
 {
     private const string TypePropertyName = "type";
     private const string ValuePropertyName = "value";
@@ -31,19 +31,19 @@ public override IProductAttributeValue Read(ref Utf8JsonReader reader, Type type
         return deserializer.Deserialize(attributeName, attribute);
     }
 
-    public override void Write(Utf8JsonWriter writer, IProductAttributeValue productAttributeValue, JsonSerializerOptions options)
+    public override void Write(Utf8JsonWriter writer, IProductAttributeValue value, JsonSerializerOptions options)
     {
-        if (productAttributeValue is null) return;
+        if (value is null) return;
 
         writer.WriteStartObject();
 
-        writer.WriteString(TypePropertyName, productAttributeValue.GetType().Name);
-        writer.WriteString(AttributeNamePropertyName, productAttributeValue.AttributeName);
+        writer.WriteString(TypePropertyName, value.GetType().Name);
+        writer.WriteString(AttributeNamePropertyName, value.AttributeName);
 
         writer.WritePropertyName(ValuePropertyName);
-        var valueNode = productAttributeValue.UntypedValue is IEnumerable<object> values
+        var valueNode = value.UntypedValue is IEnumerable<object> values
             ? JArray.FromObject(values, options)
-            : JNode.FromObject(productAttributeValue.UntypedValue, options);
+            : JNode.FromObject(value.UntypedValue, options);
         valueNode?.WriteTo(writer, options);
 
         writer.WriteEndObject();

src/Libraries/OrchardCore.Commerce.Abstractions/Serialization/ShoppingCartItemConverter.cs

@@ -9,7 +9,7 @@
 
 namespace OrchardCore.Commerce.Abstractions.Serialization;
 
-internal sealed class ShoppingCartItemConverter : JsonConverter<ShoppingCartItem>
+public sealed class ShoppingCartItemConverter : JsonConverter<ShoppingCartItem>
 {
     public const string QuantityName = "quantity";
     public const string SkuName = "sku";

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

@@ -5,7 +5,7 @@
 
 namespace OrchardCore.Commerce.MoneyDataType.Serialization;
 
-internal sealed class CurrencyConverter : JsonConverter<ICurrency>
+public sealed class CurrencyConverter : JsonConverter<ICurrency>
 {
     public override ICurrency Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
         Currency.FromIsoCode(reader.GetString());

src/Modules/OrchardCore.Commerce/Startup.cs

@@ -184,7 +184,6 @@ public override void ConfigureServices(IServiceCollection services)
                 option.MemberAccessStrategy.Register<AddressFieldEditorViewModel>();
                 option.MemberAccessStrategy.Register<OrderPart>();
                 option.MemberAccessStrategy.Register<AddressField>();
-                option.MemberAccessStrategy.Register<IPayment>();
                 option.MemberAccessStrategy.Register<Abstractions.Models.Payment>();
                 option.MemberAccessStrategy.Register<Amount, string>((obj, _) => obj.ToString());
                 option.MemberAccessStrategy.Register<Amount, decimal>((obj, _) => obj.Value);
@@ -216,7 +215,7 @@ public override void ConfigureServices(IServiceCollection services)
     }
 }
 
-public class FallBackPriceStartup : StartupBase
+public class FallbackPriceStartup : StartupBase
 {
     public override int Order => int.MaxValue;
 

test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs

@@ -39,7 +39,9 @@ public Task FullSecurityScanShouldPass() =>
                         @"https://[^/]+/",
                         @".*/\?.*pagenum=.*",
                         @".*/\?.*products\..*");
-                }),
+                },
+                maxActiveScanDurationInMinutes: 5,
+                maxRuleDurationInMinutes: 1),
             changeConfiguration: configuration => configuration.AssertAppLogsAsync = async webApplicationInstance =>
             {
                 var logsWithoutUnwantedExceptionMessages = (await webApplicationInstance.GetLogOutputAsync())

test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviourTests.cs → test/OrchardCore.Commerce.Tests.UI/Tests/InventoryTests/InventoryBehaviorTests.cs

@@ -9,9 +9,9 @@
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PromotionTests;
 
-public class InventoryBehaviourTests : UITestBase
+public class InventoryBehaviorTests : UITestBase
 {
-    public InventoryBehaviourTests(ITestOutputHelper testOutputHelper)
+    public InventoryBehaviorTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }

test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviourTests.cs → test/OrchardCore.Commerce.Tests.UI/Tests/LocalizedProductTests/LocalizedProductBehaviorTests.cs

@@ -9,15 +9,15 @@
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.LocalizedProductTests;
 
-public class LocalizedProductBehaviourTests : UITestBase
+public class LocalizedProductBehaviorTests : UITestBase
 {
     private const string LocalizedTitle = "Honosított Termék"; // #spell-check-ignore-line
 
     private static readonly By _localizationsButtonPath = By.XPath(
         "//li[contains(@class, 'list-group-item') and .//a[contains(., 'Test Localized Product')]]//div[@title = 'Localizations']//button");
     private static readonly string _localizedCurrency = Currency.HungarianForint.CurrencyIsoCode;
 
-    public LocalizedProductBehaviourTests(ITestOutputHelper testOutputHelper)
+    public LocalizedProductBehaviorTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }

test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviourTests.cs → test/OrchardCore.Commerce.Tests.UI/Tests/ProductTests/ProductBehaviorTests.cs

@@ -10,9 +10,9 @@
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.ProductTests;
 
-public class ProductBehaviourTests : UITestBase
+public class ProductBehaviorTests : UITestBase
 {
-    public ProductBehaviourTests(ITestOutputHelper testOutputHelper)
+    public ProductBehaviorTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }

test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviourTests.cs → test/OrchardCore.Commerce.Tests.UI/Tests/PromotionTests/PromotionBehaviorTests.cs

@@ -9,11 +9,11 @@
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.PromotionTests;
 
-public class PromotionBehaviourTests : UITestBase
+public class PromotionBehaviorTests : UITestBase
 {
     public const string PriceFieldCssSelector = ".price-part-price-field-value";
 
-    public PromotionBehaviourTests(ITestOutputHelper testOutputHelper)
+    public PromotionBehaviorTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }

test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviourTests.cs → test/OrchardCore.Commerce.Tests.UI/Tests/TaxTests/TaxBehaviorTests.cs

@@ -11,13 +11,13 @@
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.TaxTests;
 
-public class TaxBehaviourTests : UITestBase
+public class TaxBehaviorTests : UITestBase
 {
     public const string NetPriceId = "PricePart_PriceField_Value";
     public const string GrossPriceId = "TaxPart_GrossPrice_Value";
     public const string TaxRateId = "TaxPart_TaxRate_Value";
 
-    public TaxBehaviourTests(ITestOutputHelper testOutputHelper)
+    public TaxBehaviorTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }

test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviourTests.cs → test/OrchardCore.Commerce.Tests.UI/Tests/WorkflowTests/WorkflowBehaviorTests.cs

@@ -9,9 +9,9 @@
 
 namespace OrchardCore.Commerce.Tests.UI.Tests.WorkflowTests;
 
-public class WorkflowBehaviourTests : UITestBase
+public class WorkflowBehaviorTests : UITestBase
 {
-    public WorkflowBehaviourTests(ITestOutputHelper testOutputHelper)
+    public WorkflowBehaviorTests(ITestOutputHelper testOutputHelper)
         : base(testOutputHelper)
     {
     }