Skip to content

Commit 35a3c50

Browse files
ronaldbarendseronaldbarendse
committed
Fix incorrect item references and BeforeTargets
1 parent 846066c commit 35a3c50

File tree

2 files changed

+12
-25
lines changed

2 files changed

+12
-25
lines changed

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,23 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
32
<PropertyGroup>
4-
<ShopifyPropertyEditorFiles>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\**\*.*</ShopifyPropertyEditorFiles>
3+
<ShopifyPropertyEditorFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\**\*.*</ShopifyPropertyEditorFilesPath>
54
</PropertyGroup>
65

7-
<Target Condition=" '$(TargetFramework)' != 'net472' " Name="CopyShopifyPropertyEditorAssets" BeforeTargets="Build">
6+
<Target Name="CopyShopifyPropertyEditorAssets" BeforeTargets="BeforeBuild">
87
<ItemGroup>
9-
<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)" />
8+
<ShopifyPropertyEditorFiles Include="$(ShopifyPropertyEditorFilesPath)" />
109
<ShopifyPropertyEditorFiles Condition="'$(TargetFramework)' != 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\RenderV8\*.*" />
1110
<ShopifyPropertyEditorFiles Condition="'$(TargetFramework)' == 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\Render\*.*" />
1211
</ItemGroup>
13-
<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFiles) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
14-
<Copy
15-
SourceFiles="@(ShopifyPropertyEditorFiles)"
16-
DestinationFiles="@(ShopifyPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\%(RecursiveDir)%(Filename)%(Extension)')"
17-
SkipUnchangedFiles="true" />
18-
12+
<Message Text="Copying Shopify Property Editor files: $(ShopifyPropertyEditorFilesPath) - #@(ShopifyPropertyEditorFiles->Count()) files" Importance="high" />
13+
<Copy SourceFiles="@(ShopifyPropertyEditorFiles)" DestinationFiles="@(ShopifyPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
1914
</Target>
2015

2116
<Target Name="ClearShopifyPropertyEditorAssets" BeforeTargets="Clean">
2217
<ItemGroup>
2318
<ShopifyPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Commerce\Shopify\" />
2419
</ItemGroup>
25-
<Message Text="Clear Shopify Property Editor data" Importance="high" />
20+
<Message Text="Clear old Shopify Property Editor data" Importance="high" />
2621
<RemoveDir Directories="@(ShopifyPropertyEditorDir)" />
2722
</Target>
28-
2923
</Project>

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<DynamicsPropertyEditorFilesPath>
4-
$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\**\*.*
5-
</DynamicsPropertyEditorFilesPath>
3+
<DynamicsPropertyEditorFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\**\*.*</DynamicsPropertyEditorFilesPath>
64
</PropertyGroup>
75

8-
<Target Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="Build">
6+
<Target Name="CopyDynamicsPropertyEditorAssets" BeforeTargets="BeforeBuild">
97
<ItemGroup>
10-
<DynamicsPropertyEditorFiles Include="$(ShopifyPropertyEditorFiles)" />
8+
<DynamicsPropertyEditorFiles Include="$(DynamicsPropertyEditorFilesPath)" />
119
<DynamicsPropertyEditorFiles Condition="'$(TargetFramework)' != 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\RenderV8\*.*" />
1210
<DynamicsPropertyEditorFiles Condition="'$(TargetFramework)' == 'net472'" Remove="$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\Render\*.*" />
1311
</ItemGroup>
14-
<Message Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files"
15-
Importance="high" />
16-
<Copy SourceFiles="@(DynamicsPropertyEditorFiles)"
17-
DestinationFiles="@(DynamicsPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\%(RecursiveDir)%(Filename)%(Extension)')"
18-
SkipUnchangedFiles="true" />
12+
<Message Text="Copying Dynamics Property Editor files: $(DynamicsPropertyEditorFilesPath) - #@(DynamicsPropertyEditorFiles->Count()) files" Importance="high" />
13+
<Copy SourceFiles="@(DynamicsPropertyEditorFiles)" DestinationFiles="@(DynamicsPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\Crm\Dynamics\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
1914
</Target>
2015

2116
<Target Name="ClearDynamicsPropertyEditorAssets" BeforeTargets="Clean">
2217
<ItemGroup>
23-
<DynamicsPropertyEditorDir
24-
Include="$(MSBuildProjectDirectory)..\App_Plugins\UmbracoCms\Crm\Dynamics\" />
18+
<DynamicsPropertyEditorDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms\Crm\Dynamics\" />
2519
</ItemGroup>
2620
<Message Text="Clear old Dynamics Property Editor data" Importance="high" />
2721
<RemoveDir Directories="@(DynamicsPropertyEditorDir)" />
2822
</Target>
29-
3023
</Project>

0 commit comments

Comments
 (0)