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.

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 #40906

Merged
merged 11 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,39 +93,39 @@
<Sha>e2dad6af0f5a33cfbe6921a16224a9941197930d</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0-2.24264.12">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0-2.24266.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6f815fb2aad6e56928d04322ad0e2d1b3c724b77</Sha>
<Sha>50f7484dfbaeb162ae0cdb2905b204bafd2c6ba0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.5.24264.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>4.11.0-2.24264.12</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisPackageVersion>4.11.0-2.24264.12</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-2.24264.12</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-2.24264.12</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.11.0-2.24264.12</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.11.0-2.24264.12</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.11.0-2.24264.12</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>4.11.0-2.24266.4</MicrosoftNetCompilersToolsetVersion>
<MicrosoftCodeAnalysisPackageVersion>4.11.0-2.24266.4</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.11.0-2.24266.4</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.11.0-2.24266.4</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.11.0-2.24266.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.11.0-2.24266.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.11.0-2.24266.4</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
Expand Down
2 changes: 2 additions & 0 deletions src/RazorSdk/Tool/ConcurrentLruCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ internal IEnumerable<KeyValuePair<TKey, TValue>> TestingEnumerable
foreach (var key in _nodeList)
{
var kvp = new KeyValuePair<TKey, TValue>(key, _cache[key].Value);
#pragma warning disable CS9237 // 'yield return' should not be used in the body of a lock statement
yield return kvp;
#pragma warning restore CS9237
}
}
}
Expand Down