Merge branch 'hotfix/12.0.1'

Author: mattbrailsford

src/Umbraco.Commerce.Deploy/Connectors/ValueConnectors/UmbracoCommerceStoreEntityPickerValueConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Umbraco.Commerce.Core.Api;
 using Umbraco.Commerce.Core.Models;
@@ -9,6 +9,7 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Extensions;
+using Umbraco.Commerce.Cms.PropertyEditors.StorePicker;
 
 namespace Umbraco.Commerce.Deploy.Connectors.ValueConnectors
 {
@@ -69,31 +70,26 @@ private string GetPropertyEntityType(IPropertyType propertyType)
         {
             var dataType = _dataTypeService.GetDataType(propertyType.DataTypeId);
 
-            var cfg = dataType.ConfigurationAs<Dictionary<string, object>>();
+            var cfg = dataType.ConfigurationAs<StoreEntityPickerConfiguration>();
 
-            if (cfg.ContainsKey("entityType"))
+            switch (cfg.EntityType)
             {
-                var entityType = cfg["entityType"]?.ToString();
-
-                switch (entityType)
-                {
-                    case "OrderStatus":
-                        return UmbracoCommerceConstants.UdiEntityType.OrderStatus;
-                    case "Country":
-                        return UmbracoCommerceConstants.UdiEntityType.Country;
-                    case "ShippingMethod":
-                        return UmbracoCommerceConstants.UdiEntityType.ShippingMethod;
-                    case "PaymentMethod":
-                        return UmbracoCommerceConstants.UdiEntityType.PaymentMethod;
-                    case "Currency":
-                        return UmbracoCommerceConstants.UdiEntityType.Currency;
-                    case "TaxClass":
-                        return UmbracoCommerceConstants.UdiEntityType.TaxClass;
-                    case "EmailTemplate":
-                        return UmbracoCommerceConstants.UdiEntityType.EmailTemplate;
-                    case "Discount": // Not sure if discounts should transfer as these are "user generated"
-                        return UmbracoCommerceConstants.UdiEntityType.Discount;
-                }
+                case "OrderStatus":
+                    return UmbracoCommerceConstants.UdiEntityType.OrderStatus;
+                case "Country":
+                    return UmbracoCommerceConstants.UdiEntityType.Country;
+                case "ShippingMethod":
+                    return UmbracoCommerceConstants.UdiEntityType.ShippingMethod;
+                case "PaymentMethod":
+                    return UmbracoCommerceConstants.UdiEntityType.PaymentMethod;
+                case "Currency":
+                    return UmbracoCommerceConstants.UdiEntityType.Currency;
+                case "TaxClass":
+                    return UmbracoCommerceConstants.UdiEntityType.TaxClass;
+                case "EmailTemplate":
+                    return UmbracoCommerceConstants.UdiEntityType.EmailTemplate;
+                case "Discount": // Not sure if discounts should transfer as these are "user generated"
+                    return UmbracoCommerceConstants.UdiEntityType.Discount;
             }
 
             return null;

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "assemblyVersion": {
     "precision": "build"
   },