Skip to content

Commit e0b4734

Browse files
authored
Update RoslynAnalyzer package projects with dependencies (#78068)
This will fix issues with transitive pinning during source builds ([see failed run](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1009024&view=logs&jobId=609589e2-4f74-5576-cdb7-914bcaea778b&j=609589e2-4f74-5576-cdb7-914bcaea778b&t=e0f51855-da7b-5abf-165d-8b4b9f3bcf66)). Resolves #78036
2 parents 7f414bc + 6cd841e commit e0b4734

File tree

5 files changed

+27
-7
lines changed

5 files changed

+27
-7
lines changed

src/RoslynAnalyzers/Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88

99
<!-- Set 'NoDefaultExcludes' to ensure that we can package .editorconfig files into our analyzer NuGet packages -->
1010
<NoDefaultExcludes>true</NoDefaultExcludes>
11-
12-
<!--
13-
Disabled TransitivePinning to workaround source-build issues in SDK insertions.
14-
A proper fix is being tracked by https://github.com/dotnet/roslyn/issues/78036
15-
-->
16-
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
1711
</PropertyGroup>
1812

1913
<!--

src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
1717
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" /> </ItemGroup>
18+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
19+
</ItemGroup>
1920
</Project>

src/RoslynAnalyzers/NuGet/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.Package.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@
2222
<VersionPrefix>$(AnalyzerUtilitiesVersionPrefix)</VersionPrefix>
2323

2424
<NoWarn>$(NoWarn);NU5128</NoWarn>
25+
<MicrosoftCodeAnalysisVersion Condition="'$(MicrosoftCodeAnalysisVersion)' == ''">$(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)</MicrosoftCodeAnalysisVersion>
2526
</PropertyGroup>
2627

28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
30+
</ItemGroup>
31+
2732
<ItemGroup>
2833
<AnalyzerNupkgLibrary Include="Microsoft.CodeAnalysis.AnalyzerUtilities.dll" />
2934
<AnalyzerNupkgLibrary Include="Microsoft.CodeAnalysis.AnalyzerUtilities.xml" />

src/RoslynAnalyzers/NuGet/Microsoft.CodeAnalysis.Analyzers/Microsoft.CodeAnalysis.Analyzers.Package.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,18 @@
1717
Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and Microsoft.CodeAnalysis.Analyzers.
1818
-->
1919
<PackageId>*$(MSBuildProjectFile)*</PackageId>
20+
<MicrosoftCodeAnalysisVersion Condition="'$(MicrosoftCodeAnalysisVersion)' == ''">$(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)</MicrosoftCodeAnalysisVersion>
2021
</PropertyGroup>
2122

23+
<ItemGroup>
24+
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
25+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
26+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
27+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
28+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
29+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
30+
</ItemGroup>
31+
2232
<ItemGroup>
2333
<AnalyzerNupkgAssembly Include="Microsoft.CodeAnalysis.Analyzers.dll" />
2434
<AnalyzerNupkgAssembly Include="Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />

src/RoslynAnalyzers/NuGet/Roslyn.Diagnostics.Analyzers/Roslyn.Diagnostics.Analyzers.Package.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,18 @@
1111
<ReleaseNotes>Roslyn.Diagnostics Analyzers</ReleaseNotes>
1212
<PackageTags>Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Diagnostic Analyzers Syntax Semantics</PackageTags>
1313
<IsShippingPackage>true</IsShippingPackage>
14+
<MicrosoftCodeAnalysisVersion Condition="'$(MicrosoftCodeAnalysisVersion)' == ''">$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)</MicrosoftCodeAnalysisVersion>
1415
</PropertyGroup>
1516

17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
19+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
20+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
21+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" VersionOverride="$(MicrosoftCodeAnalysisVersion)" />
24+
</ItemGroup>
25+
1626
<ItemGroup>
1727
<AnalyzerNupkgAssembly Include="Roslyn.Diagnostics.Analyzers.dll" />
1828
<AnalyzerNupkgAssembly Include="Roslyn.Diagnostics.CSharp.Analyzers.dll" />

0 commit comments

Comments
 (0)