Skip to content

Commit 6dc3658

Browse files
authored
Merge pull request #3400 from sharwell/fix-warnings
Fix build warnings and update compiler
2 parents b444c19 + 93cfc3d commit 6dc3658

File tree

10 files changed

+20
-14
lines changed

10 files changed

+20
-14
lines changed

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- Roslyn -->
2323
<MicrosoftCodeAnalysisVersion>3.0.0</MicrosoftCodeAnalysisVersion>
2424
<MicrosoftCodeAnalysisForShippedApisVersion>3.5.0-beta2-20056-01</MicrosoftCodeAnalysisForShippedApisVersion>
25-
<MicrosoftNetCompilersVersion>3.5.0-beta4-20153-05</MicrosoftNetCompilersVersion>
25+
<MicrosoftNetCompilersVersion>3.6.0-1.final</MicrosoftNetCompilersVersion>
2626
<DogfoodAnalyzersVersion>3.0.0-beta2.19529.2+e119d9cf</DogfoodAnalyzersVersion>
2727
<MicrosoftCodeAnalysisBannedApiAnalyzersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
2828
<MicrosoftCodeAnalysisFXCopAnalyersVersion>$(DogfoodAnalyzersVersion)</MicrosoftCodeAnalysisFXCopAnalyersVersion>

src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/SymbolIsBannedAnalyzer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void OnCompilationStart(CompilationStartAnalysisContext compilationConte
7373
return;
7474
}
7575

76-
var entryByAttributeSymbol = entryBySymbol
76+
Dictionary<ISymbol, SymbolIsBannedAnalyzer<TSyntaxKind>.BanFileEntry> entryByAttributeSymbol = entryBySymbol
7777
.Where(pair => pair.Key is ITypeSymbol n && n.IsAttribute())
7878
.ToDictionary(pair => pair.Key, pair => pair.Value);
7979

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/AvoidUninstantiatedInternalClasses.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public override void Initialize(AnalysisContext analysisContext)
4444

