Merge branch 'main' into feature/add-hubspot-integration

# Conflicts:
#	README.md
#	src/Umbraco.Cms.Integrations.Testsite.V8/packages.config
#	src/Umbraco.Cms.Integrations.sln

Solution clean-up.
Error handling and logging for API requests.

Author: acoumb

.gitignore

@@ -315,14 +315,14 @@ $RECYCLE.BIN/
 umbraco
 bin
 node_modules
-src/Umbraco.Cms.Integrations.Commerce.CommerceTools.Testsite.V8/App_Plugins
-src/Umbraco.Cms.Integrations.Commerce.CommerceTools.Testsite.V8/App_Data
-src/Umbraco.Cms.Integrations.Commerce.CommerceTools.Testsite.V8/Media
+src/Umbraco.Cms.Integrations.Testsite.V8/App_Plugins
+src/Umbraco.Cms.Integrations.Testsite.V8/App_Data
+src/Umbraco.Cms.Integrations.Testsite.V8/Media
 
 
-src/Umbraco.Cms.Integrations.Commerce.CommerceTools.Testsite.V9/App_Plugins
-src/Umbraco.Cms.Integrations.Commerce.CommerceTools.Testsite.V9/umbraco
-src/Umbraco.Cms.Integrations.Commerce.CommerceTools.Testsite.V9/wwwroot/media
+src/Umbraco.Cms.Integrations.Testsite.V9/App_Plugins
+src/Umbraco.Cms.Integrations.Testsite.V9/umbraco
+src/Umbraco.Cms.Integrations.Testsite.V9/wwwroot/media
 
 src/Umbraco.Cms.Integrations.Crm.Hubspot.Testsite.V8/App_Data/
 src/Umbraco.Cms.Integrations.Crm.Hubspot.Testsite.V8/App_Plugins/

README.md

@@ -8,6 +8,4 @@ This repository houses open-source extensions, created for Umbraco CMS, that int
 
 [CommerceTools](./src/Umbraco.Cms.Integrations.Commerce.CommerceTools/) - a product and category picker that can be added as a property editor for content, with a value converter providing a strongly typed model for rendering.
 
-### CRM
-
-[Hubspot](./src/Umbraco.Cms.Integrations.Crm.Hubspot/) - a extension for Umbraco CMS providing a form picker and rendering component for Hubspot forms.
+[Semrush](./src/Umbraco.Cms.Integrations.SEO.Semrush/) - a search tool available as a content app, helping editors research and use appropriate keywords for their content, to help with website search engine optimisation.

azure-pipeline - SEO.SemrushTools.yml

@@ -1,5 +1,5 @@
 trigger:
-- feature/SEMRUSH
+- main
 
 pool:
   vmImage: 'windows-latest'
@@ -14,6 +14,14 @@ steps:
 - task: NuGetToolInstaller@1
   displayName: 'Install NuGet'
 
+- task: DotNetCoreCLI@2
+  displayName: 'NuGet Restore'
+  inputs:
+    command: 'restore'
+    feedsToUse: 'select'
+    projects: '$(project)'
+    includeNuGetOrg: true
+
 - task: VSBuild@1
   displayName: 'Build Project'
   inputs:
@@ -22,6 +30,14 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
 
+- task: DotNetCoreCLI@2
+  displayName: 'Create NuGet Package'
+  inputs:
+    command: 'pack'
+    arguments: '--configuration $(buildConfiguration)'
+    packagesToPack: '$(project)'
+    versioningScheme: 'off'
+
 - task: CmdLine@2
   displayName: 'Create Umbraco Package'
   inputs:

src/Umbraco.Cms.Integrations.Commerce.CommerceTools/package.xml

@@ -9,8 +9,8 @@
       <url>https://github.com/umbraco/Umbraco.Cms.Integrations</url>
       <requirements type="strict">
         <major>8</major>
-        <minor>1</minor>
-        <patch>0</patch>
+        <minor>5</minor>
+        <patch>4</patch>
       </requirements>
     </package>
     <author>