Skip to content

Commit 52a9a87

Browse files
[main] Update dependencies from dotnet/roslyn-analyzers (#96763)
* Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240109.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24059.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240109.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24059.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240115.3 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24065.3 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240116.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24066.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240117.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24067.1 * Fix new CA1859 analyzer warnings * Fix more CA1859 * don't use var * Revert CA1869 changes in ILCompiler.Compiler, ILCompiler.TypeSystem projects and disable warning * Remove pragma disable in ConfigurationElement * Fix more warnings * Fix build * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240117.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24067.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240117.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24067.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240117.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24052.1 -> To Version 3.11.0-beta1.24067.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Alexander Köplinger <[email protected]>
1 parent 81791d1 commit 52a9a87

File tree

43 files changed

+67
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+67
-52
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,13 @@
374374
<Uri>https://github.com/dotnet/roslyn</Uri>
375375
<Sha>28e49407a6e4744819bd471707259b99964e441c</Sha>
376376
</Dependency>
377-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24052.1">
377+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24067.1">
378378
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
379-
<Sha>8a92037d28baf58560622cb4685ecefdc828c2c8</Sha>
379+
<Sha>23ec029b47d68b1a80348c0dabc3bccf013c1fe6</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24052.1">
381+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24067.1">
382382
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
383-
<Sha>8a92037d28baf58560622cb4685ecefdc828c2c8</Sha>
383+
<Sha>23ec029b47d68b1a80348c0dabc3bccf013c1fe6</Sha>
384384
</Dependency>
385385
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-alpha.1.23551.3">
386386
<Uri>https://github.com/dotnet/sdk</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
</ItemGroup>
3232
<PropertyGroup>
3333
<!-- dotnet/roslyn-analyzers dependencies -->
34-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24052.1</MicrosoftCodeAnalysisAnalyzersVersion>
35-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24052.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
34+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24067.1</MicrosoftCodeAnalysisAnalyzersVersion>
35+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24067.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
3636
<!-- dotnet/roslyn dependencies -->
3737
<!--
3838
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,9 @@ private static Type CustomAttributeEncodingToType(CustomAttributeEncoding encode
522522
};
523523
}
524524

525+
#pragma warning disable CA1859
525526
private static object EncodedValueToRawValue(long val, CustomAttributeEncoding encodedType)
527+
#pragma warning restore
526528
{
527529
switch (encodedType)
528530
{

src/coreclr/nativeaot/System.Private.TypeLoader/src/Internal/TypeSystem/RuntimeMethodDesc.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public override Instantiation Instantiation
6363
}
6464
}
6565

66-
private TypeDesc _owningType;
66+
private DefType _owningType;
6767
public override TypeDesc OwningType
6868
{
6969
get

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/Dataflow/MethodBodyScanner.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ private static Stack<StackSlot> MergeStack(Stack<StackSlot> a, Stack<StackSlot>
123123
}
124124

125125
Stack<StackSlot> newStack = new Stack<StackSlot>(a.Count);
126-
IEnumerator<StackSlot> aEnum = a.GetEnumerator();
127-
IEnumerator<StackSlot> bEnum = b.GetEnumerator();
126+
Stack<StackSlot>.Enumerator aEnum = a.GetEnumerator();
127+
Stack<StackSlot>.Enumerator bEnum = b.GetEnumerator();
128128
while (aEnum.MoveNext() && bEnum.MoveNext())
129129
{
130130
newStack.Push(MergeStackElement(aEnum.Current, bEnum.Current));

src/coreclr/tools/aot/ILCompiler.Compiler/ILCompiler.Compiler.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Configurations>Debug;Release;Checked</Configurations>
1717

1818
<NoWarn Condition="'$(DotNetBuildFromSource)' == 'true'">$(NoWarn);CS8524</NoWarn>
19+
<NoWarn>$(NoWarn);CA1859</NoWarn>
1920
</PropertyGroup>
2021

2122
<ItemGroup>

src/coreclr/tools/aot/ILCompiler.RyuJit/JitInterface/CorInfoImpl.RyuJit.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ private InfoAccessType constructStringLiteral(CORINFO_MODULE_STRUCT_* module, md
823823
{
824824
MethodIL methodIL = (MethodIL)HandleToObject((void*)module);
825825

826-
ISymbolNode stringObject;
826+
FrozenStringNode stringObject;
827827
if (metaTok == (mdToken)CorConstants.CorTokenType.mdtString)
828828
{
829829
stringObject = _compilation.NodeFactory.SerializedStringObject("");
@@ -1776,7 +1776,7 @@ private void embedGenericHandle(ref CORINFO_RESOLVED_TOKEN pResolvedToken, bool
17761776
private CORINFO_METHOD_STRUCT_* embedMethodHandle(CORINFO_METHOD_STRUCT_* handle, ref void* ppIndirection)
17771777
{
17781778
MethodDesc method = HandleToObject(handle);
1779-
ISymbolNode methodHandleSymbol = _compilation.NodeFactory.RuntimeMethodHandle(method);
1779+
RuntimeMethodHandleNode methodHandleSymbol = _compilation.NodeFactory.RuntimeMethodHandle(method);
17801780
CORINFO_METHOD_STRUCT_* result = (CORINFO_METHOD_STRUCT_*)ObjectToHandle(methodHandleSymbol);
17811781

17821782
if (methodHandleSymbol.RepresentsIndirectionCell)

src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<GenerateDependencyFile>false</GenerateDependencyFile>
1919
<Configurations>Debug;Release;Checked</Configurations>
2020
<IsTrimmable>true</IsTrimmable>
21+
<NoWarn>$(NoWarn);CA1859</NoWarn>
2122
</PropertyGroup>
2223

2324
<ItemGroup Label="Embedded Resources">

src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private bool ShouldCompress(FileType type)
9191
/// startOffset: offset of the start 'file' within 'bundle'
9292
/// compressedSize: size of the compressed data, if entry was compressed, otherwise 0
9393
/// </returns>
94-
private (long startOffset, long compressedSize) AddToBundle(Stream bundle, Stream file, FileType type)
94+
private (long startOffset, long compressedSize) AddToBundle(Stream bundle, FileStream file, FileType type)
9595
{
9696
long startOffset = bundle.Position;
9797
if (ShouldCompress(type))

src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ private bool IsBaseOrIdentity(ITypeSymbol source, ITypeSymbol dest)
654654
/// Finds the template arguments contained in the message string.
655655
/// </summary>
656656
/// <returns>A value indicating whether the extraction was successful.</returns>
657-
private static bool ExtractTemplates(string? message, IDictionary<string, string> templateMap, List<string> templateList)
657+
private static bool ExtractTemplates(string? message, Dictionary<string, string> templateMap, List<string> templateList)
658658
{
659659
if (string.IsNullOrEmpty(message))
660660
{

0 commit comments

Comments
 (0)