conflict fix

Directory.Build.props

@@ -5,8 +5,8 @@
     <Authors>$(Company)</Authors>
     <Copyright>Copyright © $(Company) $([System.DateTime]::Now.Year)</Copyright>
     <Trademark>$(Company)™</Trademark>
-    <VersionPrefix>0.1.0</VersionPrefix>
-    <VersionSuffix>preview</VersionSuffix>
+    <VersionPrefix>1.0.0</VersionPrefix>
+    <VersionSuffix>prerelease-1</VersionSuffix>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
 
     <PackageProjectUrl>https://github.com/Kentico/Xperience-by-Kentico-Zapier</PackageProjectUrl>

Directory.Packages.props

@@ -6,17 +6,17 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Kentico.Xperience.Admin" Version="28.3.2" />
-    <PackageVersion Include="Kentico.Xperience.WebApp" Version="28.3.2" />
-    <PackageVersion Include="kentico.xperience.azurestorage" Version="28.3.2" />
-    <PackageVersion Include="kentico.xperience.imageprocessing" Version="28.3.2" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.0.0" />
+    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.0.0" />
+    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.0.0" />
+    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.6.0.74858" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="NUnit" Version="4.0.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="3.10.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
-    <PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.0"/>
+    <PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.0" />
   </ItemGroup>
 </Project>

README.md

@@ -20,7 +20,7 @@ This version supports content workflows added in version 28.3.0. Please ensure t
 
 | Xperience Version | Library Version |
 | ----------------- | --------------- |
-| >= 28.3.*         | 1.0.0           |
+| >= 29.0.*         | 1.0.0           |
 
 ## Zapier cli application
 The Zapier cli app version 1.0.0 will initially be beta flagged, but this is the full version. The beta flag is just a zapier flag for new app integrations. This Flag will disappear after 90 days.

src/Kentico.Xperience.Zapier/Admin/ZapierModuleInstaller.cs

@@ -19,10 +19,10 @@ internal interface IZapierModuleInstaller
 
 internal class ZapierModuleInstaller : IZapierModuleInstaller
 {
-    private readonly IResourceInfoProvider resourceInfoProvider;
+    private readonly IInfoProvider<ResourceInfo> resourceInfoProvider;
 
 
-    public ZapierModuleInstaller(IResourceInfoProvider resourceInfoProvider) => this.resourceInfoProvider = resourceInfoProvider;
+    public ZapierModuleInstaller(IInfoProvider<ResourceInfo> resourceInfoProvider) => this.resourceInfoProvider = resourceInfoProvider;
 
 
     public void Install()

src/Kentico.Xperience.Zapier/Triggers/Extensions/DataClassExtensions.cs

@@ -0,0 +1,13 @@
+using CMS.DataEngine;
+
+namespace Kentico.Xperience.Zapier.Triggers.Extensions
+{
+    internal static class DataClassExtensions
+    {
+        internal static bool IsContentType(this DataClassInfo contentType) =>
+            (contentType?.ClassType?.Equals("Content", StringComparison.OrdinalIgnoreCase)).GetValueOrDefault();
+
+        internal static bool IsForm(this DataClassInfo contentType) =>
+            (contentType?.ClassType?.Equals("Form", StringComparison.OrdinalIgnoreCase)).GetValueOrDefault();
+    }
+}

src/Kentico.Xperience.Zapier/Triggers/ZapierTriggerService.cs

@@ -3,7 +3,6 @@
 
 using CMS.ContentEngine;
 using CMS.DataEngine;
-using CMS.DataEngine.Internal;
 using CMS.OnlineForms;
 using CMS.Websites;
 using CMS.Websites.Routing;