diff --git a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
index 7d1208b65..afaff06d1 100644
--- a/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
+++ b/ILSpy.BamlDecompiler/ILSpy.BamlDecompiler.csproj
@@ -32,12 +32,12 @@
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="6.0.0" />
+    <PackageReference Include="System.Composition" Version="1.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ILSpy/AboutPage.cs b/ILSpy/AboutPage.cs
index ca85a1c0d..8c2415801 100644
--- a/ILSpy/AboutPage.cs
+++ b/ILSpy/AboutPage.cs
@@ -19,7 +19,6 @@
 using System;
 using System.ComponentModel;
 using System.ComponentModel.Composition;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -44,7 +43,7 @@ namespace ICSharpCode.ILSpy
 	{
 		[Import]
 		DecompilerTextView decompilerTextView = null;
-		
+
 		public override void Execute(object parameter)
 		{
 			MainWindow.Instance.UnselectAll();
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index d97b697dd..530547711 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -50,7 +50,8 @@
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="6.0.0" />
     <PackageReference Include="Dirkster.AvalonDock" Version="3.5.12" />
-    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="15.5.23" />
+    <PackageReference Include="Microsoft.VisualStudio.Composition" Version="16.3.7" />
+    <PackageReference Include="System.Composition" Version="1.3.0" />
     <PackageReference Include="Mono.Cecil" Version="0.10.3" />
     <PackageReference Include="OSVersionHelper" Version="1.0.11" />
   </ItemGroup>