From 401ed1009c59681f1e0bc50db2197ce90b97ba48 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Wed, 2 Oct 2019 17:06:00 -0700
Subject: [PATCH 1/2] NoWarn NU5128 instead of suppressing dependencies

---
 eng/targets/Imports.targets                              | 2 --
 eng/targets/PackageProject.targets                       | 9 ++++++---
 .../Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj | 2 ++
 ...osoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj | 2 ++
 .../Microsoft.CodeAnalysis.Debugging.Package.csproj      | 2 --
 .../Microsoft.CodeAnalysis.PooledObjects.Package.csproj  | 2 --
 .../Microsoft.CodeAnalysis.Compilers.Package.csproj      | 2 --
 .../Microsoft.CodeAnalysis.EditorFeatures.Package.csproj | 2 --
 src/NuGet/Microsoft.CodeAnalysis.Package.csproj          | 2 --
 .../Microsoft.CodeAnalysis.Scripting.Package.csproj      | 2 --
 .../Microsoft.NETCore.Compilers.Package.csproj           | 2 --
 .../Microsoft.Net.Compilers.Toolset.Package.csproj       | 5 ++---
 .../Microsoft.Net.Compilers.Package.csproj               | 2 --
 .../VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj   | 2 --
 src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj    | 2 --
 15 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets
index 6c5302e395e8e..fc72c1bfff441 100644
--- a/eng/targets/Imports.targets
+++ b/eng/targets/Imports.targets
@@ -209,8 +209,6 @@
   <PropertyGroup Condition="'$(IsPackable)' == 'true' and '$(IsAnalyzer)' == 'true'">
     <DevelopmentDependency>true</DevelopmentDependency>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <IncludeContentInPack>false</IncludeContentInPack>
   </PropertyGroup>
   
diff --git a/eng/targets/PackageProject.targets b/eng/targets/PackageProject.targets
index a53794fd9d07d..7fc58fdc4e6b7 100644
--- a/eng/targets/PackageProject.targets
+++ b/eng/targets/PackageProject.targets
@@ -1,12 +1,12 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project>
   <!-- 
-    Include this targets file in project that build packages but no binaries.
+    Include this targets file in projects that build meta-packages.
   -->
   
   <!-- 
-    Projects in this directory do not produce useful binaries, they are only used to generate packages. 
-    Build target only needs to build their project dependencies (via ResolveProjectReferences).
+    Projects that import this targets file do not produce binaries, they are only used to generate packages. 
+    The Build target only needs to build the project's dependencies (via ResolveProjectReferences).
   -->
   <Target Name="CoreBuild" DependsOnTargets="ResolveProjectReferences">
     <MakeDir Directories="$(IntermediateOutputPath)" ContinueOnError="True"/>
@@ -14,5 +14,8 @@
 
   <PropertyGroup>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj
index cd5c3c702cbbe..030654a8d5c0b 100644
--- a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj
+++ b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj
@@ -15,6 +15,8 @@
       .NET Compiler Platform ("Roslyn") code style analyzers for C#.
     </PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 
   <Target Name="_GetFilesToPackage">
diff --git a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj
index f83968a0c112f..364e3a11ee03e 100644
--- a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj
+++ b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj
@@ -15,6 +15,8 @@
       .NET Compiler Platform ("Roslyn") code style analyzers for Visual Basic.
     </PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 
   <Target Name="_GetFilesToPackage">
diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj
index e768d1cfd7c3e..eb4cbfc4af6ca 100644
--- a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj
+++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj
@@ -12,8 +12,6 @@
     <IsSourcePackage>true</IsSourcePackage>
     <PackageId>Microsoft.CodeAnalysis.Debugging</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>
       Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") debug information encoders and decoders.
     </PackageDescription>
diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj
index f5e4e99c554a2..69b508af36102 100644
--- a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj
+++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj
@@ -12,8 +12,6 @@
     <IsSourcePackage>true</IsSourcePackage>
     <PackageId>Microsoft.CodeAnalysis.PooledObjects</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>
       Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") pooled objects.
     </PackageDescription>
diff --git a/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj
index 5d835bce4fc9c..a993726c81427 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj
+++ b/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj
@@ -7,8 +7,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.CodeAnalysis.Compilers</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>
       Compiler layer of the .NET Compiler Platform ("Roslyn").
       Install this package to get both C# and Visual Basic support.
