Skip to content

Commit 5e92dcc

Browse files
acoumbacoumb
committed
Merge branch 'main' into feature/inriver-integration
# Conflicts: # src/Umbraco.Cms.Integrations.sln
2 parents c1d82d3 + 634cae3 commit 5e92dcc

File tree

13 files changed

+332
-12
lines changed

13 files changed

+332
-12
lines changed

‎src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/package.manifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Umbraco.Cms.Integrations.Crm.Hubspot",
3-
"version": "1.1.4",
3+
"version": "1.1.6",
44
"allowPackageTelemetry": true,
55
"javascript": [
66
"~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/js/formpicker.controller.js",
@@ -12,4 +12,4 @@
1212
"css": [
1313
"~/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/css/styles.css"
1414
]
15-
}
15+
}

‎src/Umbraco.Cms.Integrations.Crm.Hubspot/HubspotComposer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Umbraco.Cms.Integrations.Crm.Hubspot
1515
{
16-
public class HubspotComposer : IUserComposer
16+
public class HubspotComposer : IComposer
1717
{
1818
#if NETCOREAPP
1919
public void Compose(IUmbracoBuilder builder)

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

Lines changed: 18 additions & 6 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,21 +10,33 @@
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>1.1.5</Version>
13+
<Version>1.1.6</Version>
1414
<Authors>Umbraco HQ</Authors>
1515
<Company>Umbraco</Company>
1616
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
1717
<PackageIcon>hubspot.png</PackageIcon>
1818
</PropertyGroup>
1919

2020
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
21-
<PackageReference Include="UmbracoCms.Web" version="8.4.0" />
21+
<PackageReference Include="UmbracoCms.Web" version="[8.4.0, 9)" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
25-
<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
26-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
27-
<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />
25+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[9.0.1,10)" />
26+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[9.0.1,10)" />
27+
<PackageReference Include="Umbraco.Cms.Web.Common" 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+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[10.0.0,11)" />
34+
</ItemGroup>
35+
36+
<ItemGroup Condition="'$(TargetFramework)' == 'net70'">
37+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[11.0.0,12)" />
38+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[11.0.0,12)" />
39+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[11.0.0,12)" />
2840
</ItemGroup>
2941

3042
<ItemGroup>

‎src/Umbraco.Cms.Integrations.Crm.Hubspot/readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ This integration provides a form picker and rendering component for forms manage
77
Required minimum versions of Umbraco CMS:
88
- 8.5.4 for version 8
99
- 9.0.1 for version 9
10+
- 10.0.0 for version 10
11+
- 11.0.0 for version 11
1012

1113
## How To Use
1214

‎src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Algolia.Search" Version="6.13.0" />
25-
<PackageReference Include="Umbraco.Cms.Web.Website" version="10.3.0" />
26-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="10.3.0" />
27-
<PackageReference Include="Umbraco.Cms.Web.Common" version="10.3.0" />
25+
<PackageReference Include="Umbraco.Cms.Web.Website" version="[10.3.0,11)" />
26+
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="[10.3.0,11)" />
27+
<PackageReference Include="Umbraco.Cms.Web.Common" version="[10.3.0,11)" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/Umbraco.Cms.Integrations.Search.Algolia/build/Umbraco.Cms.Integrations.Search.Algolia.targets

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<AlgoliaPropertyEditorFilesPath>
4+
$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Search\Algolia\**\*.*
5+
</AlgoliaPropertyEditorFilesPath>
6+
</PropertyGroup>
7+
8+
<Target Name="CopyAlgoliaPropertyEditorAssets" BeforeTargets="Build">
9+
<ItemGroup>
10+
<AlgoliaPropertyEditorFiles Include="$(AlgoliaPropertyEditorFilesPath)" />
11+
</ItemGroup>
12+
<Message
13+
Text="Copying Algolia Property Editor files: $(AlgoliaPropertyEditorFilesPath) - #@(AlgoliaPropertyEditorFiles->Count()) files"
14+
Importance="high" />
15+
<Copy SourceFiles="@(AlgoliaPropertyEditorFiles)"
16+
DestinationFiles="@(AlgoliaPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Search\Algolia\%(RecursiveDir)%(Filename)%(Extension)')"
17+
SkipUnchangedFiles="true" />
18+
</Target>
19+
20+
<Target Name="ClearAlgoliaPropertyEditorAssets" BeforeTargets="Clean">
21+
<ItemGroup>
22+
<AlgoliaPropertyEditorDir
23+
Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms\Search\Algolia\" />
24+
</ItemGroup>
25+
<Message Text="Clear old Algolia Property Editor data" Importance="high" />
26+
<RemoveDir Directories="@(AlgoliaPropertyEditorDir)" />
27+
<Delete Files="@(AlgoliaPropertyEditorIconPath)" />
28+
</Target>
29+
30+
</Project>

‎src/Umbraco.Cms.Integrations.Testsite.V11/Program.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
namespace Umbraco.Cms.Integrations.Testsite.V11
2+
{
3+
public class Program
4+
{
5+
public static void Main(string[] args)
6+
=> CreateHostBuilder(args)
7+
.Build()
8+
.Run();
9+
10+
public static IHostBuilder CreateHostBuilder(string[] args) =>
11+
Host.CreateDefaultBuilder(args)
12+
#if DEBUG
13+
.ConfigureAppConfiguration(config =>
14+
config.AddJsonFile(
15+
"appsettings.Local.json",
16+
optional: true,
17+
reloadOnChange: true))
18+
#endif
19+
.ConfigureUmbracoDefaults()
20+
.ConfigureWebHostDefaults(webBuilder =>
21+
{
22+
webBuilder.UseStaticWebAssets();
23+
webBuilder.UseStartup<Startup>();
24+
});
25+
}
26+
}

‎src/Umbraco.Cms.Integrations.Testsite.V11/Properties/launchSettings.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"$schema": "https://json.schemastore.org/launchsettings.json",
3+
"iisSettings": {
4+
"windowsAuthentication": false,
5+
"anonymousAuthentication": true,
6+
"iisExpress": {
7+
"applicationUrl": "http://localhost:15123",
8+
"sslPort": 44321
9+
}
10+
},
11+
"profiles": {
12+
"IIS Express": {
13+
"commandName": "IISExpress",
14+
"launchBrowser": true,
15+
"environmentVariables": {
16+
"ASPNETCORE_ENVIRONMENT": "Development"
17+
}
18+
},
19+
"Umbraco.Web.UI": {
20+
"commandName": "Project",
21+
"dotnetRunMessages": true,
22+
"launchBrowser": true,
23+
"applicationUrl": "https://localhost:44321;http://localhost:15123",
24+
"environmentVariables": {
25+
"ASPNETCORE_ENVIRONMENT": "Development"
26+
}
27+
}
28+
}
29+
}

‎src/Umbraco.Cms.Integrations.Testsite.V11/Startup.cs

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
namespace Umbraco.Cms.Integrations.Testsite.V11
2+
{
3+
public class Startup
4+
{
5+
private readonly IWebHostEnvironment _env;
6+
private readonly IConfiguration _config;
7+
8+
/// <summary>
9+
/// Initializes a new instance of the <see cref="Startup" /> class.
10+
/// </summary>
11+
/// <param name="webHostEnvironment">The web hosting environment.</param>
12+
/// <param name="config">The configuration.</param>
13+
/// <remarks>
14+
/// Only a few services are possible to be injected here https://github.com/dotnet/aspnetcore/issues/9337.
15+
/// </remarks>
16+
public Startup(IWebHostEnvironment webHostEnvironment, IConfiguration config)
17+
{
18+
_env = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
19+
_config = config ?? throw new ArgumentNullException(nameof(config));
20+
}
21+
22+
/// <summary>
23+
/// Configures the services.
24+
/// </summary>
25+
/// <param name="services">The services.</param>
26+
/// <remarks>
27+
/// This method gets called by the runtime. Use this method to add services to the container.
28+
/// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940.
29+
/// </remarks>
30+
public void ConfigureServices(IServiceCollection services)
31+
{
32+
services.AddUmbraco(_env, _config)
33+
.AddBackOffice()
34+
.AddWebsite()
35+
.AddComposers()
36+
.Build();
37+
}
38+
39+
/// <summary>
40+
/// Configures the application.
41+
/// </summary>
42+
/// <param name="app">The application builder.</param>
43+
/// <param name="env">The web hosting environment.</param>
44+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
45+
{
46+
if (env.IsDevelopment())
47+
{
48+
app.UseDeveloperExceptionPage();
49+
}
50+
51+
app.UseUmbraco()
52+
.WithMiddleware(u =>
53+
{
54+
u.UseBackOffice();
55+
u.UseWebsite();
56+
})
57+
.WithEndpoints(u =>
58+
{
59+
u.UseInstallerEndpoints();
60+
u.UseBackOfficeEndpoints();
61+
u.UseWebsiteEndpoints();
62+
});
63+
}
64+
}
65+
}

‎src/Umbraco.Cms.Integrations.Testsite.V11/Umbraco.Cms.Integrations.Testsite.V11.csproj

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
<PropertyGroup>
3+
<TargetFramework>net7.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\css\styles.css">
9+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
10+
<Pack>true</Pack>
11+
</Content>
12+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\formpicker.controller.js">
13+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
14+
<Pack>true</Pack>
15+
</Content>
16+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\hubspot.resource.js">
17+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
18+
<Pack>true</Pack>
19+
</Content>
20+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\hubspot.service.js">
21+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
22+
<Pack>true</Pack>
23+
</Content>
24+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\hubspotauthorization.directive.js">
25+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
26+
<Pack>true</Pack>
27+
</Content>
28+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\js\settings.controller.js">
29+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
30+
<Pack>true</Pack>
31+
</Content>
32+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\package.manifest">
33+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
34+
<Pack>true</Pack>
35+
</Content>
36+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\Render\HubspotForm.cshtml">
37+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
38+
<Pack>true</Pack>
39+
</Content>
40+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\Render\HubspotFormV9.cshtml">
41+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
42+
<Pack>true</Pack>
43+
</Content>
44+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\views\formpicker.html">
45+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
46+
<Pack>true</Pack>
47+
</Content>
48+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\views\formpickereditor.html">
49+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
50+
<Pack>true</Pack>
51+
</Content>
52+
<Content Include="App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\views\settings.html">
53+
<PackagePath>App_Plugins\UmbracoCms.Integrations\Crm\Hubspot\</PackagePath>
54+
<Pack>true</Pack>
55+
</Content>
56+
</ItemGroup>
57+
58+
<ItemGroup>
59+
<PackageReference Include="Umbraco.Cms" Version="11.0.0" />
60+
</ItemGroup>
61+
62+
<ItemGroup>
63+
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
64+
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
65+
<ProjectReference Include="..\Umbraco.Cms.Integrations.Crm.Hubspot\Umbraco.Cms.Integrations.Crm.Hubspot.csproj" />
66+
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
67+
</ItemGroup>
68+
69+
<PropertyGroup>
70+
<!-- Razor files are needed for the backoffice to work correctly -->
71+
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
72+
</PropertyGroup>
73+
74+
<PropertyGroup>
75+
<!-- Remove RazorCompileOnBuild and RazorCompileOnPublish when not using ModelsMode InMemoryAuto -->
76+
<RazorCompileOnBuild>false</RazorCompileOnBuild>
77+
<RazorCompileOnPublish>false</RazorCompileOnPublish>
78+
</PropertyGroup>
79+
80+
</Project>

0 commit comments

Comments
 (0)