Skip to content

Commit 8d30472

Browse files
Change Choose to multiple conditions
1 parent 9db91e3 commit 8d30472

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<ItemGroup>
88
<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFilesPath)" />
99
<!-- Remove incompatible views based on TFM -->
10-
<Choose>
11-
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
12-
<ShopifyPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\Render\*.*" />
13-
</When>
14-
<Otherwise>
15-
<ShopifyPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*" />
16-
</Otherwise>
17-
</Choose>
10+
<ShopifyPropertyEditorFiles Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\Render\*.*" />
11+
<ShopifyPropertyEditorFiles Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*" />
1812
</ItemGroup>
1913
<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFilesPath) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
2014
<Copy SourceFiles="@(ShopifyPropertyEditorFiles)" DestinationFiles="@(ShopifyPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@
77
<ItemGroup>
88
<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" />
99
<!-- Remove incompatible views based on TFM -->
10-
<Choose>
11-
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
12-
<DynamicsPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\Render\*.*" />
13-
</When>
14-
<Otherwise>
15-
<DynamicsPropertyEditorFiles Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
16-
</Otherwise>
17-
</Choose>
10+
<DynamicsPropertyEditorFiles Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\Render\*.*" />
11+
<DynamicsPropertyEditorFiles Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
1812
</ItemGroup>
1913
<Message Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files" Importance="high" />
2014
<Copy SourceFiles="@(DynamicsPropertyEditorFiles)" DestinationFiles="@(DynamicsPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />

0 commit comments

Comments
 (0)