Skip to content

Commit ab3df30

Browse files
mattbrailsfordmattbrailsford
committed
Merge branch 'feature/v14'
2 parents 05cb268 + 35c5d7b commit ab3df30

File tree

60 files changed

+2235
-1619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2235
-1619
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,3 +478,4 @@ $RECYCLE.BIN/
478478
##
479479
## Umbraco Commerce specific
480480
##
481+
.idea

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<!-- Package validation -->
3434
<PropertyGroup>
35-
<EnablePackageValidation>true</EnablePackageValidation>
35+
<EnablePackageValidation>false</EnablePackageValidation>
3636
<PackageValidationBaselineVersion>13.0.0</PackageValidationBaselineVersion>
3737
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
3838
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>

‎Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<ItemGroup>
66
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
77
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
8-
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
9-
<GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
8+
<GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
109
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
10+
<GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.1.0, 14)" />
14-
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[13.0.0, 14)" />
13+
<PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[14.0.0-rc2, 15)" />
14+
<PackageVersion Include="Umbraco.Deploy.Infrastructure" Version="[14.1.0-rc1, 15)" />
1515
</ItemGroup>
1616
</Project>

‎src/Umbraco.Commerce.Deploy/Artifacts/AllowedCountryRegionArtifact.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ namespace Umbraco.Commerce.Deploy.Artifacts
44
{
55
public class AllowedCountryRegionArtifact : AllowedCountryArtifact
66
{
7-
public GuidUdi RegionUdi { get; set; }
7+
public GuidUdi? RegionUdi { get; set; }
88
}
99
}

‎src/Umbraco.Commerce.Deploy/Artifacts/CountryArtifact.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@
44

55
namespace Umbraco.Commerce.Deploy.Artifacts
66
{
7-
public class CountryArtifact : StoreEntityArtifactBase
7+
public class CountryArtifact(GuidUdi? udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
8+
: StoreEntityArtifactBase(udi, storeUdi, dependencies)
89
{
9-
public CountryArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
10-
: base(udi, storeUdi, dependencies)
11-
{ }
12-
1310
public string Code { get; set; }
1411

1512
public new string Alias
1613
{
1714
get => Code;
1815
}
1916

20-
public GuidUdi DefaultCurrencyUdi { get; set; }
21-
public GuidUdi DefaultPaymentMethodUdi { get; set; }
22-
public GuidUdi DefaultShippingMethodUdi { get; set; }
17+
public GuidUdi? DefaultCurrencyUdi { get; set; }
18+
public GuidUdi? DefaultPaymentMethodUdi { get; set; }
19+
public GuidUdi? DefaultShippingMethodUdi { get; set; }
2320
public int SortOrder { get; set; }
2421
}
2522
}

‎src/Umbraco.Commerce.Deploy/Artifacts/CurrencyArtifact.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44

55
namespace Umbraco.Commerce.Deploy.Artifacts
66
{
7-
public class CurrencyArtifact : StoreEntityArtifactBase
7+
public class CurrencyArtifact(GuidUdi? udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
8+
: StoreEntityArtifactBase(udi, storeUdi, dependencies)
89
{
9-
public CurrencyArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
10-
: base(udi, storeUdi, dependencies)
11-
{ }
12-
1310
public string Code { get; set; }
1411

1512
public new string Alias
@@ -19,7 +16,7 @@ public CurrencyArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDepen
1916

2017
public string CultureName { get; set; }
2118
public string FormatTemplate { get; set; }
22-
public IEnumerable<AllowedCountryArtifact> AllowedCountries { get; set; }
19+
public IEnumerable<AllowedCountryArtifact>? AllowedCountries { get; set; }
2320
public int SortOrder { get; set; }
2421
}
2522
}

‎src/Umbraco.Commerce.Deploy/Artifacts/EmailTemplateArtifact.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace Umbraco.Commerce.Deploy.Artifacts
66
{
7-
public class EmailTemplateArtifact : StoreEntityArtifactBase
7+
public class EmailTemplateArtifact(
8+
GuidUdi? udi,
9+
GuidUdi storeUdi,
10+
IEnumerable<ArtifactDependency> dependencies = null)
11+
: StoreEntityArtifactBase(udi, storeUdi, dependencies)
812
{
9-
public EmailTemplateArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
10-
: base(udi, storeUdi, dependencies)
11-
{ }
12-
1313
public int Category { get; set; }
1414

1515
public bool SendToCustomer { get; set; }

‎src/Umbraco.Commerce.Deploy/Artifacts/ExportTemplateArtifact.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace Umbraco.Commerce.Deploy.Artifacts
66
{
7-
public class ExportTemplateArtifact : StoreEntityArtifactBase
7+
public class ExportTemplateArtifact(
8+
GuidUdi? udi,
9+
GuidUdi storeUdi,
10+
IEnumerable<ArtifactDependency> dependencies = null)
11+
: StoreEntityArtifactBase(udi, storeUdi, dependencies)
812
{
9-
public ExportTemplateArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
10-
: base(udi, storeUdi, dependencies)
11-
{ }
12-
1313
public int Category { get; set; }
1414

1515
public string FileMimeType { get; set; }

‎src/Umbraco.Commerce.Deploy/Artifacts/LocationArtifact.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
using System.Collections.Generic;
22
using Umbraco.Cms.Core;
33
using Umbraco.Cms.Core.Deploy;
4-
using Umbraco.Commerce.Core.Models;
54

65
namespace Umbraco.Commerce.Deploy.Artifacts
76
{
8-
public class LocationArtifact : StoreEntityArtifactBase
7+
public class LocationArtifact(GuidUdi? udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
8+
: StoreEntityArtifactBase(udi, storeUdi, dependencies)
99
{
10-
public LocationArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
11-
: base(udi, storeUdi, dependencies)
12-
{ }
13-
1410
public string AddressLine1 { get; set; }
1511
public string AddressLine2 { get; set; }
1612
public string City { get; set; }

‎src/Umbraco.Commerce.Deploy/Artifacts/OrderStatusArtifact.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44

55
namespace Umbraco.Commerce.Deploy.Artifacts
66
{
7-
public class OrderStatusArtifact : StoreEntityArtifactBase
7+
public class OrderStatusArtifact(GuidUdi? udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
8+
: StoreEntityArtifactBase(udi, storeUdi, dependencies)
89
{
9-
public OrderStatusArtifact(GuidUdi udi, GuidUdi storeUdi, IEnumerable<ArtifactDependency> dependencies = null)
10-
: base(udi, storeUdi, dependencies)
11-
{ }
12-
1310
public string Color { get; set; }
1411

1512
public int SortOrder { get; set; }

0 commit comments

Comments
 (0)