Skip to content

Address warnings from Microsoft.CodeAnalysis upgrade #91034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbomer merged 3 commits into from
Aug 28, 2023
Merged

Address warnings from Microsoft.CodeAnalysis upgrade #91034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2d17b9
Address warnings from Microsoft.CodeAnalysis upgrade
sbomer Aug 23, 2023
08cc5fa
Merge remote-tracking branch 'origin/main' into illinkAnalyzerWarnings
sbomer Aug 24, 2023
df0cb18
Remove version override, address feedback
sbomer Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/tools/illink/src/ILLink.RoslynAnalyzer/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,4 @@
</PropertyGroup>

<Import Project="..\Directory.Build.props" />

<!--
These packages affect the design-time experience in VS, we update them
at the same cadance as the MicrosoftCodeAnalysisVersion_LatestVS version.
This property is set eng/Versions.props but we override it because the current
version 4.7.0 flags several warnings that need area-owner expertise to resolve.
TODO: https://github.com/dotnet/runtime/issues/91030.
-->
<PropertyGroup>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.5.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
</PropertyGroup>
</Project>
4 changes: 4 additions & 0 deletions src/tools/illink/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<AnalyzerLanguage>cs</AnalyzerLanguage>
</PropertyGroup>

<ItemGroup>
<Compile Include="$(CoreLibSharedDir)System/Index.cs" />
</ItemGroup>

<ItemGroup>
<!-- The repo CodeAnalyis version is ahead of what is shipped with Visual Studio, so that version breaks the analyzers when used in .Net Framework builds -->
<!-- Once Visual Studio ships with a version >= $(MicrosoftCodeAnalysisVersion), this should be changed to use the property -->
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/src/ILLink.RoslynAnalyzer/RequiresAssemblyFilesAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ protected override bool ReportSpecialIncompatibleMembersDiagnostic (OperationAna
}

protected override bool VerifyAttributeArguments (AttributeData attribute) => attribute.ConstructorArguments.Length == 0 ||
attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments[0] is { Type.SpecialType: SpecialType.System_String } ctorArg;
attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments is [ { Type.SpecialType: SpecialType.System_String }, ..];

protected override string GetMessageFromAttribute (AttributeData requiresAttribute)
{
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/src/ILLink.RoslynAnalyzer/RequiresDynamicCodeAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected override bool IsAnalyzerEnabled (AnalyzerOptions options, Compilation
options.IsMSBuildPropertyValueTrue (MSBuildPropertyOptionNames.EnableAotAnalyzer, compilation);

protected override bool VerifyAttributeArguments (AttributeData attribute) =>
attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments[0] is { Type.SpecialType: SpecialType.System_String } ctorArg;
attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments is [ { Type.SpecialType: SpecialType.System_String }, ..];

protected override string GetMessageFromAttribute (AttributeData? requiresAttribute)
{
Expand Down
2 changes: 1 addition & 1 deletion src/tools/illink/src/ILLink.RoslynAnalyzer/RequiresUnreferencedCodeUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static bool IsInRequiresUnreferencedCodeAttributeScope (this ISymbol memb
/// <param name="attribute">Attribute data to compare.</param>
/// <returns>True if the validation was successfull; otherwise, returns false.</returns>
public static bool VerifyRequiresUnreferencedCodeAttributeArguments (AttributeData attribute)
=> attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments[0] is { Type.SpecialType: SpecialType.System_String } ctorArg;
=> attribute.ConstructorArguments.Length >= 1 && attribute.ConstructorArguments is [ { Type.SpecialType: SpecialType.System_String }, ..];

public static string GetMessageFromAttribute (AttributeData? requiresAttribute)
{
Expand Down