Update Shopify and Dynamics to exclude V8 rendering view.

Author: acoumb

src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/Render/Products.cshtml renamed to src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/RenderV8/Products.cshtml

@@ -15,7 +15,7 @@ public static class Constants
 
         public static class RenderingComponent
         {
-            public const string DefaultV8ViewPath = AppPluginFolderPath + "/Render/Products.cshtml";
+            public const string DefaultV8ViewPath = AppPluginFolderPath + "/RenderV8/Products.cshtml";
 
             public const string DefaultV9ViewPath = AppPluginFolderPath + "/Render/ProductsV9.cshtml";
         }

src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs

@@ -10,7 +10,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Commerce.Shopify</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>1.3.0</Version>
+		<Version>1.3.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>

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

@@ -4,9 +4,10 @@
 		<ShopifyPropertyEditorFiles>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\**\*.*</ShopifyPropertyEditorFiles>
 	</PropertyGroup>
 
-	<Target Name="CopyShopifyPropertyEditorAssets" BeforeTargets="Build">
+	<Target Condition=" '$(TargetFramework)' != 'net472' " Name="CopyShopifyPropertyEditorAssets" BeforeTargets="Build">
 		<ItemGroup>
-			<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)" />
+			<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)"
+										Exclude="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*"/>
 		</ItemGroup>
 		<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFiles) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
 		<Copy

src/Umbraco.Cms.Integrations.Commerce.Shopify/build/Umbraco.Cms.Integrations.Commerce.Shopify.targets

@@ -19,7 +19,7 @@ public static class RenderingComponent
         {
             public const string DefaultViewPath = AppPluginFolderPath + "/Render/DynamicsForm.cshtml";
 
-            public const string DefaultV8ViewPath = AppPluginFolderPath + "/Render/DynamicsFormV8.cshtml";
+            public const string DefaultV8ViewPath = AppPluginFolderPath + "/RenderV8/DynamicsFormV8.cshtml";
         }
 
         public static class EmbedAttribute

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/Render/DynamicsFormV8.cshtml renamed to src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/RenderV8/DynamicsFormV8.cshtml

@@ -10,7 +10,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Crm.Dynamics</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>1.3.6</Version>
+		<Version>1.3.7</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>

src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs

@@ -4,23 +4,23 @@
 			$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\**\*.*
 		</DynamicsPropertyEditorFilesPath>
 	</PropertyGroup>
-	<Target Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="Build">
+
+	<Target Condition=" '$(TargetFramework)' != 'net472' " Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="Build">
 		<ItemGroup>
-			<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" />
+			<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" 
+										 Exclude="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
 		</ItemGroup>
-		<Message
-			Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files"
+		<Message Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files"
 			Importance="high" />
 		<Copy SourceFiles="@(DynamicsPropertyEditorFiles)"
 		      DestinationFiles="@(DynamicsPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\%(RecursiveDir)%(Filename)%(Extension)')"
 		      SkipUnchangedFiles="true" />
-
 	</Target>
 
 	<Target Name="ClearDynamicsPropertyEditorAssets" BeforeTargets="Clean">
 		<ItemGroup>
 			<DynamicsPropertyEditorDir
-				Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms\Crm\Dynamics\" />
+				Include="$(MSBuildProjectDirectory)..\App_Plugins\UmbracoCms\Crm\Dynamics\" />
 		</ItemGroup>
 		<Message Text="Clear old Dynamics Property Editor data"  Importance="high" />
 		<RemoveDir Directories="@(DynamicsPropertyEditorDir)"  />