Code review changes

src/Tasks.UnitTests/Copy_Tests.cs

@@ -1929,12 +1929,11 @@ public void TooFewRetriesThrows()
             engine.AssertLogContains("MSB3027");
         }
 
-        [Fact(Skip = "Only run if either UseHardlinksIfPossible or UseSymboliclinksIfPossible is true")]
-        [PlatformSpecific(TestPlatforms.Windows)]
-        public virtual void ErrorIfLinkFailedCheck()
+        internal virtual void ErrorIfLinkFailedCheck()
         {
-            string source = FileUtilities.GetTemporaryFile();
-            string destination = FileUtilities.GetTemporaryFile();
+            var workDirectory = FileUtilities.GetTemporaryDirectory();
+            var source = Path.Combine(workDirectory, "source.txt");
+            var existing = Path.Combine(workDirectory, "existing.txt");
 
             try
             {
@@ -1943,12 +1942,12 @@ public virtual void ErrorIfLinkFailedCheck()
                     sw.Write("This is a source file.");
                 }
 
-                using (StreamWriter sw = FileUtilities.OpenWrite(destination, true))
+                using (StreamWriter sw = FileUtilities.OpenWrite(existing, true))
                 {
-                    sw.Write("This is a destination file.");
+                    sw.Write("This is an existing file.");
                 }
 
-                File.SetAttributes(destination, FileAttributes.ReadOnly);
+                File.SetAttributes(existing, FileAttributes.ReadOnly);
 
                 MockEngine engine = new MockEngine(true);
                 Copy t = new Copy
@@ -1959,18 +1958,18 @@ public virtual void ErrorIfLinkFailedCheck()
                     ErrorIfLinkFails = true,
                     BuildEngine = engine,
                     SourceFiles = new ITaskItem[] { new TaskItem(source) },
-                    DestinationFiles = new ITaskItem[] { new TaskItem(destination) },
+                    DestinationFiles = new ITaskItem[] { new TaskItem(existing) },
                 };
 
                 Assert.False(t.Execute());
                 engine.AssertLogContains("MSB3893");
             }
             finally
             {
-                File.SetAttributes(destination, FileAttributes.Normal);
-
+                File.SetAttributes(existing, FileAttributes.Normal);
                 File.Delete(source);
-                File.Delete(destination);
+                File.Delete(existing);
+                Directory.Delete(workDirectory);
             }
         }
 
@@ -2391,7 +2390,7 @@ public void CopyToDestinationFolderWithHardLinkFallbackTooManyLinks()
         }
 
         [Fact]
-        public override void ErrorIfLinkFailedCheck()
+        internal override void ErrorIfLinkFailedCheck()
         {
             base.ErrorIfLinkFailedCheck();
         }
@@ -2486,7 +2485,7 @@ public void CopyToDestinationFolderWithSymbolicLinkCheck()
         }
 
         [Fact]
-        public override void ErrorIfLinkFailedCheck()
+        internal override void ErrorIfLinkFailedCheck()
         {
             base.ErrorIfLinkFailedCheck();
         }

src/Tasks/Microsoft.Common.CurrentVersion.targets

@@ -4194,6 +4194,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       <!-- By default we're not using Hard Links to copy to the output directory, and never when building in VS -->
       <CreateHardLinksForCopyFilesToOutputDirectoryIfPossible Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)' == ''">false</CreateHardLinksForCopyFilesToOutputDirectoryIfPossible>
       <CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)' == ''">false</CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible>
+      <ErrorIfLinkFailsForCopyFilesToOutputDirectory Condition="'$(BuildingInsideVisualStudio)' == 'true' or '$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)' == ''">false</ErrorIfLinkFailsForCopyFilesToOutputDirectory>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -4212,6 +4213,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
         UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
         UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+        ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)"
         Condition="'$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)' != 'true'"
             >
 
@@ -4261,6 +4263,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
         UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
         UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+        ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)"
         Condition="'$(_SGenDllCreated)'=='true'">
 
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
@@ -4277,6 +4280,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
         UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
         UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+        ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)"
         Condition="'$(_DebugSymbolsProduced)'=='true' and '$(SkipCopyingSymbolsToOutputDirectory)' != 'true' and '$(CopyOutputSymbolsToOutputDirectory)'=='true'">
 
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
@@ -4293,6 +4297,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
         UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
         UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+        ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)"
         Condition="'$(_DocumentationFileProduced)'=='true' and '$(CopyDocumentationFileToOutputDirectory)'=='true'">
 
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
@@ -4309,6 +4314,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
         UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
         UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+        ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)"
         Condition="'@(IntermediateSatelliteAssembliesWithTargetPath)' != ''"
             >
 
@@ -4346,6 +4352,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
         UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
         UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)"
+        ErrorIfLinkFails="$(ErrorIfLinkFailsForCopyFilesToOutputDirectory)"
         Condition="'$(SkipCopyWinMDArtifact)' != 'true' and '@(WinMDExpArtifacts)' != ''"
             >
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>

src/Tasks/Resources/Strings.resx

@@ -2683,12 +2683,12 @@
     <value>MSB3891: Both "{0}" and "{1}" were specified in the project file. Please choose one or the other.</value>
   </data>
   <data name="Copy.ErrorIfLinkFailsSetWithoutLinkOption" xml:space="preserve">
-    <value>MSB3892: ErrorIfLinkedFails requires UseHardlinksIfPossible or UseSymbolicLinksIfPossible to be set.</value>
-    <comment>{StrBegin="MSB3892: "}</comment>
+    <value>MSB3892: ErrorIfLinkFails requires UseHardlinksIfPossible or UseSymbolicLinksIfPossible to be set.</value>
+    <comment>{StrBegin="MSB3892: "} LOCALIZATION: Do not localize "ErrorIfLinkFails", "UseHardLinksIfPossible", or "UseSymbolicLinksIfPossible".</comment>
   </data>
   <data name="Copy.LinkFailed" xml:space="preserve">
     <value>MSB3893: Could not use a link to copy "{0}" to "{1}".</value>
-    <comment>{StrBegin="MSB3893: "}</comment>
+    <comment>{StrBegin="MSB3893: "} LOCALIZATION: {0} and {1} are paths.</comment>
   </data>
 
   <!--