Use TargetFrameworkIdentifier to choose which incompatible views to remove

Author: ronaldbarendse

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

@@ -6,8 +6,15 @@
 	<Target Name="CopyShopifyPropertyEditorAssets" BeforeTargets="BeforeBuild">
 		<ItemGroup>
 			<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFilesPath)" />
-			<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\*.*" />
+			<!-- Remove incompatible views based on TFM -->
+			<Choose>
+				<When Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+					<ShopifyPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\Render\*.*" />
+				</When>
+				<Otherwise>
+					<ShopifyPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*" />
+				</Otherwise>
+			</Choose>
 		</ItemGroup>
 		<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFilesPath) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
 		<Copy SourceFiles="@(ShopifyPropertyEditorFiles)" DestinationFiles="@(ShopifyPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
@@ -18,6 +25,6 @@
 			<ShopifyPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\" />
 		</ItemGroup>
 		<Message Text="Clear old Shopify Property Editor data" Importance="high" />
-		<RemoveDir Directories="@(ShopifyPropertyEditorDir)"  />
+		<RemoveDir Directories="@(ShopifyPropertyEditorDir)" />
 	</Target>
 </Project>

src/Umbraco.Cms.Integrations.Crm.Dynamics/build/Umbraco.Cms.Integrations.Crm.Dynamics.targets

@@ -6,18 +6,25 @@
 	<Target Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="BeforeBuild">
 		<ItemGroup>
 			<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" />
-			<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\*.*" />
+			<!-- Remove incompatible views based on TFM -->
+			<Choose>
+				<When Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+					<DynamicsPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\Render\*.*" />
+				</When>
+				<Otherwise>
+					<DynamicsPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
+				</Otherwise>
+			</Choose>
 		</ItemGroup>
 		<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\" />
+			<DynamicsPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\" />
 		</ItemGroup>
-		<Message Text="Clear old Dynamics Property Editor data"  Importance="high" />
-		<RemoveDir Directories="@(DynamicsPropertyEditorDir)"  />
+		<Message Text="Clear old Dynamics Property Editor data" Importance="high" />
+		<RemoveDir Directories="@(DynamicsPropertyEditorDir)" />
 	</Target>
 </Project>