diff --git a/docs/release-notes/.VisualStudio/18.vNext.md b/docs/release-notes/.VisualStudio/18.vNext.md index 6205e8caef0..0166a73a6d9 100644 --- a/docs/release-notes/.VisualStudio/18.vNext.md +++ b/docs/release-notes/.VisualStudio/18.vNext.md @@ -15,3 +15,4 @@ * Rename "inline hints" to "inlay hints" in VS options for consistency with industry terminology. ([PR #19318](https://github.com/dotnet/fsharp/pull/19318)) * Unused analyzers: disable in VS when file has errors ([PR #19892](https://github.com/dotnet/fsharp/pull/19892)) +* Move to Roslyn's unified ExternalAccess library ([PR #20099](https://github.com/dotnet/fsharp/pull/20099)) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 775ff7a16c2..253e5d8b516 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -24,7 +24,7 @@ This file should be imported by eng/Versions.props 5.10.0-1.26365.3 5.10.0-1.26365.3 5.10.0-1.26365.3 - 5.10.0-1.26365.3 + 5.10.0-1.26365.3 5.10.0-1.26365.3 5.10.0-1.26365.3 @@ -55,7 +55,7 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisEditorFeaturesPackageVersion) $(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion) - $(MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion) + $(MicrosoftVisualStudioLanguageServicesExternalAccessPackageVersion) $(MicrosoftCodeAnalysisFeaturesPackageVersion) $(MicrosoftVisualStudioLanguageServicesPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dadf91aba4..8e138e00a8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,10 +34,6 @@ https://github.com/dotnet/roslyn 3d32d464e2949f054086fbb5346e4beea0c6df56 - - https://github.com/dotnet/roslyn - 3d32d464e2949f054086fbb5346e4beea0c6df56 - https://github.com/dotnet/roslyn 3d32d464e2949f054086fbb5346e4beea0c6df56 @@ -50,6 +46,10 @@ https://github.com/dotnet/roslyn 3d32d464e2949f054086fbb5346e4beea0c6df56 + + https://github.com/dotnet/roslyn + 3d32d464e2949f054086fbb5346e4beea0c6df56 + https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b22e821a2de..ca429b61f77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ $(MicrosoftVisualStudioShellPackagesVersion) $(VisualStudioShellProjectsPackages) - + 18.9.438 18.9.438 18.9.438 @@ -129,7 +129,7 @@ $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) @@ -142,7 +142,7 @@ $(MicrosoftVisualStudioThreadingPackagesVersion) - 18.7.1 diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index 16099d6637c..a1d6035a1d3 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -14,7 +14,7 @@ - + diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index 68206f698bd..e54b6752ea3 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -179,7 +179,7 @@ - + diff --git a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj index 0d05a915760..00cf656ed40 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj +++ b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj @@ -95,7 +95,7 @@ - + diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj index cf8cc25e837..8501351f46f 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj @@ -120,7 +120,7 @@ - +