Ensure all lists of inner entities are consistently sorted before serializing to prevent uda exports due to order changes

Author: mattbrailsford

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceCurrencyServiceConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Commerce.Core.Api;
@@ -68,7 +68,7 @@ public override CurrencyArtifact GetArtifact(GuidUdi udi, CurrencyReadOnly entit
             {
                 var allowedCountryArtifacts = new List<AllowedCountryArtifact>();
 
-                foreach (var allowedCountry in entity.AllowedCountries)
+                foreach (var allowedCountry in entity.AllowedCountries.OrderBy(x => x.CountryId))
                 {
                     var countryDepUdi = new GuidUdi(UmbracoCommerceConstants.UdiEntityType.Country, allowedCountry.CountryId);
                     var countryDep = new UmbracoCommerceArtifactDependency(countryDepUdi);

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommercePaymentMethodServiceConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Commerce.Core.Api;
@@ -89,7 +89,7 @@ public override PaymentMethodArtifact GetArtifact(GuidUdi udi, PaymentMethodRead
             {
                 var servicesPrices = new List<ServicePriceArtifact>();
 
-                foreach (var price in entity.Prices)
+                foreach (var price in entity.Prices.OrderBy(x => x.CountryId).ThenBy(x => x.RegionId).ThenBy(x => x.CurrencyId))
                 {
                     var spArtifact = new ServicePriceArtifact { Value = price.Value };
 

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Commerce.Core.Api;
@@ -80,7 +80,7 @@ public override ShippingMethodArtifact GetArtifact(GuidUdi udi, ShippingMethodRe
             {
                 var servicesPrices = new List<ServicePriceArtifact>();
 
-                foreach (var price in entity.Prices)
+                foreach (var price in entity.Prices.OrderBy(x => x.CountryId).ThenBy(x => x.RegionId).ThenBy(x => x.CurrencyId))
                 {
                     var spArtifact = new ServicePriceArtifact { Value = price.Value };
 
@@ -125,7 +125,7 @@ public override ShippingMethodArtifact GetArtifact(GuidUdi udi, ShippingMethodRe
             {
                 var allowedCountryRegions = new List<AllowedCountryRegionArtifact>();
 
-                foreach (var acr in entity.AllowedCountryRegions)
+                foreach (var acr in entity.AllowedCountryRegions.OrderBy(x => x.CountryId).ThenBy(x => x.RegionId))
                 {
                     var acrArtifact = new AllowedCountryRegionArtifact();
 

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceStoreServiceConnector.cs

@@ -167,7 +167,7 @@ public override StoreArtifact GetArtifact(GuidUdi udi, StoreReadOnly entity)
             {
                 var users = new List<string>();
 
-                foreach (var id in entity.AllowedUsers)
+                foreach (var id in entity.AllowedUsers.OrderBy(x => x.UserId))
                 {
                     var user = _userService.GetByProviderKey(id.UserId);
                     if (user != null)
@@ -190,7 +190,7 @@ public override StoreArtifact GetArtifact(GuidUdi udi, StoreReadOnly entity)
             {
                 var userRoles = new List<string>();
 
-                foreach (var role in entity.AllowedUserRoles)
+                foreach (var role in entity.AllowedUserRoles.OrderBy(x => x.Role))
                 {
                     var userGroup = _userService.GetUserGroupByAlias(role.Role);
                     if (userGroup != null)

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceTaxClassServiceConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Commerce.Core.Api;
@@ -66,7 +66,7 @@ public override TaxClassArtifact GetArtifact(GuidUdi udi, TaxClassReadOnly entit
             // Country region tax rates
             var countryRegionTaxRateArtifacts = new List<CountryRegionTaxRateArtifact>();
 
-            foreach (var countryRegionTaxRate in entity.CountryRegionTaxRates)
+            foreach (var countryRegionTaxRate in entity.CountryRegionTaxRates.OrderBy(x => x.CountryId).ThenBy(x => x.RegionId))
             {
                 var crtrArtifact = new CountryRegionTaxRateArtifact
                 {