PR updates

Author: acoumb

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

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

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

@@ -6,8 +6,9 @@
 
 	<Target Condition=" '$(TargetFramework)' != 'net472' " Name="CopyShopifyPropertyEditorAssets" BeforeTargets="Build">
 		<ItemGroup>
-			<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)"
-										Exclude="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*"/>
+			<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)" />
+			<ShopifyPropertyEditorFiles Condition="'$(TargetFramework)' != 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*" />
+			<ShopifyPropertyEditorFiles Condition="'$(TargetFramework)' == 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\Render\*.*" />
 		</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 + "/RenderV8/DynamicsFormV8.cshtml";
+            public const string DefaultV8ViewPath = AppPluginFolderPath + "/RenderV8/DynamicsForm.cshtml";
         }
 
         public static class EmbedAttribute

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

@@ -5,10 +5,11 @@
 		</DynamicsPropertyEditorFilesPath>
 	</PropertyGroup>
 
-	<Target Condition=" '$(TargetFramework)' != 'net472' " Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="Build">
+	<Target Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="Build">
 		<ItemGroup>
-			<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" 
-										 Exclude="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
+			<DynamicsPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)" />
+			<DynamicsPropertyEditorFiles Condition="'$(TargetFramework)' != 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
+			<DynamicsPropertyEditorFiles Condition="'$(TargetFramework)' == 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\Render\*.*" />
 		</ItemGroup>
 		<Message Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files"
 			Importance="high" />