Merge branch 'main' into bugfix/hubspot-auth

# Conflicts:
#	src/Umbraco.Forms.Integrations.Crm.Hubspot/Umbraco.Forms.Integrations.Crm.Hubspot.csproj
#	src/Umbraco.Forms.Integrations.Crm.Hubspot/hubspot.png

Author: acoumb

src/Umbraco.Forms.Integrations.Automation.Zapier/Umbraco.Forms.Integrations.Automation.Zapier.csproj

@@ -11,10 +11,11 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main/src/Umbraco.Forms.Integrations.Automation.Zapier</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
-		<Version>1.0.4</Version>
+		<Version>1.0.5</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
+		<PackageIcon>zapier.png</PackageIcon>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
@@ -29,6 +30,13 @@
 		<PackageReference Include="Umbraco.Cms.Core" version="9.0.1" />
 		<PackageReference Include="Umbraco.Forms.Core.Providers" version="9.1.0" />
 	</ItemGroup>
+	
+	<ItemGroup>
+		<Content Include="zapier.png">
+			<Pack>true</Pack>
+			<PackagePath>\</PackagePath>
+		</Content>
+	</ItemGroup>
 
 	<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
 		<ItemGroup>

src/Umbraco.Forms.Integrations.Automation.Zapier/umbraco-marketplace.json

@@ -18,5 +18,6 @@
       "Description": "A custom workflow allowing form form entries to be mapped to a HubSpot contact record, and stored within the CRM platform."
     }
   ],
-  "Tags": []
+  "Tags": [],
+  "Title": "Zapier with Umbraco Forms"
 }

src/Umbraco.Forms.Integrations.Automation.Zapier/zapier.png

@@ -11,10 +11,11 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main/src/Umbraco.Forms.Integrations.Commerce.EMerchantPay</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
+		<PackageIcon>emerchantpay.png</PackageIcon>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
@@ -37,6 +38,13 @@
 		</Content>
 	</ItemGroup>
 
+	<ItemGroup>
+		<Content Include="emerchantpay.png">
+			<Pack>true</Pack>
+			<PackagePath>\</PackagePath>
+		</Content>
+	</ItemGroup>
+
 	<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
 		<ItemGroup>
 			<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />

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

@@ -18,5 +18,6 @@
       "Description": "A custom workflow allowing form form entries to be mapped to a HubSpot contact record, and stored within the CRM platform."
     }
   ],
-  "Tags": []
+  "Tags": [],
+  "Title": "emerchantpay with Umbraco Forms"
 }

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/emerchantpay.png

@@ -11,11 +11,11 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main/src/Umbraco.Forms.Integrations.Crm.Hubspot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
-		<Version>2.0.2</Version>
+		<Version>2.0.3</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
-		<PackageIconUrl>hubspot.png</PackageIconUrl>
+		<PackageIcon>hubspot.png</PackageIcon>
 	</PropertyGroup>
 
   <ItemGroup>
@@ -30,6 +30,13 @@
     </Content>
   </ItemGroup>
 
+	<ItemGroup>
+		<Content Include="hubspot.png">
+			<Pack>true</Pack>
+			<PackagePath>\</PackagePath>
+		</Content>
+	</ItemGroup>
+
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>Umbraco.Forms.Integrations.Crm.Hubspot.Tests</_Parameter1>

src/Umbraco.Forms.Integrations.Commerce.EMerchantPay/umbraco-marketplace.json

@@ -14,5 +14,6 @@
       "Description": "A dashboard interface that allows users to vizualize registered subscription hooks for their Umbraco Forms and to call Zapier triggers when a specific forms gets submitted."
     }
   ],
-  "Tags": []
+  "Tags": [],
+  "Title": "HubSpot with Umbraco Forms"
 }