Skip to content

Host dependency cleanup #2436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filipw merged 4 commits into from
Sep 22, 2022
Merged

Host dependency cleanup #2436

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efeafec
Host dependency cleanup
333fred Aug 14, 2022
ede02db
Use ExcludeAssets and PrivateAssets instead
333fred Aug 20, 2022
13a7a19
Condition removals.
333fred Aug 26, 2022
a6e5fbd
Merge branch 'master' into dependency-cleanup
filipw Sep 20, 2022
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
14 changes: 14 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'">
Comment thread
333fred marked this conversation as resolved.
<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>
14 changes: 0 additions & 14 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 8 additions & 2 deletions build/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,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" />
Expand All @@ -79,6 +85,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.Reflection.Metadata" Version="6.0.0" />
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand All @@ -94,4 +101,3 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>

1 change: 1 addition & 0 deletions src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<!-- Always run on the latest runtime installed. -->
<RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
<RollForward>LatestMajor</RollForward>
<SkipHostDlls>true</SkipHostDlls>
Copy link
Copy Markdown
Member

@JoeRobich JoeRobich Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We weren't removing these libraries from the Full Framework builds. Should this be conditioned by TFM?

</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<!-- Always run on the latest runtime installed. -->
<RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
<RollForward>LatestMajor</RollForward>
<SkipHostDlls>true</SkipHostDlls>
</PropertyGroup>

<ItemGroup>
Expand Down