From 0f907b05b6e8fa0bd08c19b74c5e2bee7b268a73 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Tue, 14 May 2024 16:29:07 -0700 Subject: [PATCH 1/7] Update VS2017.11 dependencies --- eng/Versions.props | 56 +++++++++++-------- src/Compiler/FSharp.Compiler.Service.fsproj | 6 +- src/FSharp.Build/FSharp.Build.fsproj | 6 +- src/fsc/fsc.targets | 6 +- src/fsi/fsi.targets | 6 +- .../FSharp.Build.UnitTests.fsproj | 6 +- .../HostedCompilerServer.fsproj | 6 +- vsintegration/Directory.Build.targets | 6 +- .../LanguageService/LanguageService.fs | 4 +- 9 files changed, 56 insertions(+), 46 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6146affd95a..39af82634c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,22 +78,28 @@ + 8.0.0 4.5.1 - 7.0.0 - 1.6.0 - 7.0.2 + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) 4.5.5 4.7.0 - 7.0.0 - 7.0.0 + $(SystemPackageVersionVersion) 6.0.0 + $(SystemPackageVersionVersion) 4.5.0 + 1.6.0 + - 4.6.0-3.23329.3 - 17.7.25-preview - 17.7.35338-preview.1 - 17.7.58-pre - 17.7.5-preview + 4.11.0-2.24264.2 + 17.10.191 + 17.10.40152 + 17.10.526-pre-g1b474069f5 + 17.10.41 + 17.11.0-preview-24178-03 + $(RoslynVersion) $(RoslynVersion) @@ -104,6 +110,7 @@ $(RoslynVersion) 2.0.28 $(RoslynVersion) + $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) @@ -125,11 +132,12 @@ 10.0.30319 11.0.50727 15.0.25123-Dev15Preview + - 17.7.0-preview-23217-02 - 17.7.0-preview-23217-02 - 17.7.0-preview-23217-02 - 17.7.0-preview-23217-02 + XXXX$(MicrosoftBuildVersion) + XXXX$(MicrosoftBuildVersion) + XXXX$(MicrosoftBuildVersion) + $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) @@ -146,33 +154,36 @@ 0.1.169-beta $(MicrosoftVisualStudioExtensibilityTestingVersion) $(MicrosoftVisualStudioExtensibilityTestingVersion) + $(MicrosoftVisualStudioThreadingPackagesVersion) + $(VisualStudioProjectSystemPackagesVersion) 2.3.6152103 + - 17.1.4054 - 17.7.3-preview + 17.10.1031-preview2 + 17.10.21 17.0.0 - 17.6.11 + 17.8.8 12.0.4 7.0.4 8.0.4 11.0.4 7.0.4 + 0.2.0 1.0.0 1.1.33 + 0.13.10 2.16.5 4.3.0.0 1.0.31 - 7.0.0 - 7.0.0 - 8.0.0 + $(SystemPackageVersionVersion) 4.3.0-1.22220.8 3.1.0 5.0.0-preview.7.20364.11 @@ -184,12 +195,13 @@ 3.11.0 2.1.80 1.0.0-beta2-dev3 - 2.16.8-preview - 2.9.112 + 2.18.48 + 2.10.69 2.4.1 2.4.2 5.10.3 2.2.0 + 1.0.0-prerelease.23614.4 1.0.0-prerelease.23614.4 diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index 770e7a1aee6..25509b7da6b 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -47,9 +47,9 @@ - - - + + + diff --git a/src/FSharp.Build/FSharp.Build.fsproj b/src/FSharp.Build/FSharp.Build.fsproj index f8fbc7138ef..07f982f9b2b 100644 --- a/src/FSharp.Build/FSharp.Build.fsproj +++ b/src/FSharp.Build/FSharp.Build.fsproj @@ -74,9 +74,9 @@ - - - + + + diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index 2973feb613e..92ceccc5277 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -51,9 +51,9 @@ - - - + + + diff --git a/src/fsi/fsi.targets b/src/fsi/fsi.targets index 2f38a20ecc3..4031cd62b5b 100644 --- a/src/fsi/fsi.targets +++ b/src/fsi/fsi.targets @@ -60,9 +60,9 @@ - - - + + + \ No newline at end of file diff --git a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj index 0a2421f3262..5c95d229944 100644 --- a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj +++ b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj index f67562799e0..e417791c80d 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj @@ -30,9 +30,9 @@ - - - + + + diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index d82aafceb89..2e0513986ca 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -3,9 +3,9 @@ - - - + + + diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index b492cf1f35f..dfb65ee6742 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs @@ -436,9 +436,7 @@ type internal FSharpPackage() as this = type internal FSharpLanguageService(package: FSharpPackage) = inherit AbstractLanguageService(package) - override _.Initialize() = - base.Initialize() - + member _.Initialize() = let exportProvider = package.ComponentModel.DefaultExportProvider let globalOptions = exportProvider.GetExport().Value From 676455c44b5aeed6328fde6b2a4d748807b51241 Mon Sep 17 00:00:00 2001 From: KevinRansom Date: Wed, 15 May 2024 02:41:59 -0700 Subject: [PATCH 2/7] fix dependencies --- eng/SourceBuildPrebuiltBaseline.xml | 12 +++++++++--- eng/Versions.props | 6 +----- vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 31c0ad52ed2..72fb9d75de8 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -10,11 +10,17 @@ Tracked with https://github.com/dotnet/fsharp/issues/14765 --> + + + - - - + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 39af82634c6..062de110b06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,6 +122,7 @@ $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) + $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) @@ -133,11 +134,6 @@ 11.0.50727 15.0.25123-Dev15Preview - - XXXX$(MicrosoftBuildVersion) - XXXX$(MicrosoftBuildVersion) - XXXX$(MicrosoftBuildVersion) - $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) diff --git a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj index 58862ce6747..374b74b5ca1 100644 --- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj +++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj @@ -58,6 +58,7 @@ + From f6eddf14bee63851d4f28b6d2cbfd6da9cf23425 Mon Sep 17 00:00:00 2001 From: Vlad Zarytovskii Date: Wed, 15 May 2024 12:14:40 +0200 Subject: [PATCH 3/7] Update SourceBuildPrebuiltBaseline.xml --- eng/SourceBuildPrebuiltBaseline.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 72fb9d75de8..e8f5717b24a 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,6 +12,8 @@ + + From 811eeddcf83848d168a5c2524b1f9f964d8b4865 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 15 May 2024 13:05:49 -0700 Subject: [PATCH 4/7] Update Versions.xml --- eng/SourceBuildPrebuiltBaseline.xml | 8 -------- eng/Versions.props | 5 +++++ src/Compiler/FSharp.Compiler.Service.fsproj | 6 +++--- src/FSharp.Build/FSharp.Build.fsproj | 6 +++--- src/fsc/fsc.targets | 6 +++--- src/fsi/fsi.targets | 6 +++--- .../FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj | 6 +++--- .../src/HostedCompilerServer/HostedCompilerServer.fsproj | 6 +++--- vsintegration/Directory.Build.targets | 6 +++--- 9 files changed, 26 insertions(+), 29 deletions(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index e8f5717b24a..ea45c25a0ca 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -10,18 +10,10 @@ Tracked with https://github.com/dotnet/fsharp/issues/14765 --> - - - - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 062de110b06..718ca0179ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,6 +134,11 @@ 11.0.50727 15.0.25123-Dev15Preview + + + + + $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj index 25509b7da6b..770e7a1aee6 100644 --- a/src/Compiler/FSharp.Compiler.Service.fsproj +++ b/src/Compiler/FSharp.Compiler.Service.fsproj @@ -47,9 +47,9 @@ - - - + + + diff --git a/src/FSharp.Build/FSharp.Build.fsproj b/src/FSharp.Build/FSharp.Build.fsproj index 07f982f9b2b..f8fbc7138ef 100644 --- a/src/FSharp.Build/FSharp.Build.fsproj +++ b/src/FSharp.Build/FSharp.Build.fsproj @@ -74,9 +74,9 @@ - - - + + + diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets index 92ceccc5277..2973feb613e 100644 --- a/src/fsc/fsc.targets +++ b/src/fsc/fsc.targets @@ -51,9 +51,9 @@ - - - + + + diff --git a/src/fsi/fsi.targets b/src/fsi/fsi.targets index 4031cd62b5b..2f38a20ecc3 100644 --- a/src/fsi/fsi.targets +++ b/src/fsi/fsi.targets @@ -60,9 +60,9 @@ - - - + + + \ No newline at end of file diff --git a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj index 5c95d229944..0a2421f3262 100644 --- a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj +++ b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj index e417791c80d..f67562799e0 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj @@ -30,9 +30,9 @@ - - - + + + diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index 2e0513986ca..d82aafceb89 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -3,9 +3,9 @@ - - - + + + From cdf53e4519e8012c2603f2990cc0ad8e8fca94cc Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 15 May 2024 13:09:33 -0700 Subject: [PATCH 5/7] oops --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce2fa382478..1d638392f7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb diff --git a/eng/Versions.props b/eng/Versions.props index 718ca0179ae..af37edf2450 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,9 +135,9 @@ 15.0.25123-Dev15Preview - - - + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) $(VisualStudioEditorPackagesVersion) From acf74a436491b5f0bc939e0a4d78b951bb8d38e6 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 15 May 2024 14:15:49 -0700 Subject: [PATCH 6/7] oopsie!! --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d638392f7a..305c68faac5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,9 +7,9 @@ - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb From 99e0495ea3f0f889ac3b5241c71590ab7d69229b Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Wed, 15 May 2024 15:40:05 -0700 Subject: [PATCH 7/7] Update sourcebuild prebuilt baselines --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ea45c25a0ca..f763104b991 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -15,6 +15,10 @@ + + + +