Merge pull request #2436 from 333fred/dependency-cleanup

Host dependency cleanup
OmniSharp · Sep 22, 2022 · 8c297a1 · 8c297a1
2 parents 6135214 + a6e5fbd
commit 8c297a1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <ItemGroup Condition="'$(SkipHostDlls)' == 'true'">
+      <PackageReference Include="System.Configuration.ConfigurationManager" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Common" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Configuration" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.DependencyResolver.Core" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Frameworks" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.LibraryModel" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Packaging.Core" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Packaging" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.ProjectModel" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Protocol" ExcludeAssets="all" PrivateAssets="all" />
+      <PackageReference Include="NuGet.Versioning" ExcludeAssets="all" PrivateAssets="all" />
+  </ItemGroup>
+
   <Import Project="build\Packages.props" />
 
 </Project>
diff --git a/build.cake b/build.cake
@@ -594,20 +594,6 @@ string PublishBuild(string project, BuildEnvironment env, BuildPlan plan, string
         throw;
     }
 
-    if (framework is "net6.0")
-    {
-        // Delete NuGet libraries so they can be loaded from SDK folder.
-        foreach (var filePath in DirectoryHelper.GetFiles(outputFolder, "NuGet.*.dll"))
-        {
-            FileHelper.Delete(filePath);
-        }
-
-        foreach (var filePath in DirectoryHelper.GetFiles(outputFolder, "System.Configuration.ConfigurationManager.dll"))
-        {
-            FileHelper.Delete(filePath);
-        }
-    }
-
     CopyExtraDependencies(env, outputFolder);
     AddOmniSharpBindingRedirects(outputFolder);
 

diff --git a/build/Packages.props b/build/Packages.props
@@ -61,9 +61,15 @@
 
         <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 
-        <PackageReference Update="NuGet.Packaging" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.Common" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.Configuration" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.DependencyResolver.Core" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.Frameworks" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.LibraryModel" Version="$(NuGetPackageVersion)" />
         <PackageReference Update="NuGet.Packaging.Core" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.Packaging" Version="$(NuGetPackageVersion)" />
         <PackageReference Update="NuGet.ProjectModel" Version="$(NuGetPackageVersion)" />
+        <PackageReference Update="NuGet.Protocol" Version="$(NuGetPackageVersion)" />
         <PackageReference Update="NuGet.Versioning" Version="$(NuGetPackageVersion)" />
 
         <PackageReference Update="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />
@@ -73,6 +79,7 @@
         <PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
         <PackageReference Update="System.ComponentModel.Composition" Version="4.5.0" />
         <PackageReference Update="System.Composition" Version="6.0.0" />
+        <PackageReference Update="System.Configuration.ConfigurationManager" Version="4.5.0" />
         <PackageReference Update="System.Memory" Version="4.5.5" />
         <PackageReference Update="System.Reflection.Metadata" Version="6.0.0" />
         <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
@@ -95,4 +102,3 @@
         <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     </ItemGroup>
 </Project>
-
diff --git a/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj b/src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj
@@ -11,6 +11,7 @@
         <!-- Always run on the latest runtime installed. -->
         <RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
         <RollForward>LatestMajor</RollForward>
+        <SkipHostDlls Condition="'$(TargetFramework)' != 'net472'">true</SkipHostDlls>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj b/src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
@@ -11,6 +11,7 @@
         <!-- Always run on the latest runtime installed. -->
         <RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
         <RollForward>LatestMajor</RollForward>
+        <SkipHostDlls Condition="'$(TargetFramework)' != 'net472'">true</SkipHostDlls>
     </PropertyGroup>
 
     <ItemGroup>