Merge branch 'main' into dev

Author: mattbrailsford

Directory.Packages.props

@@ -8,10 +8,10 @@
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
     <GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
+    <GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[12.0.0--rc, 13)" />
     <PackageVersion Include="Umbraco.Cms.Web.Website" Version="[11.0.0, 12)" />
-    <PackageVersion Include="Umbraco.JsonSchema.Extensions" Version="[0.3.0, 1)" />
   </ItemGroup>
 </Project>

azure-pipelines.yml

@@ -1,6 +1,10 @@
 name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 
 parameters:
+  - name: cache_npm
+    displayName: Cache NPM packages
+    type: boolean
+    default: true
   - name: cache_nuget
     displayName: Cache NuGet packages
     type: boolean
@@ -19,6 +23,7 @@ stages:
   - stage: Build
     variables:
       NUGET_PACKAGES: $(Pipeline.Workspace)/.nuget/packages
+      npm_config_cache: $(Pipeline.Workspace)/.npm_client
     jobs:
       - job: Build
         pool: 
@@ -32,11 +37,27 @@ stages:
           - task: NuGetAuthenticate@1
             displayName: Authenticate NuGet
 
+          - task: NodeTool@0
+            displayName: Use Node.js $(nodeVersion)
+            inputs:
+              versionSpec: $(nodeVersion)
+
           - task: UseDotNet@2
             displayName: Use .NET SDK from global.json
             inputs:
               useGlobalJson: true
 
+          # Cache and restore NPM packages
+          - task: Cache@2
+            condition: ${{ parameters.cache_npm }}
+            displayName: Cache NPM packages
+            inputs:
+              key: 'npm | "$(Agent.OS)" | **/package-lock.json, !**/node_modules/**'
+              restoreKeys: |
+                npm | "$(Agent.OS)"
+                npm
+              path: $(npm_config_cache)
+
           # Cache and restore NuGet packages
           - task: Cache@2
             condition: ${{ parameters.cache_nuget }}

src/Umbraco.Commerce.Checkout/Pipeline/Tasks/CreateUmbracoCommerceCheckoutZeroValuePaymentMethodTask.cs

@@ -16,7 +16,7 @@ public CreateUmbracoCommerceCheckoutZeroValuePaymentMethodTask(IUmbracoCommerceA
 
         public override PipelineResult<InstallPipelineContext> Execute(PipelineArgs<InstallPipelineContext> args)
         {
-            _commerceApi.Uow.Execute(uow =>
+            _commerceApi.Uow.Execute(uow => 
             {
                 if (!_commerceApi.PaymentMethodExists(args.Model.Store.Id, UmbracoCommerceCheckoutConstants.PaymentMethods.Aliases.ZeroValue))
                 {

src/Umbraco.Commerce.Checkout/Umbraco.Commerce.Checkout.csproj

@@ -29,7 +29,7 @@
     <WriteLinesToFile File="Client\config.outputPath.js" Lines="exports.outputPath = '../$(IntermediateOutputPath.Replace('\', '/'))clientassets';" Overwrite="true" WriteOnlyWhenDifferent="true" />
   </Target>
 
-  <!-- Update package.manifest files with current build version after client assets build 
+  <!-- Update package.manifest files with current build version after client assets build -->
   <ItemGroup>
     <PackageReference Include="Umbraco.JsonSchema.Extensions" PrivateAssets="all" />
   </ItemGroup>
@@ -40,6 +40,5 @@
     </ItemGroup>
     <JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
   </Target>
-  -->
 
 </Project>

src/Umbraco.Commerce.Checkout/packages.lock.json

@@ -70,6 +70,12 @@
         "resolved": "0.2.0",
         "contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
       },
+      "Umbraco.JsonSchema.Extensions": {
+        "type": "Direct",
+        "requested": "[0.3.0, )",
+        "resolved": "0.3.0",
+        "contentHash": "pvgnrC9vQ/3GvYvAwhLHvqwMgyvndHtKi+io77cMNuY+e/eR0eBV5SyzXmW5q3MFnbV4AizdjZIsuoMszY7mxA=="
+      },
       "Azure.Core": {
         "type": "Transitive",
         "resolved": "1.6.0",