Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
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
9 changes: 5 additions & 4 deletions eng/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
<PackageVersion Include="Microsoft.Net.Compilers" Version="$(MicrosoftNetCompilersVersion)" />
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="$(MicrosoftNETCoreILAsmVersion)" />
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="$(MicrosoftNETCoreILDAsmVersion)" />
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.10.128" />
<!-- Roslyn 5.11.0 pulls Microsoft.ServiceHub.Framework 4.10.147 transitively; pin to match (avoids NU1605). -->
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.10.147" />
<PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingExtensionsHangDumpVersion)" />
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPlatformVersion)" />
<PackageVersion Include="Microsoft.VisualFSharp.Microsoft.VisualStudio.Shell.UI.Internal" Version="17.0.0" />
Expand Down Expand Up @@ -74,7 +75,7 @@
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="18.0.1237-pre" />
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="2.3.6152103" />
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.Query" Version="17.13.66" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="18.9.453" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="18.9.918" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Design" Version="18.9.493" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Immutable.10.0" Version="10.0.30319" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Immutable.11.0" Version="11.0.50727" />
Expand All @@ -86,7 +87,7 @@
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(VisualStudioEditorPackagesVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.TextManager.Interop" Version="18.9.438" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="18.7.19" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="18.7.23" />
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="18.7.1" />
<!-- Microsoft.VSSDK.BuildTools is injected as an implicit PackageReference by Arcade's VisualStudio.targets
(Version="$(MicrosoftVSSDKBuildToolsVersion)"); an implicit reference must not be centrally managed (NU1009). -->
Expand All @@ -95,7 +96,7 @@
<!-- Raised from 1.3.0: Microsoft.VisualStudio.ComponentModelHost 18.9.453 (transitive via the VS SDK) requires >= 1.3.1. -->
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageVersion Include="StreamJsonRpc" Version="2.26.5" />
<PackageVersion Include="StreamJsonRpc" Version="2.26.10" />
<PackageVersion Include="System.Buffers" Version="$(SystemBuffersVersion)" />
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableCentralVersion)" />
<PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.11.0-1.26403.5</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.11.0-1.26403.5</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.11.0-1.26403.5</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.11.0-1.26403.5</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.11.0-1.26403.5</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>5.11.0-1.26403.5</MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.11.0-1.26403.5</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.11.0-1.26403.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!-- dotnet-runtime dependencies -->
<SystemCollectionsImmutablePackageVersion>10.0.8</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.8</SystemCompositionPackageVersion>
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,37 @@
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>746aeb090c9e2bcedc398751370da862014ebf7a</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices.ExternalAccess" Version="5.10.0-1.26365.3">
<Dependency Name="Microsoft.VisualStudio.LanguageServices.ExternalAccess" Version="5.11.0-1.26403.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
<Sha>e091fb9d8ae849cac0f577f86d5f2ffd01033b20</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Collections.Immutable" Version="10.0.8">
Expand Down
7 changes: 4 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,10 @@
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>

<!-- Shared version groups referenced by multiple PackageVersion entries in eng/Packages.props. -->
<!-- Shared pin for the editor packages in eng/Packages.props; must match 18.9.123 (resolved transitively
via Microsoft.VisualStudio.SDK 18.9.496). Full NU1109 rationale lives there, next to the 18.9.x pins. -->
<VisualStudioEditorPackagesVersion>18.9.123</VisualStudioEditorPackagesVersion>
<!-- Shared pin for the editor packages in eng/Packages.props; must match 18.9.179 (resolved transitively
via Microsoft.CodeAnalysis.EditorFeatures / .LanguageServices.ExternalAccess 5.11.0). Full NU1109
rationale lives there, next to the 18.9.x pins. -->
<VisualStudioEditorPackagesVersion>18.9.179</VisualStudioEditorPackagesVersion>
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>

<!-- Read by name by the Arcade SDK (tools/VisualStudio.targets injects it into VSIX projects), so it must
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ let ``Fsx.Bug4311HoverOverReferenceInFirstLine`` () =
assertReferenceTooltipContains "PresentationFramework.dll" (markAtEndOfMarker source "#r \"PresentationFrame")
assertReferenceTooltipDoesNotContain "multiple results" (markAtEndOfMarker source "#r \"PresentationFrame")

[<FactForDESKTOP>]
[<Fact(Skip = "non-FCS: #r \"System\" reference-assembly resolution is non-deterministic in the FCS test host (intermittently empty tooltip)")>]
let ``Fsx.Bug5073`` () =
let source = "#r \"System\" "
assertReferenceTooltipContains @"Reference Assemblies\Microsoft" (markAtEndOfMarker source "#r \"Sys")
Expand Down
Loading