Skip to content

Commit c98b215

Browse files
acoumbacoumb
authored
Merge pull request #109 from umbraco/feature/v12-support
Feature/v12 support
2 parents 62affb6 + 47350ed commit c98b215

File tree

22 files changed

+847
-42
lines changed

22 files changed

+847
-42
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,8 @@ src/Umbraco.Cms.Integrations.SEO.Semrush.Testsite.V8/App_Data/
334334
src/Umbraco.Cms.Integrations.SEO.Semrush.Testsite.V8/App_Plugins/
335335

336336
appsettings.Local.json
337+
src/Umbraco.Cms.Integrations.Testsite.V11/App_Plugins/
338+
src/Umbraco.Cms.Integrations.Testsite.V11/Views/
339+
src/Umbraco.Cms.Integrations.Testsite.V12/App_Plugins/
340+
src/Umbraco.Cms.Integrations.Testsite.V12/Views/_ViewImports.cshtml
341+
src/Umbraco.Cms.Integrations.Testsite.V12/Views/

‎src/Umbraco.Cms.Integrations.Automation.Zapier/Migrations/UmbracoAppStartingHandler.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
using Umbraco.Cms.Core.Events;
44
using Umbraco.Cms.Core.Migrations;
55
using Umbraco.Cms.Core.Notifications;
6-
using Umbraco.Cms.Core.Scoping;
76
using Umbraco.Cms.Core.Services;
87
using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
9-
using Umbraco.Cms.Integrations.Automation.Zapier.Helpers;
8+
9+
#if NET5_0
10+
using Umbraco.Cms.Core.Scoping;
11+
#else
12+
using Umbraco.Cms.Infrastructure.Scoping;
13+
#endif
1014

1115
namespace Umbraco.Cms.Integrations.Automation.Zapier.Migrations
1216
{

‎src/Umbraco.Cms.Integrations.Automation.Zapier/Umbraco.Cms.Integrations.Automation.Zapier.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net50</TargetFrameworks>
4+
<TargetFrameworks>net472;net50;net60;net70</TargetFrameworks>
55
<Authors>Umbraco HQ</Authors>
66
<Company>Umbraco</Company>
77
<Title>Umbraco CMS Integrations: Automation - Zapier</Title>
88
<Description>An extension for Umbraco CMS providing an automation tool for calling Zapier triggers when specific content gets published.</Description>
99
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
1010
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Automation.Zapier</PackageProjectUrl>
1111
<Product>Umbraco.Cms.Integrations.Automation.Zapier</Product>
12-
<Version>1.1.2</Version>
12+
<Version>1.2.0</Version>
1313
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
1414
<PackageIcon>zapier.png</PackageIcon>
1515
<PackageReadmeFile>readme.md</PackageReadmeFile>
@@ -20,9 +20,21 @@
2020
</ItemGroup>
2121

2222
<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
23-
<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
24-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
25-
<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />
23+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[9.0.1,10)" />
24+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[9.0.1,10)" />
25+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[9.0.1,10)" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
29+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.0.0,11)" />
30+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.0.0,11)" />
31+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[10.0.0,11)" />
32+
</ItemGroup>
33+
34+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
35+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12]" />
36+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12]" />
37+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12]" />
2638
</ItemGroup>
2739

2840
<ItemGroup>

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net50</TargetFrameworks>
3+
<TargetFrameworks>net472;net50;net60;net70</TargetFrameworks>
44
</PropertyGroup>
55

66
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
<PackageIconUrl></PackageIconUrl>
1111
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Commerce.Shopify</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
13-
<Version>1.1.0</Version>
13+
<Version>1.1.1</Version>
1414
<Authors>Umbraco HQ</Authors>
1515
<Company>Umbraco</Company>
1616
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -23,8 +23,18 @@
2323
</ItemGroup>
2424

