Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't delete resource folder while clean/rebuild #424

Merged
merged 3 commits into from
May 23, 2018
Merged

Don't delete resource folder while clean/rebuild #424

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f6474b
Conditionally delete resource folder
jayaranigarg May 21, 2018
917e0a3
Removing Cleaning up of empty resource folders
jayaranigarg May 23, 2018
4bc964d
Merge branch 'master' into cleanupbugfix
jayaranigarg May 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
<Target Name="CleanupMSTestV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableMSTestV2CopyResources) == 'true'" DependsOnTargets="GetMSTestV2CultureHierarchy">
<ItemGroup>
<ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
<FilesInResourceDirectories Include="%(ResourceDirectories.Identity)\**\*" />
</ItemGroup>
<!-- RemoveDir does not throw if the folder does not exist. Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
<RemoveDir Directories="@(ResourceDirectories)" ContinueOnError="true"/>
<!-- RemoveDir does not throw if the folder does not exist. Remove resource folder only when it is empty.
Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
<RemoveDir Directories="@(ResourceDirectories)" Condition="'@(FilesInResourceDirectories->Count())' == 0" ContinueOnError="true" />
</Target>
</Project>
6 changes: 4 additions & 2 deletions src/Adapter/Build/Universal/MSTest.TestAdapter.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@
<Target Name="CleanupMSTestV2ResourceFolders" AfterTargets="AfterClean" Condition="$(EnableMSTestV2CopyResources) == 'true'" DependsOnTargets="GetMSTestV2CultureHierarchy">
<ItemGroup>
<ResourceDirectories Include="$(TargetDir)%(CurrentUICultureHierarchy.Identity)" />
<FilesInResourceDirectories Include="%(ResourceDirectories.Identity)\**\*" />
</ItemGroup>
<!-- RemoveDir does not throw if the folder does not exist. Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
<RemoveDir Directories="@(ResourceDirectories)" ContinueOnError="true"/>
<!-- RemoveDir does not throw if the folder does not exist. Remove resource folder only when it is empty.
Continue on error - In any case do not fail build if this task fails(Warn and move on).-->
<RemoveDir Directories="@(ResourceDirectories)" Condition="'@(FilesInResourceDirectories->Count())' == 0" ContinueOnError="true" />
</Target>
</Project>