Merge branch 'main' into feature/inriver-integration

# Conflicts:
#	src/Umbraco.Cms.Integrations.sln

Author: acoumb

azure-pipeline - Crm.ActiveCampaign.Core.yml

@@ -0,0 +1,46 @@
+trigger:
+- main
+
+pool:
+  vmImage: 'windows-latest'
+
+variables:
+  projectName: 'Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core'
+  project: 'src/$(projectName)/$(projectName).csproj'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+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:
+    solution: '$(project)'
+    msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"'
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- task: DotNetCoreCLI@2
+  displayName: 'Create NuGet Package'
+  inputs:
+    command: 'pack'
+    arguments: '--configuration $(buildConfiguration)'
+    packagesToPack: '$(project)'
+    versioningScheme: 'off'
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Build Artifacts'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    ArtifactName: 'drop'
+    publishLocation: 'Container'

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignComposer.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignComposer.cs

@@ -1,10 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
 
+using System;
+
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
 {
     public class ActiveCampaignComposer : IComposer
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerConfiguration.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignFormPickerConfiguration.cs

@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.PropertyEditors;
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
 {
     public class ActiveCampaignFormPickerConfiguration
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerConfigurationEditor.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignFormPickerConfigurationEditor.cs

@@ -2,7 +2,7 @@
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
 {
     public class ActiveCampaignFormPickerConfigurationEditor : ConfigurationEditor<ActiveCampaignFormPickerConfiguration>
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignFormPickerPropertyEditor.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignFormPickerPropertyEditor.cs

@@ -2,13 +2,13 @@
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
 {
     [DataEditor(
         alias: Constants.PropertyEditorAlias,
         name: "ActiveCampaign Form Picker",
         view: "~/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/views/formpicker.html",
-        Group = Core.Constants.PropertyEditors.Groups.Pickers,
+        Group = Cms.Core.Constants.PropertyEditors.Groups.Pickers,
         Icon = "icon-activecampaign")]
     public class ActiveCampaignFormPickerPropertyEditor : DataEditor
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Configuration/ActiveCampaignSettings.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Configuration/ActiveCampaignSettings.cs

@@ -1,5 +1,5 @@
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration
 {
     public class ActiveCampaignSettings
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Constants.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Constants.cs

@@ -1,5 +1,5 @@
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core
 {
     public class Constants
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Controllers/FormsController.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Controllers/FormsController.cs

@@ -1,15 +1,18 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
+using System;
+using System.Net.Http;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Threading.Tasks;
 
-using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
-using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Attributes;
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Controllers
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Controllers
 {
     [PluginController("UmbracoCmsIntegrationsCrmActiveCampaign")]
     public class FormsController : UmbracoAuthorizedApiController

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Editors/ActiveCampaignFormPickerValueConverter.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Editors/ActiveCampaignFormPickerValueConverter.cs

@@ -1,12 +1,13 @@
 using Microsoft.Extensions.Options;
-using System.Text.Json.Nodes;
+
+using System;
 
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
-using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.ViewModels;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.ViewModels;
 
-namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Editors
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Editors
 {
     public class ActiveCampaignFormPickerValueConverter : PropertyValueConverterBase
     {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Helpers/ActiveCampaignHtmlExtensions.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Helpers/ActiveCampaignHtmlExtensions.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.ViewModels;
+using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.ViewModels;
 
 namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Helpers
 {