Skip to content

Commit ddaa902

Browse files
RikkiGibsonRikkiGibson
authored
Merge pull request #39057 from dotnet/merges/release/dev16.4-preview2-to-master
Merge release/dev16.4-preview2 to master
2 parents ec42706 + 9973730 commit ddaa902

15 files changed

+18
-28
lines changed

‎eng/targets/Imports.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@
209209
<PropertyGroup Condition="'$(IsPackable)' == 'true' and '$(IsAnalyzer)' == 'true'">
210210
<DevelopmentDependency>true</DevelopmentDependency>
211211
<IncludeBuildOutput>false</IncludeBuildOutput>
212-
<!-- https://github.com/NuGet/Home/issues/8583 -->
213-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
214212
<IncludeContentInPack>false</IncludeContentInPack>
215213
</PropertyGroup>
216214

‎eng/targets/PackageProject.targets‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project>
33
<!--
4-
Include this targets file in project that build packages but no binaries.
4+
Include this targets file in projects that build meta-packages.
55
-->
66

77
<!--
8-
Projects in this directory do not produce useful binaries, they are only used to generate packages.
9-
Build target only needs to build their project dependencies (via ResolveProjectReferences).
8+
Projects that import this targets file do not produce binaries, they are only used to generate packages.
9+
The Build target only needs to build the project's dependencies (via ResolveProjectReferences).
1010
-->
1111
<Target Name="CoreBuild" DependsOnTargets="ResolveProjectReferences">
1212
<MakeDir Directories="$(IntermediateOutputPath)" ContinueOnError="True"/>
1313
</Target>
1414

1515
<PropertyGroup>
1616
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
17+
18+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
19+
<NoWarn>$(NoWarn);NU5128</NoWarn>
1720
</PropertyGroup>
1821
</Project>

‎src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
.NET Compiler Platform ("Roslyn") code style analyzers for C#.
1616
</PackageDescription>
1717
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
18+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
19+
<NoWarn>$(NoWarn);NU5128</NoWarn>
1820
</PropertyGroup>
1921

2022
<Target Name="_GetFilesToPackage">

‎src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
.NET Compiler Platform ("Roslyn") code style analyzers for Visual Basic.
1616
</PackageDescription>
1717
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetFilesToPackage</TargetsForTfmSpecificContentInPackage>
18+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
19+
<NoWarn>$(NoWarn);NU5128</NoWarn>
1820
</PropertyGroup>
1921

2022
<Target Name="_GetFilesToPackage">

‎src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<IsSourcePackage>true</IsSourcePackage>
1313
<PackageId>Microsoft.CodeAnalysis.Debugging</PackageId>
1414
<IncludeBuildOutput>false</IncludeBuildOutput>
15-
<!-- https://github.com/NuGet/Home/issues/8583 -->
16-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1715
<PackageDescription>
1816
Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") debug information encoders and decoders.
1917
</PackageDescription>
18+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
19+
<NoWarn>$(NoWarn);NU5128</NoWarn>
2020
</PropertyGroup>
2121
<ItemGroup>
2222
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />

‎src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<IsSourcePackage>true</IsSourcePackage>
1313
<PackageId>Microsoft.CodeAnalysis.PooledObjects</PackageId>
1414
<IncludeBuildOutput>false</IncludeBuildOutput>
15-
<!-- https://github.com/NuGet/Home/issues/8583 -->
16-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1715
<PackageDescription>
1816
Package containing sources of Microsoft .NET Compiler Platform ("Roslyn") pooled objects.
1917
</PackageDescription>
18+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
19+
<NoWarn>$(NoWarn);NU5128</NoWarn>
2020
</PropertyGroup>
2121
<ItemGroup>
2222
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />

‎src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<IsPackable>true</IsPackable>
88
<PackageId>Microsoft.CodeAnalysis.Compilers</PackageId>
99
<IncludeBuildOutput>false</IncludeBuildOutput>
10-
<!-- https://github.com/NuGet/Home/issues/8583 -->
11-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1210
<PackageDescription>
1311
Compiler layer of the .NET Compiler Platform ("Roslyn").
1412
Install this package to get both C# and Visual Basic support.

‎src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<IsPackable>true</IsPackable>
88
<PackageId>Microsoft.CodeAnalysis.EditorFeatures</PackageId>
99
<IncludeBuildOutput>false</IncludeBuildOutput>
10-
<!-- https://github.com/NuGet/Home/issues/8583 -->
11-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1210
<PackageDescription>
1311
.NET Compiler Platform ("Roslyn") support for editor features inside the Visual Studio editor.
1412
</PackageDescription>

‎src/NuGet/Microsoft.CodeAnalysis.Package.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<IsPackable>true</IsPackable>
88
<PackageId>Microsoft.CodeAnalysis</PackageId>
99
<IncludeBuildOutput>false</IncludeBuildOutput>
10-
<!-- https://github.com/NuGet/Home/issues/8583 -->
11-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1210
<PackageDescription>
1311
.NET Compiler Platform ("Roslyn").
1412

@@ -19,6 +17,8 @@
1917
- "Microsoft.CodeAnalysis.CSharp" (only the C# compiler)
2018
- "Microsoft.CodeAnalysis.VisualBasic (only the VB compiler)
2119
</PackageDescription>
20+
<!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
21+
<NoWarn>$(NoWarn);NU5128</NoWarn>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
<IsPackable>true</IsPackable>
88
<PackageId>Microsoft.CodeAnalysis.Scripting</PackageId>
99
<IncludeBuildOutput>false</IncludeBuildOutput>
10-
<!-- https://github.com/NuGet/Home/issues/8583 -->
11-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
1210
<PackageDescription>
1311
Microsoft .NET Compiler Platform ("Roslyn") CSharp and VB scripting package.
1412
</PackageDescription>

0 commit comments

Comments
 (0)