@@ -418,6 +418,7 @@ private static void AddTasksToCopyAllDependenciesIntoBinDir(
418418 string copyLocalFilesItemName = referenceItemName + "_CopyLocalFiles" ;
419419 string resolvedDependenciesFilesItemName = referenceItemName + "_ResolvedDependencyFiles" ;
420420 string allDependentFilesItemName = referenceItemName + "_AllDependentFiles" ;
421+ string dependsOnNetstandardParameterName = referenceItemName + "_DependsOnNETStandard" ;
421422 string targetFrameworkDirectoriesName = GenerateSafePropertyName ( project , "_TargetFrameworkDirectories" ) ;
422423 string fullFrameworkRefAssyPathName = GenerateSafePropertyName ( project , "_FullFrameworkReferenceAssemblyPaths" ) ;
423424 string destinationFolder = String . Format ( CultureInfo . InvariantCulture , @"$({0})\Bin\" , GenerateSafePropertyName ( project , "AspNetPhysicalPath" ) ) ;
@@ -455,15 +456,16 @@ private static void AddTasksToCopyAllDependenciesIntoBinDir(
455456 rarTask . SetParameter ( "TargetFrameworkMoniker" , project . TargetFrameworkMoniker ) ;
456457 rarTask . AddOutputItem ( "CopyLocalFiles" , copyLocalFilesItemName , null ) ;
457458 rarTask . AddOutputItem ( "ResolvedDependencyFiles" , resolvedDependenciesFilesItemName , null ) ;
459+ rarTask . AddOutputItem ( "DependsOnNETStandard" , dependsOnNetstandardParameterName , null ) ;
458460
459461 // Merge copy-local files and resolved dependency files (reported by RAR) together
460462 ProjectTaskInstance mergeCopyLocalToAllDependenciesTask = target . AddTask ( "CreateItem" , null , null ) ;
461463 mergeCopyLocalToAllDependenciesTask . SetParameter ( "Include" , "@(" + copyLocalFilesItemName + ")" ) ;
462464 mergeCopyLocalToAllDependenciesTask . AddOutputItem ( "Include" , allDependentFilesItemName , null ) ;
463465
464- ProjectTaskInstance mergeResolvedDependencyFileslToAllDependenciesTask = target . AddTask ( "CreateItem" , null , null ) ;
465- mergeResolvedDependencyFileslToAllDependenciesTask . SetParameter ( "Include" , "@(" + resolvedDependenciesFilesItemName + ")" ) ;
466- mergeResolvedDependencyFileslToAllDependenciesTask . AddOutputItem ( "Include" , allDependentFilesItemName , null ) ;
466+ ProjectTaskInstance mergeResolvedDependencyFilesToAllDependenciesTask = target . AddTask ( "CreateItem" , "'$(" + dependsOnNetstandardParameterName + ")' == 'True'" , null ) ;
467+ mergeResolvedDependencyFilesToAllDependenciesTask . SetParameter ( "Include" , "@(" + resolvedDependenciesFilesItemName + ")" ) ;
468+ mergeResolvedDependencyFilesToAllDependenciesTask . AddOutputItem ( "Include" , allDependentFilesItemName , null ) ;
467469
468470 // Copy dependencies to the web project's "bin"
469471 // directory.
0 commit comments