Skip to content

Commit de0e22b

Browse files
acoumbacoumb
authored
Merge pull request #84 from umbraco/v12/feature/integrations-review
V12 support updates to versioning and targets
2 parents b3fd9df + 74c39c5 commit de0e22b

File tree

13 files changed

+756
-22
lines changed

13 files changed

+756
-22
lines changed

‎src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/Umbraco.Forms.Integrations.Commerce.EMerchantPay.csproj

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net60</TargetFramework>
4+
<TargetFrameworks>net60;net70</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -11,19 +11,26 @@
1111
<PackageIconUrl></PackageIconUrl>
1212
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main-v10/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay</PackageProjectUrl>
1313
<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
14-
<Version>2.0.4</Version>
14+
<Version>2.1.0</Version>
1515
<Authors>Umbraco HQ</Authors>
1616
<Company>Umbraco</Company>
1717
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
1818
<PackageIcon>emerchantpay.png</PackageIcon>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

22-
<ItemGroup>
23-
<PackageReference Include="Umbraco.Cms.Web.Website" version="10.1.0" />
24-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="10.1.0" />
25-
<PackageReference Include="Umbraco.Forms" version="10.1.0" />
26-
<PackageReference Include="Umbraco.Forms.Core" version="10.1.0" />
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
23+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.1.0,11)" />
24+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.1.0,11)" />
25+
<PackageReference Include="Umbraco.Forms" version="[10.1.0,11)" />
26+
<PackageReference Include="Umbraco.Forms.Core" version="[10.1.0,11)" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
30+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12]" />
31+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12]" />
32+
<PackageReference Include="Umbraco.Forms" version="[11.0.0,12]" />
33+
<PackageReference Include="Umbraco.Forms.Core" version="[11.0.0,12]" />
2734
</ItemGroup>
2835

2936
<ItemGroup>

‎src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Umbraco.Forms.Integrations.Crm.ActiveCampaign.csproj

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net60;net70</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<WarningsAsErrors>Nullable</WarningsAsErrors>
77
</PropertyGroup>
@@ -21,9 +21,14 @@
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

24-
<ItemGroup>
25-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="10.1.0" />
26-
<PackageReference Include="Umbraco.Forms.Core" Version="10.1.0" />
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
25+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[10.1.0,11)" />
26+
<PackageReference Include="Umbraco.Forms.Core" Version="[10.1.0,11)" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
30+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0,12]" />
31+
<PackageReference Include="Umbraco.Forms.Core" Version="[11.0.0,12]" />
2732
</ItemGroup>
2833

2934
<ItemGroup>

‎src/Umbraco.Forms.Integrations.Crm.Hubspot/HubspotWorkflow.cs

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

55
using System;
66
using System.Collections.Generic;
7-
7+
using System.Reflection;
88
using Umbraco.Forms.Core;
99
using Umbraco.Forms.Core.Attributes;
1010
using Umbraco.Forms.Core.Enums;
11+
using Umbraco.Forms.Core.Interfaces;
12+
using Umbraco.Forms.Core.Models;
1113
using Umbraco.Forms.Integrations.Crm.Hubspot.Models;
1214
using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
1315

@@ -39,12 +41,14 @@ public HubspotWorkflow(ILogger<HubspotWorkflow> logger, IContactService contactS
3941

4042
public override WorkflowExecutionStatus Execute(WorkflowExecutionContext context)
4143
{
44+
var workflowName = GetWorkflowName();
45+
4246
var fieldMappingsRawJson = FieldMappings;
4347
var fieldMappings = JsonConvert.DeserializeObject<List<MappedProperty>>(fieldMappingsRawJson);
4448
if (fieldMappings.Count == 0)
4549
{
46-
_logger.LogWarning("Workflow {WorkflowName}: Missing Hubspot field mappings for workflow for the form {FormName} ({FormId})",
47-
Workflow.Name, context.Form.Name, context.Form.Id);
50+
_logger.LogWarning("Workflow {WorkflowName}: Missing Hubspot field mappings for workflow for the form {FormName} ({FormId})",
51+
workflowName, context.Form.Name, context.Form.Id);
4852
return WorkflowExecutionStatus.NotConfigured;
4953
}
5054

@@ -53,10 +57,10 @@ public override WorkflowExecutionStatus Execute(WorkflowExecutionContext context
5357
{
5458
case CommandResult.NotConfigured:
5559
_logger.LogWarning("Workflow {WorkflowName}: Could not complete contact request for {FormName} ({FormId}) as the workflow is not correctly configured.",
56-
Workflow.Name, context.Form.Name, context.Form.Id);
60+
workflowName, context.Form.Name, context.Form.Id);
5761
return WorkflowExecutionStatus.NotConfigured;
5862
case CommandResult.Failed:
59-
_logger.LogWarning("Workflow {WorkflowName}: Failed for {FormName} ({FormId}).", Workflow.Name, context.Form.Name, context.Form.Id);
63+
_logger.LogWarning("Workflow {WorkflowName}: Failed for {FormName} ({FormId}).", workflowName, context.Form.Name, context.Form.Id);
6064
return WorkflowExecutionStatus.Failed;
6165
case CommandResult.Success:
6266
return WorkflowExecutionStatus.Completed;
@@ -66,5 +70,17 @@ public override WorkflowExecutionStatus Execute(WorkflowExecutionContext context
6670
}
6771

6872
public override List<Exception> ValidateSettings() => new List<Exception>();
73+
74+
/// <summary>
75+
/// Get workflow's name using reflection in regards to breaking changes between Forms 11 and 12.
76+
/// </summary>
77+
/// <returns></returns>
78+
private string GetWorkflowName()
79+
{
80+
var workflow = typeof(WorkflowType).GetProperty(nameof(Workflow)).GetValue(this);
81+
var name = workflow.GetType().GetProperty(nameof(Workflow.Name)).GetValue(workflow).ToString();
82+
83+
return name;
84+
}
6985
}
7086
}

‎src/Umbraco.Forms.Integrations.Crm.Hubspot/Umbraco.Forms.Integrations.Crm.Hubspot.csproj

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net60;net70</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -11,17 +11,22 @@
1111
<PackageIconUrl></PackageIconUrl>
1212
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main-v10/src/Umbraco.Forms.Integrations.Crm.Hubspot</PackageProjectUrl>
1313
<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
14-
<Version>3.1.0</Version>
14+
<Version>3.2.0</Version>
1515
<Authors>Umbraco HQ</Authors>
1616
<Company>Umbraco</Company>
1717
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
1818
<PackageIcon>hubspot.png</PackageIcon>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

22-
<ItemGroup>
23-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="10.1.0" />
24-
<PackageReference Include="Umbraco.Forms.Core" Version="10.1.0" />
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
23+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[10.1.0,11)" />
24+
<PackageReference Include="Umbraco.Forms.Core" Version="[10.1.0,11)" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
28+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0,12]" />
29+
<PackageReference Include="Umbraco.Forms.Core" Version="[11.0.0,12]" />
2530
</ItemGroup>
2631

2732
<ItemGroup>

0 commit comments

Comments
 (0)