Skip to content
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

[main] Update dependencies from dotnet/roslyn #100186

Closed
wants to merge 4 commits into from
Closed

[main] Update dependencies from dotnet/roslyn #100186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b30185
Update dependencies from https://github.com/dotnet/roslyn build
dotnet-maestro[bot] Mar 23, 2024
d817a10
Fix new warnings
jkotas Mar 23, 2024
1f95bef
Update dependencies from https://github.com/dotnet/roslyn build
dotnet-maestro[bot] Mar 24, 2024
c7e3ef8
Update dependencies from https://github.com/dotnet/roslyn build
dotnet-maestro[bot] Mar 25, 2024
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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,17 +360,17 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f282faa0ddd1b3672a3cba54518943fb1d0b4e36</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-2.24114.13">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.24175.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-2.24114.13">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24175.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-2.24114.13">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.24175.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24170.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand All @@ -381,9 +381,9 @@
<Sha>29bdbf5df540dc13d4fe440a1ca7076c6ed65864</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.10.0-2.24114.13">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.10.0-3.24175.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>77372c66fd54927312b5b0a2e399e192f74445c9</Sha>
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-preview.3.24168.1">
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<MicrosoftCodeAnalysisCSharpVersion>4.10.0-2.24114.13</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.10.0-2.24114.13</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.10.0-2.24114.13</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.10.0-3.24175.2</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisVersion>4.10.0-3.24175.2</MicrosoftCodeAnalysisVersion>
<MicrosoftNetCompilersToolsetVersion>4.10.0-3.24175.2</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/Condition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ private unsafe void RemoveWaiter(Waiter waiter)

public Condition(Lock @lock)
{
#pragma warning disable CS9216 // A value of type 'System.Threading.Lock' converted to a different type will use likely unintended monitor-based locking in 'lock' statement
ArgumentNullException.ThrowIfNull(@lock);
#pragma warning restore CS9216
_lock = @lock;
}

Expand Down
4 changes: 4 additions & 0 deletions ....CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.NativeSinks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@ private void ContentionLockCreated(nint LockID, nint AssociatedObjectID, ushort
LogContentionLockCreated(LockID, AssociatedObjectID, ClrInstanceID);
}

#pragma warning disable CS9216 // A value of type 'System.Threading.Lock' converted to a different type will use likely unintended monitor-based locking in 'lock' statement
[NonEvent]
[MethodImpl(MethodImplOptions.NoInlining)]
public void ContentionLockCreated(Lock lockObj) => ContentionLockCreated(lockObj.LockIdForEvents, ObjectIDForEvents(lockObj));
#pragma warning restore CS9216

[Event(81, Level = EventLevel.Informational, Message = Messages.ContentionStart, Task = Tasks.Contention, Opcode = EventOpcode.Start, Version = 2, Keywords = Keywords.ContentionKeyword)]
private void ContentionStart(
Expand All @@ -108,6 +110,7 @@ private void ContentionStart(
LogContentionStart(ContentionFlags, ClrInstanceID, LockID, AssociatedObjectID, LockOwnerThreadID);
}

#pragma warning disable CS9216 // A value of type 'System.Threading.Lock' converted to a different type will use likely unintended monitor-based locking in 'lock' statement
[NonEvent]
[MethodImpl(MethodImplOptions.NoInlining)]
public void ContentionStart(Lock lockObj) =>
Expand All @@ -117,6 +120,7 @@ public void ContentionStart(Lock lockObj) =>
lockObj.LockIdForEvents,
ObjectIDForEvents(lockObj),
lockObj.OwningThreadId);
#pragma warning restore CS9216

[Event(91, Level = EventLevel.Informational, Message = Messages.ContentionStop, Task = Tasks.Contention, Opcode = EventOpcode.Stop, Version = 1, Keywords = Keywords.ContentionKeyword)]
private void ContentionStop(ContentionFlagsMap ContentionFlags, ushort ClrInstanceID, double DurationNs)
Expand Down
4 changes: 4 additions & 0 deletions ...stem.Private.CoreLib/src/System/Diagnostics/Tracing/NativeRuntimeEventSource.Threading.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,11 @@ private unsafe void ContentionLockCreated(nint LockID, nint AssociatedObjectID,
WriteEventCore(90, 3, data);
}

#pragma warning disable CS9216 // A value of type 'System.Threading.Lock' converted to a different type will use likely unintended monitor-based locking in 'lock' statement
[NonEvent]
[MethodImpl(MethodImplOptions.NoInlining)]
public void ContentionLockCreated(Lock lockObj) => ContentionLockCreated(lockObj.LockIdForEvents, ObjectIDForEvents(lockObj));
#pragma warning restore CS9216

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:UnrecognizedReflectionPattern", Justification = "Parameters to this method are primitive and are trimmer safe")]
[Event(81, Level = EventLevel.Informational, Message = Messages.ContentionStart, Task = Tasks.Contention, Opcode = EventOpcode.Start, Version = 2, Keywords = Keywords.ContentionKeyword)]
Expand Down Expand Up @@ -139,6 +141,7 @@ private unsafe void ContentionStart(
WriteEventCore(81, 5, data);
}

#pragma warning disable CS9216 // A value of type 'System.Threading.Lock' converted to a different type will use likely unintended monitor-based locking in 'lock' statement
[NonEvent]
[MethodImpl(MethodImplOptions.NoInlining)]
public void ContentionStart(Lock lockObj) =>
Expand All @@ -148,6 +151,7 @@ public void ContentionStart(Lock lockObj) =>
lockObj.LockIdForEvents,
ObjectIDForEvents(lockObj),
lockObj.OwningThreadId);
#pragma warning restore CS9216

[UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:UnrecognizedReflectionPattern", Justification = "Parameters to this method are primitive and are trimmer safe")]
[Event(91, Level = EventLevel.Informational, Message = Messages.ContentionStop, Task = Tasks.Contention, Opcode = EventOpcode.Stop, Version = 1, Keywords = Keywords.ContentionKeyword)]
Expand Down
Loading