diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.CSharp.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.cs b/dnSpy/Roslyn/dnSpy.Roslyn.CSharp.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.cs
index ad92f61012..9f2ef41dc2 100644
--- a/dnSpy/Roslyn/dnSpy.Roslyn.CSharp.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.cs
+++ b/dnSpy/Roslyn/dnSpy.Roslyn.CSharp.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 using dnSpy.Roslyn.EditorFeatures.Editor;
 using dnSpy.Roslyn.EditorFeatures.Host;
 using dnSpy.Roslyn.EditorFeatures.TextStructureNavigation;
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/Host/WaitIndicator.cs b/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/Host/WaitIndicator.cs
index bd11d04a97..ce121f8a3c 100644
--- a/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/Host/WaitIndicator.cs
+++ b/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/Host/WaitIndicator.cs
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 */
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.Shared.Utilities;
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/SmartIndent/SmartIndentProvider.cs b/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/SmartIndent/SmartIndentProvider.cs
index b2cad11fdb..02d11fa580 100644
--- a/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/SmartIndent/SmartIndentProvider.cs
+++ b/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/SmartIndent/SmartIndentProvider.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel.Composition;
+using System.Composition;
 using dnSpy.Roslyn.EditorFeatures.Editor;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/dnSpy.Roslyn.Internal.csproj b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/dnSpy.Roslyn.Internal.csproj
index bba8f6bf88..150a82266e 100644
--- a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/dnSpy.Roslyn.Internal.csproj
+++ b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/dnSpy.Roslyn.Internal.csproj
@@ -12,7 +12,6 @@
   <Import Project="$(MSBuildProjectDirectory)\..\..\..\Build\MakeEverythingPublic\MakeEverythingPublic.tasks" />
 
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Composition" Version="$(SCCompositionVersion)" Condition=" '$(IsDotNetFramework)' == 'true' " />
     <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(RoslynVersion)" />
   </ItemGroup>
 
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.VisualBasic.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.vb b/dnSpy/Roslyn/dnSpy.Roslyn.VisualBasic.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.vb
index 132281afa2..a2c041f565 100644
--- a/dnSpy/Roslyn/dnSpy.Roslyn.VisualBasic.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.vb
+++ b/dnSpy/Roslyn/dnSpy.Roslyn.VisualBasic.EditorFeatures/TextStructureNavigation/TextStructureNavigatorProvider.vb
@@ -2,7 +2,7 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 ' See the LICENSE file in the project root for more information.
 
-Imports System.ComponentModel.Composition
+Imports System.Composition
 Imports dnSpy.Roslyn.EditorFeatures.Editor
 Imports dnSpy.Roslyn.EditorFeatures.Host
 Imports dnSpy.Roslyn.EditorFeatures.TextStructureNavigation
diff --git a/dnSpy/dnSpy.Contracts.DnSpy/dnSpy.Contracts.DnSpy.csproj b/dnSpy/dnSpy.Contracts.DnSpy/dnSpy.Contracts.DnSpy.csproj
index 0e2990c069..7cc4dc9bd8 100644
--- a/dnSpy/dnSpy.Contracts.DnSpy/dnSpy.Contracts.DnSpy.csproj
+++ b/dnSpy/dnSpy.Contracts.DnSpy/dnSpy.Contracts.DnSpy.csproj
@@ -37,15 +37,6 @@
 
   <ItemGroup>
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="$(OokiiDialogsWpfVersion)" />
-    <!--TODO: This is a workaround for a bug where we get the wrong version of System.Security.Permissions.
-    Microsoft.VisualStudio.Composition.NetFxAttributes and Microsoft.VisualStudio.Composition reference
-    System.ComponentModel.Composition 4.5.0 which references System.Security.Permissions 4.5.0 which has
-    assembly version 4.0.1.0. The runtime has asm version 4.0.2.0. This library is copied to the output dir
-    overwriting the 4.0.2.0 file because CopyLocalLockFileAssemblies=true in DnSpyCommon.props (to prevent
-    us having to publish all extensions).
-    Will probably be fixed after Microsoft.VisualStudio.Composition.NetFxAttributes and Microsoft.VisualStudio.Composition
-    reference a newer System.ComponentModel.Composition nuget in which case this hack can be removed.
-    -->
     <PackageReference Include="System.ComponentModel.Composition" Version="$(SCCompositionVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MSVSIntellisenseVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MSVSTextVersion)" />