Remove error message when RestoreOutputPath doesn't match MSBuildProj…

…ectExtensionsPath
NuGet · Feb 28, 2018 · cb7ce66 · cb7ce66
1 parent 8607549
commit cb7ce66
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 64 deletions.
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/ErrorForMismatchRestoreOutputPathTask.cs b/src/NuGet.Core/NuGet.Build.Tasks/ErrorForMismatchRestoreOutputPathTask.cs
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
@@ -93,7 +93,6 @@ Copyright (c) .NET Foundation. All rights reserved.
   <UsingTask TaskName="NuGet.Build.Tasks.GetRestoreSettingsTask" AssemblyFile="$(RestoreTaskAssemblyFile)" />
   <UsingTask TaskName="NuGet.Build.Tasks.WarnForInvalidProjectsTask" AssemblyFile="$(RestoreTaskAssemblyFile)" />
   <UsingTask TaskName="NuGet.Build.Tasks.GetReferenceNearestTargetFrameworkTask" AssemblyFile="$(RestoreTaskAssemblyFile)" />
-  <UsingTask TaskName="NuGet.Build.Tasks.ErrorForMismatchRestoreOutputPathTask" AssemblyFile="$(RestoreTaskAssemblyFile)" />
 
   <!--
     ============================================================
@@ -578,12 +577,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="AbsolutePaths" PropertyName="RestoreOutputAbsolutePath" />
     </ConvertToAbsolutePath>
 
-    <ErrorForMismatchRestoreOutputPathTask
-      RestoreOutputAbsolutePath="$(RestoreOutputAbsolutePath)"
-      MSBuildProjectExtensionsPath="$(MSBuildProjectExtensionsPath)"
-      Condition=" '$(PackageReferenceCompatibleProjectStyle)' == 'true' OR '$(RestoreProjectStyle)' == 'ProjectJson'"
-      />
-
     <!--
       Determine project name for the assets file.
       Highest priority: PackageId

diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs
@@ -396,15 +396,6 @@ public static bool LogErrorForClearIfInvalid(IEnumerable<string> values, string
             return false;
         }
 
-        //  Log error NU1003
-        public static RestoreLogMessage GetErrorForRestoreOutputPathMismatch(string restoreOutputAbsolutePath, string msbuildProjectExtensionsPath)
-        {
-            var text = string.Format(CultureInfo.CurrentCulture, Strings.Error_RestoreOutputPathMismatch, restoreOutputAbsolutePath, msbuildProjectExtensionsPath);
-            var message = RestoreLogMessage.CreateError(NuGetLogCode.NU1503, text);
-
-            return message;
-        }
-
         /// <summary>
         /// Log warning NU1503
         /// </summary>

diff --git a/src/NuGet.Core/NuGet.Commands/Strings.Designer.cs b/src/NuGet.Core/NuGet.Commands/Strings.Designer.cs
diff --git a/src/NuGet.Core/NuGet.Commands/Strings.resx b/src/NuGet.Core/NuGet.Commands/Strings.resx
@@ -691,7 +691,4 @@ For more information, visit http://docs.nuget.org/docs/reference/command-line-re
   <data name="Error_InvalidDependencyVersionConstraints" xml:space="preserve">
     <value>Package version constraints for '{0}' return a version range that is empty.</value>
   </data>
-  <data name="Error_RestoreOutputPathMismatch" xml:space="preserve">
-    <value>The RestoreOutputPath, which resolved to '{0}', did not match the MSBuildProjectExtensionsPath, which was '{1}'.  These properties must match in order for assets from NuGet restore to be applied correctly when building.</value>
-  </data>
 </root>
diff --git a/src/NuGet.Core/NuGet.Common/Errors/NuGetLogCode.cs b/src/NuGet.Core/NuGet.Common/Errors/NuGetLogCode.cs
@@ -59,11 +59,6 @@ public enum NuGetLogCode
         /// </summary>
         NU1003 = 1003,
 
-        /// <summary>
-        /// RestoreOutputPath does not match MSBuildProjectExtensionsPath
-        /// </summary>
-        NU1004 = 1004,
-
         /// <summary>
         /// Unable to resolve package, generic message for unknown type constraints.
         /// </summary>