Skip to content

Commit b2f0e36

Browse files
[main] Update dependencies from dotnet/roslyn-analyzers (#106072)
* Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240805.1 Microsoft.CodeAnalysis.Analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.11.0-beta1.24402.1 -> To Version 3.11.0-beta1.24405.1 * Revert "Fix ShuffleThunk cache heap (#105480)" This reverts commit 81976ed. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Kotas <[email protected]>
1 parent 0953757 commit b2f0e36

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,13 +368,13 @@
368368
<Uri>https://github.com/dotnet/roslyn</Uri>
369369
<Sha>c098e96e5470fccc9c8e9f32189f408d086c984e</Sha>
370370
</Dependency>
371-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24402.1">
371+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24405.1">
372372
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
373-
<Sha>b70b32099c2365092974f6786636e25ae507c8fa</Sha>
373+
<Sha>3211f48253bc18560156d90dc5e710d35f7d03fa</Sha>
374374
</Dependency>
375-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24402.1">
375+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24405.1">
376376
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
377-
<Sha>b70b32099c2365092974f6786636e25ae507c8fa</Sha>
377+
<Sha>3211f48253bc18560156d90dc5e710d35f7d03fa</Sha>
378378
</Dependency>
379379
<!-- Intermediate is necessary for source build. -->
380380
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-2.24408.4">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
</ItemGroup>
3535
<PropertyGroup>
3636
<!-- dotnet/roslyn-analyzers dependencies -->
37-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24402.1</MicrosoftCodeAnalysisAnalyzersVersion>
38-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24402.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
37+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24405.1</MicrosoftCodeAnalysisAnalyzersVersion>
38+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24405.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
3939
<!-- dotnet/roslyn dependencies -->
4040
<!--
4141
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/vm/loaderallocator.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,11 @@ void AssemblyLoaderAllocator::Init(AppDomain* pAppDomain)
17341734
LoaderAllocator::Init((BaseDomain *)pAppDomain);
17351735
if (IsCollectible())
17361736
{
1737-
m_pShuffleThunkCache = new ShuffleThunkCache(m_pStubHeap);
1737+
// TODO: the ShuffleThunkCache should really be using the m_pStubHeap, however the unloadability support
1738+
// doesn't track the stubs or the related delegate classes and so we get crashes when a stub is used after
1739+
// the AssemblyLoaderAllocator is gone (the stub memory is unmapped).
1740+
// https://github.com/dotnet/runtime/issues/55697 tracks this issue.
1741+
m_pShuffleThunkCache = new ShuffleThunkCache(SystemDomain::GetGlobalLoaderAllocator()->GetExecutableHeap());
17381742
}
17391743
}
17401744

0 commit comments

Comments
 (0)