Skip to content

Commit affe3f6

Browse files
bump Microsoft.CodeAnalysis to latest (#13699)
* bump Microsoft.CodeAnalysis to latest * Change CodeAnalysis version to 4.6.0 * baseline Microsoft.CodeAnalysis * Update Versions.props --------- Co-authored-by: Viktor Hofer <[email protected]>
1 parent 998d84a commit affe3f6

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,14 @@
55
<!-- TODO: Ignore needed until https://github.com/NuGet/Home/issues/11059 is addressed. -->
66
<UsagePattern IdentityGlob="Nuget.*/*" />
77

8+
<!-- GenFacades needs to load this in during the build, restricting SBRP usage. Moreover,
9+
latest version cannot be referenced as this dependency sets the minimum version that is
10+
required to be present inbox in the SDK and Roslyn VS. For more information see
11+
https://github.com/dotnet/arcade/pull/13699#discussion_r1205752883.
12+
13+
In the product build a version from previosly-source-build artifacts is utilized thanks
14+
to the corresponding entry in Version.Details.xml -->
15+
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.*/*" />
16+
817
</IgnorePatterns>
918
</UsageData>

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0">
7+
<Uri>https://github.com/dotnet/roslyn</Uri>
8+
<Sha>c3cc1d0ceeab1a65da0217e403851a1e8a30086a</Sha>
9+
</Dependency>
610
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="2.0.0-preview.1.21526.15">
711
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
812
<Sha>62ceb439e80bf0814d0ffa17f022d4624ea4aa6c</Sha>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<NuGetProjectModelVersion>6.2.2</NuGetProjectModelVersion>
4040
<NuGetVersioningVersion>6.2.2</NuGetVersioningVersion>
4141
<!-- roslyn -->
42-
<MicrosoftCodeAnalysisCSharpVersion>4.4.0</MicrosoftCodeAnalysisCSharpVersion>
43-
<MicrosoftNetCompilersToolsetVersion>4.5.2-3.23266.1</MicrosoftNetCompilersToolsetVersion>
42+
<MicrosoftCodeAnalysisCSharpVersion>4.6.0</MicrosoftCodeAnalysisCSharpVersion>
43+
<MicrosoftNetCompilersToolsetVersion>4.6.0</MicrosoftNetCompilersToolsetVersion>
4444
<!-- runtime -->
4545
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
4646
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0</MicrosoftExtensionsDependencyInjectionVersion>

src/Microsoft.DotNet.CodeAnalysis/Analyzers/MembersMustExistAnalyzer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class MembersMustExistAnalyzer : BaseAnalyzer
2323
private HashSet<string> _apisToEnsureExist = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
2424

2525
private static readonly DiagnosticDescriptor s_memberMustExistDiagnostic =
26-
new DiagnosticDescriptor(DiagnosticIds.BCL0001.ToString(), s_title, s_messageFormat, s_analyzerName, DiagnosticSeverity.Error, isEnabledByDefault: true, description: s_description);
26+
new DiagnosticDescriptor(DiagnosticIds.BCL0001.ToString(), s_title, s_messageFormat, s_analyzerName, DiagnosticSeverity.Error, isEnabledByDefault: true, description: s_description, customTags: WellKnownDiagnosticTags.CompilationEnd);
2727

2828
public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get { return ImmutableArray.Create(s_memberMustExistDiagnostic); } }
2929

src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<IncludeBuildOutput>false</IncludeBuildOutput>
66
<IsPackable>true</IsPackable>
7+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
78
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleSet>
89
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
910
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddAnalyzerToOutput</TargetsForTfmSpecificContentInPackage>

0 commit comments

Comments
 (0)