Merge pull request #70446 from dibarbet/remove_runtime_framework_version

Ensure the VSCode server process runs on non-preview runtime
dotnet · Oct 19, 2023 · 39386f9 · 39386f9
2 parents 1bd25cc + 0cc238a
commit 39386f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/...Server/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj
@@ -38,11 +38,6 @@
     <SelfContained>false</SelfContained>
     <PublishDir Condition="'$(RuntimeIdentifier)' != ''">$(ArtifactsDir)/LanguageServer/$(Configuration)/$(TargetFramework)/$(RuntimeIdentifier)</PublishDir>
     <PublishDir Condition="'$(RuntimeIdentifier)' == ''">$(ArtifactsDir)/LanguageServer/$(Configuration)/$(TargetFramework)/neutral</PublishDir>
-    <!--
-        Set the minimum runtime to a .NET 7 prerelease so that prerelease SDKs will be considered during rollForward.
-        RollForward values for roslyn are set in eng/config/runtimeconfig.template.json
-    -->
-    <RuntimeFrameworkVersion>7.0.0-preview.7.22362.8</RuntimeFrameworkVersion>
 
     <!-- List of runtime identifiers that we want to publish an executable for -->
     <RuntimeIdentifiers>win-x64;win-x86;win-arm64;linux-x64;linux-arm64;alpine-x64;alpine-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>

diff --git a/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs b/src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Program.cs
@@ -74,6 +74,8 @@ static async Task RunAsync(ServerConfiguration serverConfiguration, Cancellation
         }
     }
 
+    logger.LogTrace($".NET Runtime Version: {RuntimeInformation.FrameworkDescription}");
+
     using var exportProvider = await ExportProviderBuilder.CreateExportProviderAsync(serverConfiguration.ExtensionAssemblyPaths, serverConfiguration.SharedDependenciesPath, loggerFactory);
 
     // The log file directory passed to us by VSCode might not exist yet, though its parent directory is guaranteed to exist.

diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Program.cs b/src/Workspaces/Core/MSBuild.BuildHost/Program.cs
@@ -58,6 +58,8 @@ internal static async Task Main(string[] args)
 
         logger.LogInformation("RPC channel started.");
 
+        logger.LogInformation($"BuildHost Runtime Version: {System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription}");
+
         await jsonRpc.Completion.ConfigureAwait(false);
 
         logger.LogInformation("RPC channel closed; process exiting.");