diff --git a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj
index 8a8b4192ac6e1..ebc038c3cd505 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj
+++ b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj
@@ -7,8 +7,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.CodeAnalysis.EditorFeatures</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>
       .NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor.
     </PackageDescription>
diff --git a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj
index edacb937ca130..dbd98cc58ea67 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj
+++ b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj
@@ -7,8 +7,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.CodeAnalysis</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>
       .NET Compiler Platform ("Roslyn").
 
diff --git a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj
index 9d7afb02b50e5..c865a9e07146c 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj
+++ b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj
@@ -7,8 +7,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>Microsoft.CodeAnalysis.Scripting</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>
       Microsoft .NET Compiler Platform ("Roslyn") CSharp and VB scripting package.
     </PackageDescription>
diff --git a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
index dbd58b9dea433..38733725c725c 100644
--- a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
+++ b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
@@ -6,8 +6,6 @@
     <IsPackable>true</IsPackable>
     <NuspecPackageId>Microsoft.NETCore.Compilers</NuspecPackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <DevelopmentDependency>true</DevelopmentDependency>
     <PackageDescription>
       CoreCLR-compatible versions of the C# and VB compilers for use in MSBuild.
diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
index 31bc92dfcdcaf..6ce7baa6c211c 100644
--- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj
@@ -6,8 +6,6 @@
     <IsPackable>true</IsPackable>
     <NuspecPackageId>Microsoft.Net.Compilers.Toolset</NuspecPackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <DevelopmentDependency>true</DevelopmentDependency>
     <PackageDescription>
       .NET Compilers Toolset Package.
@@ -17,7 +15,8 @@
       $(RoslynPackageDescriptionDetails)
     </PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
-    <NoWarn>$(NoWarn);NU5100</NoWarn>
+    <!-- Remove NU5128 once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5100;NU5128</NoWarn>
 
     <_DependsOn Condition="'$(TargetFramework)' == 'net472'">InitializeDesktopCompilerArtifacts</_DependsOn>
     <_DependsOn Condition="'$(TargetFramework)' == 'netcoreapp2.1'">InitializeCoreClrCompilerArtifacts</_DependsOn>
diff --git a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj
index 4d26a3cef999f..d7c37dc281d84 100644
--- a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj
+++ b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj
@@ -6,8 +6,6 @@
     <IsPackable>true</IsPackable>
     <NuspecPackageId>Microsoft.Net.Compilers</NuspecPackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <DevelopmentDependency>true</DevelopmentDependency>
     <PackageDescription>
       .NET Compilers package.
diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
index 63df6972c5c31..b64f841a9bdff 100644
--- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj
@@ -10,8 +10,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>VS.ExternalAPIs.Roslyn</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>CoreXT package for the VS build</PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
 
diff --git a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
index 3301b78989b39..94553b3983b3e 100644
--- a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
+++ b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
@@ -10,8 +10,6 @@
     <IsPackable>true</IsPackable>
     <PackageId>VS.Tools.Roslyn</PackageId>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <!-- https://github.com/NuGet/Home/issues/8583 -->
-    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <PackageDescription>CoreXT package for Roslyn compiler toolset.</PackageDescription>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
 

From 1873ee7fb37b7e67b4c23d71a0c034607f4b98f9 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Thu, 3 Oct 2019 11:25:52 -0700
Subject: [PATCH 2/2] Update additional projects with NoWarn NU5128

---
 .../Microsoft.CodeAnalysis.Debugging.Package.csproj             | 2 ++
 .../Microsoft.CodeAnalysis.PooledObjects.Package.csproj         | 2 ++
 src/NuGet/Microsoft.CodeAnalysis.Package.csproj                 | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj
index eb4cbfc4af6ca..8a99faa1996ca 100644
--- a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj
+++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj
@@ -15,6 +15,8 @@
     <PackageDescription>
       Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") debug information encoders and decoders.
     </PackageDescription>
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj
index 69b508af36102..40692205a1b75 100644
--- a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj
+++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj
@@ -15,6 +15,8 @@
     <PackageDescription>
       Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") pooled objects.
     </PackageDescription>
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
diff --git a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj
index dbd98cc58ea67..4be7ad39de318 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj
+++ b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj
@@ -17,6 +17,8 @@
       - "Microsoft.CodeAnalysis.CSharp" (only the C# compiler)
       - "Microsoft.CodeAnalysis.VisualBasic (only the VB compiler)
     </PackageDescription>
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>