Fix ILanguageService (#1442)

ChangeLog.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix analyzer [RCS1077](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1077) ([PR](https://github.com/dotnet/roslynator/pull/1428))
+- Fix export of `ILanguageService` ([PR](https://github.com/dotnet/roslynator/pull/1442))
 
 ## [4.12.0] - 2024-03-19
 

src/CSharp.Workspaces/CSharp/CSharpSyntaxFactsService.cs

@@ -1,16 +1,13 @@
 // Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Composition;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Roslynator.CSharp;
 
 namespace Roslynator.CSharp;
 
-[Export(typeof(ILanguageService))]
-[ExportMetadata("Language", LanguageNames.CSharp)]
-[ExportMetadata("ServiceType", "Roslynator.ISyntaxFactsService")]
+[ExportLanguageService(typeof(ISyntaxFactsService), LanguageNames.CSharp)]
 internal sealed class CSharpSyntaxFactsService : ISyntaxFactsService
 {
     public static CSharpSyntaxFactsService Instance { get; } = new();

src/CSharp.Workspaces/CSharp/CodeMetrics/CSharpCodeMetricsService.cs

@@ -1,17 +1,14 @@
 // Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 using Roslynator.CodeMetrics;
 
 namespace Roslynator.CSharp.CodeMetrics;
 
-[Export(typeof(ILanguageService))]
-[ExportMetadata("Language", LanguageNames.CSharp)]
-[ExportMetadata("ServiceType", "Roslynator.CodeMetrics.ICodeMetricsService")]
+[ExportLanguageService(typeof(ICodeMetricsService), LanguageNames.CSharp)]
 internal class CSharpCodeMetricsService : CodeMetricsService
 {
     public override ISyntaxFactsService SyntaxFacts => CSharpSyntaxFactsService.Instance;

src/CSharp.Workspaces/CSharp/FindSymbols/CSharpFindSymbolService.cs

@@ -1,18 +1,15 @@
 // Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Immutable;
-using System.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Roslynator.FindSymbols;
 
 namespace Roslynator.CSharp.FindSymbols;
 
-[Export(typeof(ILanguageService))]
-[ExportMetadata("Language", LanguageNames.CSharp)]
-[ExportMetadata("ServiceType", "Roslynator.FindSymbols.IFindSymbolService")]
+[ExportLanguageService(typeof(IFindSymbolService), LanguageNames.CSharp)]
 internal class CSharpFindSymbolService : FindSymbolService
 {
     public override ISyntaxFactsService SyntaxFacts => CSharpSyntaxFactsService.Instance;

src/CSharp.Workspaces/CSharp/Spelling/CSharpSpellingService.cs

@@ -3,21 +3,18 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Composition;
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 using Roslynator.Spelling;
 
 namespace Roslynator.CSharp.Spelling;
 
-[Export(typeof(ILanguageService))]
-[ExportMetadata("Language", LanguageNames.CSharp)]
-[ExportMetadata("ServiceType", "Roslynator.Spelling.ISpellingService")]
+[ExportLanguageService(typeof(ISpellingService), LanguageNames.CSharp)]
 internal partial class CSharpSpellingService : SpellingService
 {
     public override ISyntaxFactsService SyntaxFacts => CSharpSyntaxFactsService.Instance;

src/VisualBasic.Workspaces/VisualBasic/CodeMetrics/VisualBasicCodeMetricsService.cs

@@ -1,17 +1,14 @@
 // Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Composition;
 using System.Threading;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 using Roslynator.CodeMetrics;
 
 namespace Roslynator.VisualBasic.CodeMetrics;
 
-[Export(typeof(ILanguageService))]
-[ExportMetadata("Language", LanguageNames.VisualBasic)]
-[ExportMetadata("ServiceType", "Roslynator.CodeMetrics.ICodeMetricsService")]
+[ExportLanguageService(typeof(ICodeMetricsService), LanguageNames.VisualBasic)]
 internal class VisualBasicCodeMetricsService : CodeMetricsService
 {
     public override ISyntaxFactsService SyntaxFacts => VisualBasicSyntaxFactsService.Instance;

src/VisualBasic.Workspaces/VisualBasic/VisualBasicSyntaxFactsService.cs

@@ -1,16 +1,13 @@
 // Copyright (c) .NET Foundation and Contributors. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Composition;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.VisualBasic;
 
 namespace Roslynator.VisualBasic;
 
-[Export(typeof(ILanguageService))]
-[ExportMetadata("Language", LanguageNames.VisualBasic)]
-[ExportMetadata("ServiceType", "Roslynator.ISyntaxFactsService")]
+[ExportLanguageService(typeof(ISyntaxFactsService), LanguageNames.VisualBasic)]
 internal sealed class VisualBasicSyntaxFactsService : ISyntaxFactsService
 {
     public static VisualBasicSyntaxFactsService Instance { get; } = new();