Skip to content

Commit 4b9d21c

Browse files
dotnet-maestro[bot]T-GroCopilot
authored
[release/dev18.0] Update dependencies from dotnet/roslyn (#19524)
* Update dependencies from https://github.com/dotnet/roslyn build 20260330.2 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26175.11 -> To Version 5.0.0-2.26180.2 * Update dependencies from https://github.com/dotnet/roslyn build 20260401.2 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26175.11 -> To Version 5.0.0-2.26201.2 * Update dependencies from https://github.com/dotnet/roslyn build 20260402.6 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.0.0-2.26175.11 -> To Version 5.0.0-2.26202.6 * Fix CancellationPropagatesToTask test disposing running Task Change 'use t' to 'let t' to avoid calling Dispose on a Task that may still be running, which throws InvalidOperationException on .NET 10. Replace 'waitASec t' (1-second timeout) with 't.Wait()' to wait for cancellation to fully propagate, matching the pattern used by the sibling CancellationPropagatesToGroup test. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Tomas Grosup <Tomas.Grosup@gmail.com>
1 parent adc6e05 commit 4b9d21c

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎eng/Version.Details.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props
1919
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
2020
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
2121
<!-- dotnet-roslyn dependencies -->
22-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisPackageVersion>
23-
<MicrosoftCodeAnalysisCompilersPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisCompilersPackageVersion>
24-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisCSharpPackageVersion>
25-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
26-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
27-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
28-
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.26175.11</MicrosoftCodeAnalysisFeaturesPackageVersion>
29-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.26175.11</MicrosoftVisualStudioLanguageServicesPackageVersion>
22+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisPackageVersion>
23+
<MicrosoftCodeAnalysisCompilersPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisCompilersPackageVersion>
24+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisCSharpPackageVersion>
25+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
26+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
27+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
28+
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.26202.6</MicrosoftCodeAnalysisFeaturesPackageVersion>
29+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.26202.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
3030
<!-- dotnet-runtime dependencies -->
3131
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
3232
<SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,37 @@
4242
<Uri>https://github.com/dotnet/runtime</Uri>
4343
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.26175.11">
45+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.26202.6">
4646
<Uri>https://github.com/dotnet/roslyn</Uri>
47-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
47+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.26175.11">
49+
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.26202.6">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
51+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.26175.11">
53+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.26202.6">
5454
<Uri>https://github.com/dotnet/roslyn</Uri>
55-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
55+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.26175.11">
57+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.26202.6">
5858
<Uri>https://github.com/dotnet/roslyn</Uri>
59-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
59+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.26175.11">
61+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.26202.6">
6262
<Uri>https://github.com/dotnet/roslyn</Uri>
63-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
63+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.26175.11">
65+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.26202.6">
6666
<Uri>https://github.com/dotnet/roslyn</Uri>
67-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
67+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.26175.11">
69+
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.26202.6">
7070
<Uri>https://github.com/dotnet/roslyn</Uri>
71-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
71+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.26175.11">
73+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.26202.6">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
75-
<Sha>444ccb140d1e9e3cf7884e9038945fe46b12a3ca</Sha>
75+
<Sha>d977c74c96821fd874b6e1d356d4f46d63a7a576</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>

‎tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ type AsyncType() =
250250
let a = async {
251251
while true do ()
252252
}
253-
use t = Async.StartAsTask a
253+
let t = Async.StartAsTask a
254254
Async.CancelDefaultToken ()
255255
let mutable exceptionThrown = false
256256
try
257-
waitASec t
257+
t.Wait()
258258
with e -> exceptionThrown <- true
259259
Assert.True (exceptionThrown)
260260
Assert.True(t.IsCanceled)

0 commit comments

Comments
 (0)