4545
analysisContext.RegisterCompilationStartAction(startContext =>
4646
{
47-
var instantiatedTypes = new ConcurrentDictionary<INamedTypeSymbol, object?>();
47+
ConcurrentDictionary<INamedTypeSymbol, object?> instantiatedTypes = new ConcurrentDictionary<INamedTypeSymbol, object?>();
4848
var internalTypes = new ConcurrentDictionary<INamedTypeSymbol, object?>();
4949

5050
var compilation = startContext.Compilation;

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public override void Initialize(AnalysisContext context)
6666
return;
6767
}
6868

69-
var lazyValueContentResult = new Lazy<DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>?>(
69+
Lazy<DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>?> lazyValueContentResult = new Lazy<DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>?>(
7070
valueFactory: ComputeValueContentAnalysisResult, isThreadSafe: false);
7171

7272
operationBlockStartContext.RegisterOperationAction(operationContext =>

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Security/DoNotReferSelfInSerializableClass.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ public sealed override void Initialize(AnalysisContext context)
6666
return;
6767
}
6868

69-
var forwardGraph = new ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>>();
70-
var invertedGraph = new ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>>();
69+
ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>> forwardGraph = new ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>>();
70+
ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>> invertedGraph = new ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>>();
7171

7272
// It keeps the out Degree of every vertex in the invertedGraph, which is corresponding to the in Degree of the vertex in forwardGraph.
73-
var inDegree = new ConcurrentDictionary<ISymbol, int>();
73+
ConcurrentDictionary<ISymbol, int> inDegree = new ConcurrentDictionary<ISymbol, int>();
7474

7575
// It Keeps the out degree of every vertex in the forwardGraph, which is corresponding to the in Degree of the vertex in invertedGraph.
76-
var outDegree = new ConcurrentDictionary<ISymbol, int>();
76+
ConcurrentDictionary<ISymbol, int> outDegree = new ConcurrentDictionary<ISymbol, int>();
7777

7878
compilationStartAnalysisContext.RegisterSymbolAction(
7979
(SymbolAnalysisContext symbolAnalysisContext) =>

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Security/DoNotSerializeTypeWithPointerFields.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public sealed override void Initialize(AnalysisContext context)
5959
}
6060

6161
var nonSerializedAttribute = compilation.GetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemNonSerializedAttribute);
62-
var visitedType = new ConcurrentDictionary<ITypeSymbol, bool>();
63-
var pointerFields = new ConcurrentDictionary<IFieldSymbol, bool>();
62+
ConcurrentDictionary<ITypeSymbol, bool> visitedType = new ConcurrentDictionary<ITypeSymbol, bool>();
63+
ConcurrentDictionary<IFieldSymbol, bool> pointerFields = new ConcurrentDictionary<IFieldSymbol, bool>();
6464

6565
compilationStartAnalysisContext.RegisterSymbolAction(
6666
(SymbolAnalysisContext symbolAnalysisContext) =>

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Security/SetViewStateUserKey.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override void Initialize(AnalysisContext context)
4848

4949
context.RegisterCompilationStartAction(compilationStartAnalysisContext =>
5050
{
51-
var compilation = compilationStartAnalysisContext.Compilation;
51+
Compilation compilation = compilationStartAnalysisContext.Compilation;
5252
var wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(compilationStartAnalysisContext.Compilation);
5353

5454
if (!wellKnownTypeProvider.TryGetOrCreateTypeByMetadataName(WellKnownTypeNames.SystemWebUIPage, out var pageTypeSymbol) ||

src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Security/UseAutoValidateAntiforgeryToken.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public override void Initialize(AnalysisContext context)
106106
// Verify that validate anti forgery token attributes are used somewhere within this project,
107107
// to avoid reporting false positives on projects that use an alternative approach to mitigate CSRF issues.
108108
var usingValidateAntiForgeryAttribute = false;
109-
var onAuthorizationAsyncMethodSymbols = new ConcurrentDictionary<IMethodSymbol, bool>();
109+
ConcurrentDictionary<IMethodSymbol, bool> onAuthorizationAsyncMethodSymbols = new ConcurrentDictionary<IMethodSymbol, bool>();
110110
var actionMethodSymbols = new ConcurrentDictionary<(IMethodSymbol, string), bool>();
111111
var actionMethodNeedAddingHttpVerbAttributeSymbols = new ConcurrentDictionary<IMethodSymbol, bool>();
112112

src/Utilities/Compiler/Options/Unit.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ internal struct Unit : IEquatable<Unit>
4545
/// <param name="first">The first <see cref="Unit"/> value to compare.</param>
4646
/// <param name="second">The second <see cref="Unit"/> value to compare.</param>
4747
/// <returns>Because <see cref="Unit"/> has a single value, this always returns <c>true</c>.</returns>
48-
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "first", Justification = "Parameter required for operator overloading."), SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "second", Justification = "Parameter required for operator overloading.")]
48+
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "first", Justification = "Parameter required for operator overloading.")]
49+
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "second", Justification = "Parameter required for operator overloading.")]
50+
[SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Parameter required for operator overloading.")]
4951
public static bool operator ==(Unit first, Unit second) => true;
5052

5153
/// <summary>
@@ -54,7 +56,9 @@ internal struct Unit : IEquatable<Unit>
5456
/// <param name="first">The first <see cref="Unit"/> value to compare.</param>
5557
/// <param name="second">The second <see cref="Unit"/> value to compare.</param>
5658
/// <returns>Because <see cref="Unit"/> has a single value, this always returns <c>false</c>.</returns>
57-
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "first", Justification = "Parameter required for operator overloading."), SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "second", Justification = "Parameter required for operator overloading.")]
59+
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "first", Justification = "Parameter required for operator overloading.")]
60+
[SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "second", Justification = "Parameter required for operator overloading.")]
61+
[SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Parameter required for operator overloading.")]
5862
public static bool operator !=(Unit first, Unit second) => false;
5963

6064
/// <summary>

src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DictionaryAnalysisData.cs

+2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ public bool Remove(KeyValuePair<TKey, TValue> item)
138138
return Remove(item.Key);
139139
}
140140

141+
#pragma warning disable CS8767 // Nullability of reference types in type of parameter doesn't match implicitly implemented member because of nullability attributes. https://github.com/dotnet/roslyn/issues/42552
141142
public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value)
143+
#pragma warning restore CS8767 // Nullability of reference types in type of parameter doesn't match implicitly implemented member because of nullability attributes.
142144
{
143145
Debug.Assert(!IsDisposed);
144146
return _coreAnalysisData.TryGetValue(key, out value);

0 commit comments

Comments
 (0)