2525
<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
26-
<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
27-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
26+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[9.0.1,10)" />
27+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[9.0.1,10)" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
31+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.0.0,11)" />
32+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.0.0,11)" />
33+
</ItemGroup>
34+
35+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
36+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12)" />
37+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12)" />
2838
</ItemGroup>
2939

3040
<ItemGroup>

‎src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Crm.ActiveCampaign</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
16-
<Version>2.0.0</Version>
16+
<Version>2.0.1</Version>
1717
<Authors>Umbraco HQ</Authors>
1818
<Company>Umbraco</Company>
1919
</PropertyGroup>
@@ -25,9 +25,9 @@
2525
</ItemGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
28-
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12)" />
29-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12)" />
30-
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12)" />
28+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12]" />
29+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12]" />
30+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12]" />
3131
</ItemGroup>
3232

3333
</Project>

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/UmbracoAppStartingHandler.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
using Umbraco.Cms.Core.Events;
44
using Umbraco.Cms.Core.Migrations;
55
using Umbraco.Cms.Core.Notifications;
6-
using Umbraco.Cms.Core.Scoping;
76
using Umbraco.Cms.Core.Services;
87
using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
98

9+
#if NET5_0
10+
using Umbraco.Cms.Core.Scoping;
11+
#else
12+
using Umbraco.Cms.Infrastructure.Scoping;
13+
#endif
14+
1015
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations
1116
{
1217
public class UmbracoAppStartingHandler : INotificationHandler<UmbracoApplicationStartingNotification>

‎src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net50</TargetFrameworks>
3+
<TargetFrameworks>net472;net50;net60;net70</TargetFrameworks>
44
</PropertyGroup>
55

66
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
<PackageIconUrl></PackageIconUrl>
1111
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Crm.Dynamics</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
13-
<Version>1.2.0</Version>
13+
<Version>1.2.1</Version>
1414
<Authors>Umbraco HQ</Authors>
1515
<Company>Umbraco</Company>
1616
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -23,9 +23,21 @@
2323
</ItemGroup>
2424

2525
<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
26-
<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
27-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
28-
<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />
26+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[9.0.1,10)" />
27+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[9.0.1,10)" />
28+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[9.0.1,10)" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition="'$(TargetFramework)' == 'net60'">
32+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.0.0,11)" />
33+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.0.0,11)" />
34+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[10.0.0,11)" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
38+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12]" />
39+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12]" />
40+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12]" />
2941
</ItemGroup>
3042

3143
<ItemGroup>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageIconUrl></PackageIconUrl>
1111
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Crm.Hubspot</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
13-
<Version>2.1.0</Version>
13+
<Version>2.1.1</Version>
1414
<Authors>Umbraco HQ</Authors>
1515
<Company>Umbraco</Company>
1616
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -35,9 +35,9 @@
3535
</ItemGroup>
3636

3737
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
38-
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12)" />
39-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12)" />
40-
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12)" />
38+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12]" />
39+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12]" />
40+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12]" />
4141
</ItemGroup>
4242

4343
<ItemGroup>

‎src/Umbraco.Cms.Integrations.DAM.Aprimo/Umbraco.Cms.Integrations.DAM.Aprimo.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.DAM.Aprimo</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
16-
<Version>1.0.1</Version>
16+
<Version>1.0.2</Version>
1717
<Authors>Umbraco HQ</Authors>
1818
<Company>Umbraco</Company>
1919
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -23,8 +23,8 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.3.0,12)" />
27-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.3.0,12)" />
26+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.3.0,12]" />
27+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.3.0,12]" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/Umbraco.Cms.Integrations.PIM.Inriver/Umbraco.Cms.Integrations.PIM.Inriver.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.PIM.Inriver</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
16-
<Version>1.0.0</Version>
16+
<Version>1.0.1</Version>
1717
<Authors>Umbraco HQ</Authors>
1818
<Company>Umbraco</Company>
1919
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -22,8 +22,8 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.3.0,12)" />
26-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.3.0,12)" />
25+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.3.0,12]" />
26+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.3.0,12]" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

0 commit comments

Comments
 (0)