Skip to content

Commit 31e8af0

Browse files
acoumbacoumb
authored
Merge pull request #268 from umbraco/v16/dev
V16/dev
2 parents 6e70eac + cdc675e commit 31e8af0

File tree

278 files changed

+19301
-17572
lines changed

Some content is hidden

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

278 files changed

+19301
-17572
lines changed

‎.gitignore

Lines changed: 209 additions & 70 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ This repository houses open-source extensions, created for Umbraco CMS, that int
66

77
### Analytics
88

9-
[Cookiebot](./src/Umbraco.Cms.Integrations.Analytics.Cookiebot/) - a Razor Class Library serving as an implementation model for Cookiebot banner and declaration.
9+
[Cookiebot](../../main-v15/src/Umbraco.Cms.Integrations.Analytics.Cookiebot/) - a Razor Class Library serving as an implementation model for Cookiebot banner and declaration.
1010

1111
### Commerce
1212

13-
[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.
14-
1513
[Shopify](./src/Umbraco.Cms.Integrations.Commerce.Shopify/) - a products picker that can be added as a property editor for content, with a value converter providing a strongly typed model for rendering.
1614

1715
### SEO
1816

1917
[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.
2018

21-
[GoogleSearchConsole.URLInspectionTool](./src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/) - a tool allowing programmatic access to URL-level data for properties managed in Google Search Console and the indexed version of a URL.
22-
2319
### CRM
2420

2521
[HubSpot](./src/Umbraco.Cms.Integrations.Crm.Hubspot/) - a form picker and rendering component for HubSpot forms.
@@ -34,10 +30,4 @@ This repository houses open-source extensions, created for Umbraco CMS, that int
3430
### Search
3531
[Algolia](./src/Umbraco.Cms.Integrations.Search.Algolia/) - a custom dashboard for managing search indices in Algolia.
3632

37-
### PIM
38-
[inriver](./src/Umbraco.Cms.Integrations.PIM.Inriver/) - a products picker that can be added as a property editor for content, with a value converter providing a strongly typed model for rendering, and a rendering component.
39-
40-
### DAM
41-
[Aprimo](./src/Umbraco.Cms.Integrations.DAM.Aprimo/) - a media picker for digital assets managed in an Aprimo workspace.
42-
4333

‎src/Umbraco.Cms.Integrations.sln renamed to ‎Umbraco.Cms.Integrations.sln

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,55 @@ VisualStudioVersion = 17.2.32616.157
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2801CB6C-78DE-4129-B5C6-D349F47F9B5C}"
77
ProjectSection(SolutionItems) = preProject
8-
..\azure-pipeline - Crm.ActiveCampaign.yml = ..\azure-pipeline - Crm.ActiveCampaign.yml
9-
..\azure-pipeline - Crm.Hubspot.yml = ..\azure-pipeline - Crm.Hubspot.yml
10-
..\azure-pipeline - SEO.SemrushTools.yml = ..\azure-pipeline - SEO.SemrushTools.yml
11-
..\azure-pipelines - Commerce.Shopify.yml = ..\azure-pipelines - Commerce.Shopify.yml
12-
..\README.md = ..\README.md
8+
azure-pipeline - Crm.ActiveCampaign.yml = azure-pipeline - Crm.ActiveCampaign.yml
9+
azure-pipeline - Crm.Dynamics.yml = azure-pipeline - Crm.Dynamics.yml
10+
azure-pipeline - Crm.Hubspot.yml = azure-pipeline - Crm.Hubspot.yml
11+
azure-pipeline - Search.Algolia.yml = azure-pipeline - Search.Algolia.yml
12+
azure-pipeline - SEO.SemrushTools.yml = azure-pipeline - SEO.SemrushTools.yml
13+
azure-pipelines - Automation.Zapier.yml = azure-pipelines - Automation.Zapier.yml
14+
azure-pipelines - Commerce.Shopify.yml = azure-pipelines - Commerce.Shopify.yml
15+
README.md = README.md
1316
EndProjectSection
1417
EndProject
1518
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Search", "Search", "{F56605AE-2258-4F61-B454-4247334DFC26}"
1619
EndProject
1720
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Algolia", "Algolia", "{F2CAA1F7-9BED-4EB6-8875-D176B92D393A}"
1821
EndProject
19-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Search.Algolia", "Umbraco.Cms.Integrations.Search.Algolia\Umbraco.Cms.Integrations.Search.Algolia.csproj", "{434608E7-143B-4761-A7E9-328DF0CFAB89}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Search.Algolia", "src\Umbraco.Cms.Integrations.Search.Algolia\Umbraco.Cms.Integrations.Search.Algolia.csproj", "{434608E7-143B-4761-A7E9-328DF0CFAB89}"
2023
EndProject
2124
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Automation", "Automation", "{6A1E1D13-8EDE-4016-9355-4C59807701DE}"
2225
EndProject
2326
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Zapier", "Zapier", "{6AA47D4A-5876-4E66-982B-BA67AF6C5DF9}"
2427
EndProject
25-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Automation.Zapier", "Umbraco.Cms.Integrations.Automation.Zapier\Umbraco.Cms.Integrations.Automation.Zapier.csproj", "{5EED84C5-432F-49F2-A119-3FE6D3E6BBDF}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Automation.Zapier", "src\Umbraco.Cms.Integrations.Automation.Zapier\Umbraco.Cms.Integrations.Automation.Zapier.csproj", "{5EED84C5-432F-49F2-A119-3FE6D3E6BBDF}"
2629
EndProject
2730
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Crm", "Crm", "{8736740E-72E9-4249-803C-7254D5F08BD4}"
2831
EndProject
2932
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HubSpot", "HubSpot", "{9D18B109-4E18-4EEC-B5BE-DAA27CADEAC0}"
3033
EndProject
31-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Crm.Hubspot", "Umbraco.Cms.Integrations.Crm.Hubspot\Umbraco.Cms.Integrations.Crm.Hubspot.csproj", "{3ACC56EC-1A65-4A63-8DB4-428D8D2A6380}"
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Crm.Hubspot", "src\Umbraco.Cms.Integrations.Crm.Hubspot\Umbraco.Cms.Integrations.Crm.Hubspot.csproj", "{3ACC56EC-1A65-4A63-8DB4-428D8D2A6380}"
3235
EndProject
3336
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commerce", "Commerce", "{712BCE87-E004-479D-BB49-6BA287ED1B5D}"
3437
EndProject
3538
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shopify", "Shopify", "{D04EE8B1-1354-4B59-A224-646643A4E345}"
3639
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Commerce.Shopify", "Umbraco.Cms.Integrations.Commerce.Shopify\Umbraco.Cms.Integrations.Commerce.Shopify.csproj", "{1D1A9DC0-DB6B-4979-92B6-EAD1F992F1AB}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Commerce.Shopify", "src\Umbraco.Cms.Integrations.Commerce.Shopify\Umbraco.Cms.Integrations.Commerce.Shopify.csproj", "{1D1A9DC0-DB6B-4979-92B6-EAD1F992F1AB}"
3841
EndProject
39-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Crm.ActiveCampaign", "Umbraco.Cms.Integrations.Crm.ActiveCampaign\Umbraco.Cms.Integrations.Crm.ActiveCampaign.csproj", "{82B04954-4701-4518-B2A3-B8B4A37A416C}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Crm.ActiveCampaign", "src\Umbraco.Cms.Integrations.Crm.ActiveCampaign\Umbraco.Cms.Integrations.Crm.ActiveCampaign.csproj", "{82B04954-4701-4518-B2A3-B8B4A37A416C}"
4043
EndProject
4144
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ActiveCampaign", "ActiveCampaign", "{2D127526-7EC2-4D3A-96D3-6F063403E493}"
4245
EndProject
4346
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dynamics", "Dynamics", "{BF22D815-616E-49D5-93EB-18FCE975D3BE}"
4447
EndProject
45-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Crm.Dynamics", "Umbraco.Cms.Integrations.Crm.Dynamics\Umbraco.Cms.Integrations.Crm.Dynamics.csproj", "{02566D6E-91EB-47AD-9964-9A8FC1837F4B}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Integrations.Crm.Dynamics", "src\Umbraco.Cms.Integrations.Crm.Dynamics\Umbraco.Cms.Integrations.Crm.Dynamics.csproj", "{02566D6E-91EB-47AD-9964-9A8FC1837F4B}"
4649
EndProject
4750
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SEO", "SEO", "{50F83E07-6690-4EF2-AF4D-A1DE8C73E409}"
4851
EndProject
4952
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Semrush", "Semrush", "{C46C55B4-4AA8-47F1-BAFE-B06161A10E9A}"
5053
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.SEO.Semrush", "Umbraco.Cms.Integrations.SEO.Semrush\Umbraco.Cms.Integrations.SEO.Semrush.csproj", "{07922A29-9776-4377-A500-2540E56AA3EB}"
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.SEO.Semrush", "src\Umbraco.Cms.Integrations.SEO.Semrush\Umbraco.Cms.Integrations.SEO.Semrush.csproj", "{07922A29-9776-4377-A500-2540E56AA3EB}"
5255
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Testsite.V15", "Umbraco.Cms.Integrations.Testsite.V15\Umbraco.Cms.Integrations.Testsite.V15.csproj", "{64093A3C-4152-49BB-AA21-5F2E567694A9}"
54-
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Analytics.Cookiebot", "Umbraco.Cms.Integrations.Analytics.Cookiebot\Umbraco.Cms.Integrations.Analytics.Cookiebot.csproj", "{78E58D2E-A1E4-439B-AE6B-780EC6505C00}"
56-
EndProject
57-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analytics", "Analytics", "{D9850A88-AFE1-48DC-B7CE-79A4F9E96300}"
56+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Integrations.Testsite.V16", "examples\Umbraco.Cms.Integrations.Testsite.V16\Umbraco.Cms.Integrations.Testsite.V16.csproj", "{B7C9C7C5-E354-4080-A74D-AD8BC6C397DF}"
5857
EndProject
5958
Global
6059
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -90,14 +89,10 @@ Global
9089
{07922A29-9776-4377-A500-2540E56AA3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
9190
{07922A29-9776-4377-A500-2540E56AA3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
9291
{07922A29-9776-4377-A500-2540E56AA3EB}.Release|Any CPU.Build.0 = Release|Any CPU
93-
{64093A3C-4152-49BB-AA21-5F2E567694A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94-
{64093A3C-4152-49BB-AA21-5F2E567694A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
95-
{64093A3C-4152-49BB-AA21-5F2E567694A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
96-
{64093A3C-4152-49BB-AA21-5F2E567694A9}.Release|Any CPU.Build.0 = Release|Any CPU
97-
{78E58D2E-A1E4-439B-AE6B-780EC6505C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
98-
{78E58D2E-A1E4-439B-AE6B-780EC6505C00}.Debug|Any CPU.Build.0 = Debug|Any CPU
99-
{78E58D2E-A1E4-439B-AE6B-780EC6505C00}.Release|Any CPU.ActiveCfg = Release|Any CPU
100-
{78E58D2E-A1E4-439B-AE6B-780EC6505C00}.Release|Any CPU.Build.0 = Release|Any CPU
92+
{B7C9C7C5-E354-4080-A74D-AD8BC6C397DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
93+
{B7C9C7C5-E354-4080-A74D-AD8BC6C397DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
94+
{B7C9C7C5-E354-4080-A74D-AD8BC6C397DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
95+
{B7C9C7C5-E354-4080-A74D-AD8BC6C397DF}.Release|Any CPU.Build.0 = Release|Any CPU
10196
EndGlobalSection
10297
GlobalSection(SolutionProperties) = preSolution
10398
HideSolutionNode = FALSE
@@ -117,7 +112,6 @@ Global
117112
{02566D6E-91EB-47AD-9964-9A8FC1837F4B} = {BF22D815-616E-49D5-93EB-18FCE975D3BE}
118113
{C46C55B4-4AA8-47F1-BAFE-B06161A10E9A} = {50F83E07-6690-4EF2-AF4D-A1DE8C73E409}
119114
{07922A29-9776-4377-A500-2540E56AA3EB} = {C46C55B4-4AA8-47F1-BAFE-B06161A10E9A}
120-
{78E58D2E-A1E4-439B-AE6B-780EC6505C00} = {D9850A88-AFE1-48DC-B7CE-79A4F9E96300}
121115
EndGlobalSection
122116
GlobalSection(ExtensibilityGlobals) = postSolution
123117
SolutionGuid = {2FB51E08-A3C8-4DFF-B3CB-E99C2ED021D5}

‎azure-pipeline - Analytics.Cookiebot.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎azure-pipeline - Crm.ActiveCampaign.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
trigger:
2-
- main-v14
2+
branches:
3+
include:
4+
- main-v16
5+
- v16/dev
6+
paths:
7+
include:
8+
- src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/**
9+
- azure-pipeline - Crm.ActiveCampaign.yml
310

411
pool:
512
vmImage: 'windows-latest'
@@ -22,6 +29,12 @@ steps:
2229
projects: '$(project)'
2330
includeNuGetOrg: true
2431

32+
- task: UseDotNet@2
33+
displayName: 'Use SDK version 9.0.203'
34+
inputs:
35+
packageType: 'sdk'
36+
version: '9.0.203'
37+
2538
- task: VSBuild@1
2639
displayName: 'Build Project'
2740
inputs:

‎azure-pipeline - Crm.Dynamics.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
trigger:
2-
- main
2+
branches:
3+
include:
4+
- main-v16
5+
- v16/dev
6+
paths:
7+
include:
8+
- src/Umbraco.Cms.Integrations.Crm.Dynamics/**
9+
- azure-pipeline - Crm.Dynamics.yml
310

411
pool:
512
vmImage: 'windows-latest'
@@ -22,6 +29,12 @@ steps:
2229
projects: '$(project)'
2330
includeNuGetOrg: true
2431

32+
- task: UseDotNet@2
33+
displayName: 'Use SDK version 9.0.203'
34+
inputs:
35+
packageType: 'sdk'
36+
version: '9.0.203'
37+
2538
- task: VSBuild@1
2639
displayName: 'Build Project'
2740
inputs:

‎azure-pipeline - Crm.Hubspot.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
trigger:
2-
- main-v14
2+
branches:
3+
include:
4+
- main-v16
5+
- v16/dev
6+
paths:
7+
include:
8+
- src/Umbraco.Cms.Integrations.Crm.Hubspot/**
9+
- azure-pipeline - Crm.Hubspot.yml
310

411
pool:
512
vmImage: 'windows-latest'
@@ -22,6 +29,12 @@ steps:
2229
projects: '$(project)'
2330
includeNuGetOrg: true
2431

32+
- task: UseDotNet@2
33+
displayName: 'Use SDK version 9.0.203'
34+
inputs:
35+
packageType: 'sdk'
36+
version: '9.0.203'
37+
2538
- task: VSBuild@1
2639
displayName: 'Build Project'
2740
inputs:

‎azure-pipeline - SEO.SemrushTools.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
trigger:
2-
- main
2+
branches:
3+
include:
4+
- main-v16
5+
- v16/dev
6+
paths:
7+
include:
8+
- src/Umbraco.Cms.Integrations.SEO.Semrush/**
9+
- azure-pipeline - SEO.SemrushTools.yml
310

411
pool:
512
vmImage: 'windows-latest'
@@ -22,6 +29,12 @@ steps:
2229
projects: '$(project)'
2330
includeNuGetOrg: true
2431

32+
- task: UseDotNet@2
33+
displayName: 'Use SDK version 9.0.203'
34+
inputs:
35+
packageType: 'sdk'
36+
version: '9.0.203'
37+
2538
- task: VSBuild@1
2639
displayName: 'Build Project'
2740
inputs:
@@ -38,21 +51,6 @@ steps:
3851
packagesToPack: '$(project)'
3952
versioningScheme: 'off'
4053

41-
- task: UseDotNet@2
42-
displayName: 'Install .NET Core 3.x'
43-
inputs:
44-
packageType: 'sdk'
45-
version: '3.x'
46-
47-
- task: CmdLine@2
48-
displayName: 'Create Umbraco Package'
49-
inputs:
50-
script: |
51-
dotnet tool install --global Umbraco.Tools.Packages
52-
cd src/$(projectName)/
53-
umbpack pack .\package.xml -o $(Build.ArtifactStagingDirectory)
54-
cd ../../
55-
5654
- task: PublishBuildArtifacts@1
5755
displayName: 'Publish Build Artifacts'
5856
inputs:

‎azure-pipeline - Search.Algolia.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
trigger:
2-
- main
2+
branches:
3+
include:
4+
- main-v16
5+
- v16/dev
6+
paths:
7+
include:
8+
- src/Umbraco.Cms.Integrations.Search.Algolia/**
9+
- azure-pipeline - Search.Algolia.yml
310

411
pool:
512
vmImage: 'windows-latest'
@@ -21,7 +28,11 @@ steps:
2128
feedsToUse: 'select'
2229
projects: '$(project)'
2330
includeNuGetOrg: true
24-
31+
- task: UseDotNet@2
32+
displayName: 'Use SDK version 9.0.203'
33+
inputs:
34+
packageType: 'sdk'
35+
version: '9.0.203'
2536
- task: VSBuild@1
2637
displayName: 'Build Project'
2738
inputs:

‎azure-pipelines - Automation.Zapier.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
trigger:
2-
- main
2+
branches:
3+
include:
4+
- main-v16
5+
- v16/dev
6+
paths:
7+
include:
8+
- src/Umbraco.Cms.Integrations.Automation.Zapier/**
9+
- azure-pipeline - Automation.Zapier.yml
310

411
pool:
512
vmImage: 'windows-latest'
@@ -22,6 +29,12 @@ steps:
2229
projects: '$(project)'
2330
includeNuGetOrg: true
2431

32+
- task: UseDotNet@2
33+
displayName: 'Use SDK version 9.0.203'
34+
inputs:
35+
packageType: 'sdk'
36+
version: '9.0.203'
37+
2538
- task: VSBuild@1
2639
displayName: 'Build Project'
2740
inputs:

0 commit comments

Comments
 (0)