Skip to content

Skip Updating CopyComplete Marker When Not Necessary #6698

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

Merged
merged 4 commits into from
Jul 27, 2021
Merged

Skip Updating CopyComplete Marker When Not Necessary #6698

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e6fa76
Add output parameter to Copy task and condition Touch task based off …
benvillalobos Jul 21, 2021
c8a6336
CopiedAtLeastOneFile is set on links
benvillalobos Jul 22, 2021
4e5343a
Update src/Tasks/Copy.cs
benvillalobos Jul 22, 2021
f1e3b47
Rename CopiedAtLeastOneFile to WroteAtLeastOneFile
benvillalobos Jul 26, 2021
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
2 changes: 2 additions & 0 deletions ref/Microsoft.Build.Tasks.Core/net/Microsoft.Build.Tasks.Core.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ public partial class Copy : Microsoft.Build.Tasks.TaskExtension, Microsoft.Build
{
public Copy() { }
[Microsoft.Build.Framework.OutputAttribute]
public bool CopiedAtLeastOneFile { get { throw null; } }
[Microsoft.Build.Framework.OutputAttribute]
public Microsoft.Build.Framework.ITaskItem[] CopiedFiles { get { throw null; } }
[Microsoft.Build.Framework.OutputAttribute]
public Microsoft.Build.Framework.ITaskItem[] DestinationFiles { get { throw null; } set { } }
Expand Down
2 changes: 2 additions & 0 deletions ref/Microsoft.Build.Tasks.Core/netstandard/Microsoft.Build.Tasks.Core.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ public partial class Copy : Microsoft.Build.Tasks.TaskExtension, Microsoft.Build
{
public Copy() { }
[Microsoft.Build.Framework.OutputAttribute]
public bool CopiedAtLeastOneFile { get { throw null; } }
[Microsoft.Build.Framework.OutputAttribute]
public Microsoft.Build.Framework.ITaskItem[] CopiedFiles { get { throw null; } }
[Microsoft.Build.Framework.OutputAttribute]
public Microsoft.Build.Framework.ITaskItem[] DestinationFiles { get { throw null; } set { } }
Expand Down
6 changes: 6 additions & 0 deletions src/Tasks/Copy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ public Copy()
[Output]
public ITaskItem[] CopiedFiles { get; private set; }

[Output]
public bool CopiedAtLeastOneFile { get; private set; }

/// <summary>
/// Whether to overwrite files in the destination
/// that have the read-only attribute set.
Expand Down Expand Up @@ -299,6 +302,9 @@ FileState destinationFileState // The destination file
File.Copy(sourceFileState.Name, destinationFileState.Name, true);
}

// Files were successfully copied or linked. Those are equivalent here.
CopiedAtLeastOneFile = true;
Copy link
Member

@ladipro ladipro Jul 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-nit: This line is not indented properly.


destinationFileState.Reset();

// If the destinationFile file exists, then make sure it's read-write.
Expand Down
3 changes: 2 additions & 1 deletion src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4696,6 +4696,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.

<Output TaskParameter="DestinationFiles" ItemName="FileWritesShareable"/>
<Output TaskParameter="CopiedFiles" ItemName="ReferencesCopiedInThisBuild"/>
<Output TaskParameter="CopiedAtLeastOneFile" PropertyName="CopiedAtLeastOneFile"/>

</Copy>

Expand All @@ -4705,7 +4706,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
input to projects that reference this one. -->
<Touch Files="@(CopyUpToDateMarker)"
AlwaysCreate="true"
Condition="'@(ReferencesCopiedInThisBuild)' != ''">
Condition="'@(ReferencesCopiedInThisBuild)' != '' and '$(CopiedAtLeastOneFile)' == 'true'">
<Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
</Touch>

Expand Down