From 15cd4bfc354aa1f38f01608c060e48732d79a0e3 Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Wed, 6 Dec 2017 14:33:00 -0800 Subject: [PATCH] Move RS0006 and RS0013 back to Roslyn.Diagnostics.Analyzers Fixes #1436 --- .../Core/Composition/DiagnosticCategory.cs | 7 - ...icrosoftCompositionAnalyzersResources.resx | 142 ------------------ ...rosoftCompositionAnalyzersResources.cs.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.de.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.es.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.fr.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.it.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.ja.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.ko.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.pl.xlf | 42 ------ ...oftCompositionAnalyzersResources.pt-BR.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.ru.xlf | 42 ------ ...rosoftCompositionAnalyzersResources.tr.xlf | 42 ------ ...tCompositionAnalyzersResources.zh-Hans.xlf | 42 ------ ...tCompositionAnalyzersResources.zh-Hant.xlf | 42 ------ ...ributesFromDifferentVersionsOfMEF.Fixer.cs | 4 +- ...rtedWithMEFv2MustBeMarkedAsShared.Fixer.cs | 4 +- ...ributesFromDifferentVersionsOfMEF.Fixer.cs | 4 +- ...MixAttributesFromDifferentVersionsOfMEF.cs | 12 +- ...rtedWithMEFv2MustBeMarkedAsShared.Fixer.cs | 4 +- ...tsExportedWithMEFv2MustBeMarkedAsShared.cs | 12 +- .../Core/RoslynDiagnosticIds.cs | 4 +- .../RoslynDiagnosticsAnalyzersResources.resx | 18 +++ ...RoslynDiagnosticsAnalyzersResources.cs.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.de.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.es.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.fr.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.it.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.ja.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.ko.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.pl.xlf | 30 ++++ ...lynDiagnosticsAnalyzersResources.pt-BR.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.ru.xlf | 30 ++++ ...RoslynDiagnosticsAnalyzersResources.tr.xlf | 30 ++++ ...nDiagnosticsAnalyzersResources.zh-Hans.xlf | 30 ++++ ...nDiagnosticsAnalyzersResources.zh-Hant.xlf | 30 ++++ ...esFromDifferentVersionsOfMEFTests.Fixer.cs | 6 +- ...tributesFromDifferentVersionsOfMEFTests.cs | 10 +- ...ithMEFv2MustBeMarkedAsSharedTests.Fixer.cs | 6 +- ...ortedWithMEFv2MustBeMarkedAsSharedTests.cs | 10 +- ...ributesFromDifferentVersionsOfMEF.Fixer.vb | 4 +- ...rtedWithMEFv2MustBeMarkedAsShared.Fixer.vb | 4 +- 42 files changed, 448 insertions(+), 739 deletions(-) delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/DiagnosticCategory.cs delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/MicrosoftCompositionAnalyzersResources.resx delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.cs.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.de.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.es.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.fr.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.it.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ja.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ko.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pl.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pt-BR.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ru.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.tr.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hans.xlf delete mode 100644 src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hant.xlf rename src/{Microsoft.NetCore.Analyzers/CSharp/Composition => Roslyn.Diagnostics.Analyzers/CSharp}/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs (84%) rename src/{Microsoft.NetCore.Analyzers/CSharp/Composition => Roslyn.Diagnostics.Analyzers/CSharp}/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs (84%) rename src/{Microsoft.NetCore.Analyzers/Core/Composition => Roslyn.Diagnostics.Analyzers/Core}/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs (87%) rename src/{Microsoft.NetCore.Analyzers/Core/Composition => Roslyn.Diagnostics.Analyzers/Core}/DoNotMixAttributesFromDifferentVersionsOfMEF.cs (88%) rename src/{Microsoft.NetCore.Analyzers/Core/Composition => Roslyn.Diagnostics.Analyzers/Core}/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs (87%) rename src/{Microsoft.NetCore.Analyzers/Core/Composition => Roslyn.Diagnostics.Analyzers/Core}/PartsExportedWithMEFv2MustBeMarkedAsShared.cs (81%) rename src/{Microsoft.NetCore.Analyzers/UnitTests/Composition => Roslyn.Diagnostics.Analyzers/UnitTests}/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs (86%) rename src/{Microsoft.NetCore.Analyzers/UnitTests/Composition => Roslyn.Diagnostics.Analyzers/UnitTests}/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs (96%) rename src/{Microsoft.NetCore.Analyzers/UnitTests/Composition => Roslyn.Diagnostics.Analyzers/UnitTests}/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs (85%) rename src/{Microsoft.NetCore.Analyzers/UnitTests/Composition => Roslyn.Diagnostics.Analyzers/UnitTests}/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs (87%) rename src/{Microsoft.NetCore.Analyzers/VisualBasic/Composition => Roslyn.Diagnostics.Analyzers/VisualBasic}/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb (84%) rename src/{Microsoft.NetCore.Analyzers/VisualBasic/Composition => Roslyn.Diagnostics.Analyzers/VisualBasic}/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb (84%) diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/DiagnosticCategory.cs b/src/Microsoft.NetCore.Analyzers/Core/Composition/DiagnosticCategory.cs deleted file mode 100644 index c9b67bafe3..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/DiagnosticCategory.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.NetCore.Analyzers.Composition -{ - internal static class DiagnosticCategory - { public static readonly string Reliability = MicrosoftCompositionAnalyzersResources.CategoryReliability; } -} \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/MicrosoftCompositionAnalyzersResources.resx b/src/Microsoft.NetCore.Analyzers/Core/Composition/MicrosoftCompositionAnalyzersResources.resx deleted file mode 100644 index f44a8c8365..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/MicrosoftCompositionAnalyzersResources.resx +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Do not mix attributes from different versions of MEF - - - Do not mix attributes from different versions of MEF - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - - - Parts exported with MEFv2 must be marked as Shared - - - Part exported with MEFv2 must be marked with the Shared attribute. - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - - - Reliability - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.cs.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.cs.xlf deleted file mode 100644 index fa85adc9a8..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.cs.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Nekombinujte atributy z různých verzí rozhraní MEF. - - - - Do not mix attributes from different versions of MEF - Nekombinujte atributy z různých verzí rozhraní MEF. - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - Atribut {0} pochází z jiné verze rozhraní MEF než atribut exportu u {1}. - - - - Parts exported with MEFv2 must be marked as Shared - Části exportované pomocí rozhraní MEFv2 musí být označené jako sdílené. - - - - Part exported with MEFv2 must be marked with the Shared attribute. - Část exportovaná pomocí rozhraní MEFv2 musí být označená atributem Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - Část {0} je exportovaná pomocí rozhraní MEFv2 a musí být proto označená jako sdílená. - - - - Reliability - Spolehlivost - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.de.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.de.xlf deleted file mode 100644 index 022fc832cb..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.de.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Keine Attribute aus verschiedenen Versionen des MEF kombinieren - - - - Do not mix attributes from different versions of MEF - Keine Attribute aus verschiedenen Versionen des MEF kombinieren - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - Das Attribut "{0}" stammt aus einer anderen Version des MEF als das Exportattribut für "{1}". - - - - Parts exported with MEFv2 must be marked as Shared - Mit MEFv2 exportierte Teile müssen als "Shared" markiert werden - - - - Part exported with MEFv2 must be marked with the Shared attribute. - Ein mit MEFv2 exportiertes Teil muss mit dem Shared-Attribut markiert werden. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - "{0}" wurde mit MEFv2 exportiert und muss daher als "Shared" markiert werden. - - - - Reliability - Zuverlässigkeit - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.es.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.es.xlf deleted file mode 100644 index cdb4df725d..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.es.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - No se deben mezclar atributos de distintas versiones de MEF - - - - Do not mix attributes from different versions of MEF - No se deben mezclar atributos de distintas versiones de MEF. - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - El atributo “{0}” procede de una versión de MEF distinta a la del atributo de exportación en “{1}”. - - - - Parts exported with MEFv2 must be marked as Shared - Las partes exportadas con MEFv2 deben marcarse como Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - Las partes exportadas con MEFv2 deben marcarse con el atributo Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - “{0}” se exporta con MEFv2 y, por lo tanto, debe marcarse como Shared. - - - - Reliability - Confiabilidad - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.fr.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.fr.xlf deleted file mode 100644 index 8062552030..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.fr.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Ne pas mélanger les attributs de différentes versions de MEF - - - - Do not mix attributes from different versions of MEF - Ne pas mélanger les attributs de différentes versions de MEF - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - L'attribut '{0}' provient d'une autre version de MEF que l'attribut d'exportation sur '{1}' - - - - Parts exported with MEFv2 must be marked as Shared - Les parties exportées avec MEFv2 doivent être marquées comme étant Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - La partie exportée avec MEFv2 doit être marquée avec l'attribut Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}' est exporté avec MEFv2 et doit donc être marqué comme étant Shared - - - - Reliability - Fiabilité - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.it.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.it.xlf deleted file mode 100644 index 03bd18a82b..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.it.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Non combinare attributi di versioni diverse di MEF - - - - Do not mix attributes from different versions of MEF - Non combinare attributi di versioni diverse di MEF - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - L'attributo '{0}' proviene da una versione di MEF diversa rispetto all'attributo export su '{1}' - - - - Parts exported with MEFv2 must be marked as Shared - Le parti esportate con MEFv2 devono essere contrassegnate come Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - La parte esportata con MEFv2 deve essere contrassegnata con l'attributo Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}' viene esportato con MEFv2 e di conseguenza deve essere contrassegnato come Shared - - - - Reliability - Affidabilità - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ja.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ja.xlf deleted file mode 100644 index 8485f5dc40..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ja.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - 複数のバージョンの MEF の属性を混用しないでください - - - - Do not mix attributes from different versions of MEF - 複数のバージョンの MEF の属性を混用しないでください - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - 属性 '{0}' は、'{1}' のエクスポート属性とは別のバージョンの MEF の属性です - - - - Parts exported with MEFv2 must be marked as Shared - MEFv2 でエクスポートされたパーツは、共有としてマークする必要があります - - - - Part exported with MEFv2 must be marked with the Shared attribute. - MEFv2 でエクスポートされたパーツは、共有属性でマークする必要があります。 - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}' は MEFv2 でエクスポートされるため、共有としてマークする必要があります - - - - Reliability - 信頼性 - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ko.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ko.xlf deleted file mode 100644 index 5223ccf492..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ko.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - 다른 버전의 MEF 특성을 조합하지 마세요. - - - - Do not mix attributes from different versions of MEF - 다른 버전의 MEF 특성을 조합하지 마세요. - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - '{0}' 특성은 '{1}'의 export 특성이 아닌 다른 버전의 MEF에서 가져온 것입니다. - - - - Parts exported with MEFv2 must be marked as Shared - MEFv2를 통해 내보낸 파트는 Shared로 표시되어야 합니다. - - - - Part exported with MEFv2 must be marked with the Shared attribute. - MEFv2를 통해 내보낸 파트는 Shared 특성으로 표시되어야 합니다. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}'을(를) MEFv2를 통해 내보냈으므로 Shared로 표시해야 합니다. - - - - Reliability - 안정성 - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pl.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pl.xlf deleted file mode 100644 index 24a464a0d7..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pl.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Nie mieszaj atrybutów z różnych wersji MEF - - - - Do not mix attributes from different versions of MEF - Nie mieszaj atrybutów z różnych wersji MEF - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - Atrybut „{0}” pochodzi z innej wersji MEF niż atrybut eksportu „{1}” - - - - Parts exported with MEFv2 must be marked as Shared - Części wyeksportowane z MEFv2 muszą być oznaczone jako udostępnione - - - - Part exported with MEFv2 must be marked with the Shared attribute. - Część wyeksportowana z MEFv2 musi być oznaczona atrybutem Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - Element „{0}” jest eksportowany z MEFv2, a więc musi być oznaczony jako udostępniony - - - - Reliability - Niezawodność - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pt-BR.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pt-BR.xlf deleted file mode 100644 index ad8b42992c..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.pt-BR.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Não combinar atributos de versões diferentes de MEF - - - - Do not mix attributes from different versions of MEF - Não combinar atributos de versões diferentes de MEF - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - O atributo '{0}' vem de uma versão diferente de MEF do que o atributo de exportação em '{1}' - - - - Parts exported with MEFv2 must be marked as Shared - As partes exportadas com MEFv2 devem ser marcadas como Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - A parte exportada com MEFv2 deve ser marcada com o atributo Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}' é exportado com MEFv2 e, portanto, deve ser marcado com Shared - - - - Reliability - Confiabilidade - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ru.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ru.xlf deleted file mode 100644 index 5438cb0387..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.ru.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Не смешивайте атрибуты из разных версий MEF - - - - Do not mix attributes from different versions of MEF - Не смешивайте атрибуты из разных версий MEF - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - Атрибут "{0}" отличается версией MEF от атрибута экспорта в "{1}" - - - - Parts exported with MEFv2 must be marked as Shared - Части, экспортированные с помощью MEF версии 2, должны быть помечены как Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - Часть, экспортированная с помощью MEF версии 2, должна быть помечена с помощью атрибута Shared. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - "{0}" экспортируется с помощью MEF версии 2 и поэтому должна быть помечена как Shared - - - - Reliability - Надежность - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.tr.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.tr.xlf deleted file mode 100644 index 8a0d772747..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.tr.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - Farklı MEF sürümlerine ait öznitelikleri karışık kullanmayın - - - - Do not mix attributes from different versions of MEF - Farklı MEF sürümlerine ait öznitelikleri karışık kullanmayın - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - '{0}' özniteliği, '{1}' üzerindeki dışarı aktarma özniteliğinden farklı bir MEF sürümüne ait - - - - Parts exported with MEFv2 must be marked as Shared - MEFv2 ile dışarı aktarılan parçalar Shared olarak işaretlenmelidir - - - - Part exported with MEFv2 must be marked with the Shared attribute. - MEFv2 ile dışarı aktarılan parçalar Shared özniteliğiyle işaretlenmelidir. - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}' MEFv2 ile dışarı aktarıldığından, Shared olarak işaretlenmelidir - - - - Reliability - Güvenilirlik - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hans.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hans.xlf deleted file mode 100644 index 251903ebf2..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hans.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - 切勿混合不同版本 MEF 中的属性 - - - - Do not mix attributes from different versions of MEF - 切勿混合不同版本 MEF 中的属性 - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - 属性“{0}”来自与“{1}”上的导出属性不同的 MEF 版本 - - - - Parts exported with MEFv2 must be marked as Shared - 通过 MEFv2 导出的部件必须标记为 Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - 通过 MEFv2 导出的部件必须标记为 Shared 属性。 - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - “{0}”是通过 MEFv2 导出的，因此必须标记为 Shared - - - - Reliability - 可靠性 - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hant.xlf b/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hant.xlf deleted file mode 100644 index 70242022c8..0000000000 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/xlf/MicrosoftCompositionAnalyzersResources.zh-Hant.xlf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - Do not mix attributes from different versions of MEF - 請勿混合來自不同 MEF 版本的屬性 - - - - Do not mix attributes from different versions of MEF - 請勿混合來自不同 MEF 版本的屬性 - - - - Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' - 屬性 '{0}' 來自與 '{1}' 上的匯出屬性不同的 MEF 版本 - - - - Parts exported with MEFv2 must be marked as Shared - 使用 MEFv2 匯出的部分必須標記為 Shared - - - - Part exported with MEFv2 must be marked with the Shared attribute. - 使用 MEFv2 匯出的部分必須標記為 Shared 屬性。 - - - - '{0}' is exported with MEFv2 and hence must be marked as Shared - '{0}' 以 MEFv2 所匯出，因此必須標記為「共用」 - - - - Reliability - 可靠性 - - - - - \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/CSharp/Composition/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs b/src/Roslyn.Diagnostics.Analyzers/CSharp/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs similarity index 84% rename from src/Microsoft.NetCore.Analyzers/CSharp/Composition/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs rename to src/Roslyn.Diagnostics.Analyzers/CSharp/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs index 707e055fd7..b148176e95 100644 --- a/src/Microsoft.NetCore.Analyzers/CSharp/Composition/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs +++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/CSharpDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs @@ -3,9 +3,9 @@ using System.Composition; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeFixes; -using Microsoft.NetCore.Analyzers.Composition; +using Roslyn.Diagnostics.Analyzers; -namespace Microsoft.NetCore.CSharp.Analyzers.Composition +namespace Roslyn.Diagnostics.CSharp.Analyzers { /// /// RS0006: Do not mix attributes from different versions of MEF diff --git a/src/Microsoft.NetCore.Analyzers/CSharp/Composition/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs b/src/Roslyn.Diagnostics.Analyzers/CSharp/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs similarity index 84% rename from src/Microsoft.NetCore.Analyzers/CSharp/Composition/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs rename to src/Roslyn.Diagnostics.Analyzers/CSharp/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs index 915cb396bd..e74ebf1fe5 100644 --- a/src/Microsoft.NetCore.Analyzers/CSharp/Composition/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs +++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/CSharpPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs @@ -3,9 +3,9 @@ using System.Composition; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CodeFixes; -using Microsoft.NetCore.Analyzers.Composition; +using Roslyn.Diagnostics.Analyzers; -namespace Microsoft.NetCore.CSharp.Analyzers.Composition +namespace Roslyn.Diagnostics.CSharp.Analyzers { /// /// RS0023: Parts exported with MEFv2 must be marked as Shared diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs b/src/Roslyn.Diagnostics.Analyzers/Core/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs similarity index 87% rename from src/Microsoft.NetCore.Analyzers/Core/Composition/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs rename to src/Roslyn.Diagnostics.Analyzers/Core/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs index e2e243d9f3..d19e6708cb 100644 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs +++ b/src/Roslyn.Diagnostics.Analyzers/Core/DoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.cs @@ -5,14 +5,14 @@ using System.Collections.Immutable; using System.Threading.Tasks; -namespace Microsoft.NetCore.Analyzers.Composition +namespace Roslyn.Diagnostics.Analyzers { /// /// RS0006: Do not mix attributes from different versions of MEF /// public abstract class DoNotMixAttributesFromDifferentVersionsOfMEFFixer : CodeFixProvider { - public sealed override ImmutableArray FixableDiagnosticIds => ImmutableArray.Create(DoNotMixAttributesFromDifferentVersionsOfMEFAnalyzer.RuleId); + public sealed override ImmutableArray FixableDiagnosticIds => ImmutableArray.Create(RoslynDiagnosticIds.MixedVersionsOfMefAttributesRuleId); public sealed override FixAllProvider GetFixAllProvider() { diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/DoNotMixAttributesFromDifferentVersionsOfMEF.cs b/src/Roslyn.Diagnostics.Analyzers/Core/DoNotMixAttributesFromDifferentVersionsOfMEF.cs similarity index 88% rename from src/Microsoft.NetCore.Analyzers/Core/Composition/DoNotMixAttributesFromDifferentVersionsOfMEF.cs rename to src/Roslyn.Diagnostics.Analyzers/Core/DoNotMixAttributesFromDifferentVersionsOfMEF.cs index 43d4e9f502..82fa905ae5 100644 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/DoNotMixAttributesFromDifferentVersionsOfMEF.cs +++ b/src/Roslyn.Diagnostics.Analyzers/Core/DoNotMixAttributesFromDifferentVersionsOfMEF.cs @@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; -namespace Microsoft.NetCore.Analyzers.Composition +namespace Roslyn.Diagnostics.Analyzers { /// /// RS0006: Do not mix attributes from different versions of MEF @@ -17,14 +17,12 @@ namespace Microsoft.NetCore.Analyzers.Composition [DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic)] public sealed class DoNotMixAttributesFromDifferentVersionsOfMEFAnalyzer : DiagnosticAnalyzer { - internal const string RuleId = "RS0006"; + private static readonly LocalizableString s_localizableTitle = new LocalizableResourceString(nameof(RoslynDiagnosticsAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFTitle), RoslynDiagnosticsAnalyzersResources.ResourceManager, typeof(RoslynDiagnosticsAnalyzersResources)); - private static readonly LocalizableString s_localizableTitle = new LocalizableResourceString(nameof(MicrosoftCompositionAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFTitle), MicrosoftCompositionAnalyzersResources.ResourceManager, typeof(MicrosoftCompositionAnalyzersResources)); + private static readonly LocalizableString s_localizableMessage = new LocalizableResourceString(nameof(RoslynDiagnosticsAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFMessage), RoslynDiagnosticsAnalyzersResources.ResourceManager, typeof(RoslynDiagnosticsAnalyzersResources)); + private static readonly LocalizableString s_localizableDescription = new LocalizableResourceString(nameof(RoslynDiagnosticsAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFDescription), RoslynDiagnosticsAnalyzersResources.ResourceManager, typeof(RoslynDiagnosticsAnalyzersResources)); - private static readonly LocalizableString s_localizableMessage = new LocalizableResourceString(nameof(MicrosoftCompositionAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFMessage), MicrosoftCompositionAnalyzersResources.ResourceManager, typeof(MicrosoftCompositionAnalyzersResources)); - private static readonly LocalizableString s_localizableDescription = new LocalizableResourceString(nameof(MicrosoftCompositionAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFDescription), MicrosoftCompositionAnalyzersResources.ResourceManager, typeof(MicrosoftCompositionAnalyzersResources)); - - internal static DiagnosticDescriptor Rule = new DiagnosticDescriptor(RuleId, + internal static DiagnosticDescriptor Rule = new DiagnosticDescriptor(RoslynDiagnosticIds.MixedVersionsOfMefAttributesRuleId, s_localizableTitle, s_localizableMessage, DiagnosticCategory.Reliability, diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs b/src/Roslyn.Diagnostics.Analyzers/Core/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs similarity index 87% rename from src/Microsoft.NetCore.Analyzers/Core/Composition/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs rename to src/Roslyn.Diagnostics.Analyzers/Core/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs index 134ad8e064..585ea2bba1 100644 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs +++ b/src/Roslyn.Diagnostics.Analyzers/Core/PartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.cs @@ -5,14 +5,14 @@ using System.Collections.Immutable; using System.Threading.Tasks; -namespace Microsoft.NetCore.Analyzers.Composition +namespace Roslyn.Diagnostics.Analyzers { /// /// RS0023: Parts exported with MEFv2 must be marked as Shared /// public abstract class PartsExportedWithMEFv2MustBeMarkedAsSharedFixer : CodeFixProvider { - public sealed override ImmutableArray FixableDiagnosticIds => ImmutableArray.Create(PartsExportedWithMEFv2MustBeMarkedAsSharedAnalyzer.RuleId); + public sealed override ImmutableArray FixableDiagnosticIds => ImmutableArray.Create(RoslynDiagnosticIds.MissingSharedAttributeRuleId); public sealed override FixAllProvider GetFixAllProvider() { diff --git a/src/Microsoft.NetCore.Analyzers/Core/Composition/PartsExportedWithMEFv2MustBeMarkedAsShared.cs b/src/Roslyn.Diagnostics.Analyzers/Core/PartsExportedWithMEFv2MustBeMarkedAsShared.cs similarity index 81% rename from src/Microsoft.NetCore.Analyzers/Core/Composition/PartsExportedWithMEFv2MustBeMarkedAsShared.cs rename to src/Roslyn.Diagnostics.Analyzers/Core/PartsExportedWithMEFv2MustBeMarkedAsShared.cs index 2d8dcf3c69..d4418be71d 100644 --- a/src/Microsoft.NetCore.Analyzers/Core/Composition/PartsExportedWithMEFv2MustBeMarkedAsShared.cs +++ b/src/Roslyn.Diagnostics.Analyzers/Core/PartsExportedWithMEFv2MustBeMarkedAsShared.cs @@ -7,7 +7,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Diagnostics; -namespace Microsoft.NetCore.Analyzers.Composition +namespace Roslyn.Diagnostics.Analyzers { /// /// RS0023: Parts exported with MEFv2 must be marked as Shared @@ -15,14 +15,12 @@ namespace Microsoft.NetCore.Analyzers.Composition [DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic)] public sealed class PartsExportedWithMEFv2MustBeMarkedAsSharedAnalyzer : DiagnosticAnalyzer { - internal const string RuleId = "RS0023"; + private static readonly LocalizableString s_localizableTitle = new LocalizableResourceString(nameof(RoslynDiagnosticsAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedTitle), RoslynDiagnosticsAnalyzersResources.ResourceManager, typeof(RoslynDiagnosticsAnalyzersResources)); - private static readonly LocalizableString s_localizableTitle = new LocalizableResourceString(nameof(MicrosoftCompositionAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedTitle), MicrosoftCompositionAnalyzersResources.ResourceManager, typeof(MicrosoftCompositionAnalyzersResources)); + private static readonly LocalizableString s_localizableMessage = new LocalizableResourceString(nameof(RoslynDiagnosticsAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedMessage), RoslynDiagnosticsAnalyzersResources.ResourceManager, typeof(RoslynDiagnosticsAnalyzersResources)); + private static readonly LocalizableString s_localizableDescription = new LocalizableResourceString(nameof(RoslynDiagnosticsAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedDescription), RoslynDiagnosticsAnalyzersResources.ResourceManager, typeof(RoslynDiagnosticsAnalyzersResources)); - private static readonly LocalizableString s_localizableMessage = new LocalizableResourceString(nameof(MicrosoftCompositionAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedMessage), MicrosoftCompositionAnalyzersResources.ResourceManager, typeof(MicrosoftCompositionAnalyzersResources)); - private static readonly LocalizableString s_localizableDescription = new LocalizableResourceString(nameof(MicrosoftCompositionAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedDescription), MicrosoftCompositionAnalyzersResources.ResourceManager, typeof(MicrosoftCompositionAnalyzersResources)); - - internal static DiagnosticDescriptor Rule = new DiagnosticDescriptor(RuleId, + internal static DiagnosticDescriptor Rule = new DiagnosticDescriptor(RoslynDiagnosticIds.MissingSharedAttributeRuleId, s_localizableTitle, s_localizableMessage, DiagnosticCategory.Reliability, diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticIds.cs b/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticIds.cs index 75159816f7..52368f276d 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticIds.cs +++ b/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticIds.cs @@ -9,7 +9,7 @@ internal static class RoslynDiagnosticIds // public const string DirectlyAwaitingTaskAnalyzerRuleId = "RS0003"; // Now CA2007 => Microsoft.ApiDesignGuidelines.Analyzers.DoNotDirectlyAwaitATaskAnalyzer public const string UseSiteDiagnosticsCheckerRuleId = "RS0004"; public const string DoNotUseCodeActionCreateRuleId = "RS0005"; - // public const string MixedVersionsOfMefAttributesRuleId = "RS0006"; // Now RS0006 => Microsoft.Composition.Analyzers.DoNotMixAttributesFromDifferentVersionsOfMEFAnalyzer + public const string MixedVersionsOfMefAttributesRuleId = "RS0006"; // public const string UseArrayEmptyRuleId = "RS0007"; // Now CA1825 => System.Runtime.Analyzers.AvoidZeroLengthArrayAllocationsAnalyzer // public const string ImplementIEquatableRuleId = "RS0008"; // Now CA1067 => Microsoft.ApiDesignGuidelines.Analyzers.EquatableAnalyzer // public const string OverrideObjectEqualsRuleId = "RS0009"; // Now CA1815 => Microsoft.ApiDesignGuidelines.Analyzers.OverrideEqualsAndOperatorEqualsOnValueTypesAnalyzer @@ -26,7 +26,7 @@ internal static class RoslynDiagnosticIds // public const string DeadCodeRuleId = "RS0020"; // Now ??? // public const string DeadCodeTriggerRuleId = "RS0021"; // Now ??? public const string ExposedNoninstantiableTypeRuleId = "RS0022"; - // public const string MissingSharedAttributeRuleId = "RS0023"; // Now RS0023 => Microsoft.Composition.Analyzers.PartsExportedWithMEFv2MustBeMarkedAsSharedAnalyzer + public const string MissingSharedAttributeRuleId = "RS0023"; public const string PublicApiFilesInvalid = "RS0024"; public const string DuplicatedSymbolInPublicApiFiles = "RS0025"; public const string AvoidMultipleOverloadsWithOptionalParameters = "RS0026"; diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticsAnalyzersResources.resx b/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticsAnalyzersResources.resx index b54e12f5ca..757b6f762a 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticsAnalyzersResources.resx +++ b/src/Roslyn.Diagnostics.Analyzers/Core/RoslynDiagnosticsAnalyzersResources.resx @@ -232,4 +232,22 @@ Symbol '{0}' violates the backcompat requirement: 'Public API with optional parameter(s) should have the most parameters amongst its public overloads'. See '{1}' for details. + + Do not mix attributes from different versions of MEF + + + Do not mix attributes from different versions of MEF + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + Parts exported with MEFv2 must be marked as Shared + + + Part exported with MEFv2 must be marked with the Shared attribute. + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.cs.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.cs.xlf index 8437b6f95e..707a4485fc 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.cs.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.cs.xlf @@ -192,6 +192,36 @@ Symbol {0} narušuje požadavek na zpětnou kompatibilitu: Veřejné rozhraní API s nepovinnými parametry má mít většinu parametrů mezi svými veřejnými přetíženími. Podrobnosti najdete zde: {1}. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.de.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.de.xlf index 6ae0f306f8..7d13f8974f 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.de.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.de.xlf @@ -192,6 +192,36 @@ Das Symbol "{0}" verstößt gegen die Anforderung der Abwärtskompatibilität: Die öffentliche API mit optionalen Parametern muss die meisten Parameter bei den öffentlichen Überladungen aufweisen. Informationen hierzu finden Sie unter "{1}". + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.es.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.es.xlf index 7b7cfc67ee..8884e23cff 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.es.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.es.xlf @@ -192,6 +192,36 @@ El símbolo "{0}" no cumple con el requisito de compatibilidad con versiones anteriores: "La API pública con parámetros opcionales debe tener la mayoría de parámetros entre sus sobrecargas públicas". Vea "{1}" para obtener más información. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.fr.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.fr.xlf index fb9cbb7825..1852edf996 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.fr.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.fr.xlf @@ -192,6 +192,36 @@ Le symbole '{0}' viole l'exigence de compatibilité descendante : 'L'API publique avec un ou plusieurs paramètres optionnels doit avoir le plus de paramètres possibles parmi ses surcharges publiques'. Pour plus d'informations, consultez '{1}'. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.it.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.it.xlf index 1e30e60dba..3ea7a820a9 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.it.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.it.xlf @@ -192,6 +192,36 @@ Il simbolo '{0}' viola il requisito di compatibilità con le versioni precedenti: 'L'API pubblica con parametri facoltativi deve includere la maggior parte dei parametri tra i relativi overload public.'. Per informazioni dettagliate, vedere {1}. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ja.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ja.xlf index e53cb1009d..fcaf8deebe 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ja.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ja.xlf @@ -192,6 +192,36 @@ シンボル '{0}' が、下位互換性要件 '省略可能なパラメーターを持つパブリック API には、そのパブリック オーバーロードの中で最も多くのパラメーターが必要です' に違反しています。詳細については、'{1}' を参照してください。 + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ko.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ko.xlf index e68d80f86b..22c737ed86 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ko.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ko.xlf @@ -192,6 +192,36 @@ '{0}' 기호가 backcompat 요구 사항을 위반합니다. '선택적 매개 변수가 있는 공용 API에는 공용 오버로드 중 가장 많은 매개 변수를 보유해야 합니다.' 자세한 내용은 '{1}'을(를) 확인하세요. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pl.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pl.xlf index 92dd8dee68..538bdf54fd 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pl.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pl.xlf @@ -192,6 +192,36 @@ Symbol {0} narusza wymaganie wstecznej zgodności: Publiczny interfejs API z opcjonalnymi parametrami powinien mieć najwięcej parametrów spośród przeciążeń publicznych. Szczegóły zawiera {1}. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pt-BR.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pt-BR.xlf index 13c9181549..3865dca176 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pt-BR.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.pt-BR.xlf @@ -192,6 +192,36 @@ O símbolo '{0}' viola o requisito backcompat: 'A API pública com parâmetros opcionais deve ter a maioria dos parâmetros entre suas sobrecargas públicas'. Consulte '{1}' para obter detalhes. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ru.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ru.xlf index 5a7547541f..849b2836fa 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ru.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.ru.xlf @@ -192,6 +192,36 @@ Символ "{0}" нарушает требование по обратной совместимости: "Общий API с необязательными параметрами должен иметь наибольшее число параметров среди своих общих перегрузок". Дополнительные сведения см. в "{1}". + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.tr.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.tr.xlf index b56f4c5894..132bc97ead 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.tr.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.tr.xlf @@ -192,6 +192,36 @@ '{0}' sembolü geriye dönük uyumluluk gereksinimini ihlal ediyor: 'İsteğe bağlı parametreler içeren ortak API’lerin ortak yüklerinde en fazla parametre olmalıdır'. Ayrıntılar için bkz. '{1}'. + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hans.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hans.xlf index 2f13359805..1f4f57a649 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hans.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hans.xlf @@ -192,6 +192,36 @@ 符号“{0}”违反 BackCompat 要求:“具有可选参数的公共 API 在其公共重载中应具备最多的参数”。有关详细信息，请参阅“{1}”。 + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hant.xlf b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hant.xlf index 74d63ce63c..9c22130726 100644 --- a/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hant.xlf +++ b/src/Roslyn.Diagnostics.Analyzers/Core/xlf/RoslynDiagnosticsAnalyzersResources.zh-Hant.xlf @@ -192,6 +192,36 @@ 符號 '{0}' 違反 BackCompat 需求:「具有選擇性參數的公用 API，在其公用多載之間應有最多的參數」。如需詳細資料，請參閱 '{1}'。 + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Do not mix attributes from different versions of MEF + Do not mix attributes from different versions of MEF + + + + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + Attribute '{0}' comes from a different version of MEF than the export attribute on '{1}' + + + + Parts exported with MEFv2 must be marked as Shared + Parts exported with MEFv2 must be marked as Shared + + + + Part exported with MEFv2 must be marked with the Shared attribute. + Part exported with MEFv2 must be marked with the Shared attribute. + + + + '{0}' is exported with MEFv2 and hence must be marked as Shared + '{0}' is exported with MEFv2 and hence must be marked as Shared + + \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs b/src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs similarity index 86% rename from src/Microsoft.NetCore.Analyzers/UnitTests/Composition/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs rename to src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs index 163dbe08ac..17c23ae0ef 100644 --- a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs +++ b/src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotMixAttributesFromDifferentVersionsOfMEFTests.Fixer.cs @@ -2,11 +2,11 @@ using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.NetCore.CSharp.Analyzers.Composition; -using Microsoft.NetCore.VisualBasic.Analyzers.Composition; +using Roslyn.Diagnostics.CSharp.Analyzers; +using Roslyn.Diagnostics.VisualBasic.Analyzers; using Test.Utilities; -namespace Microsoft.NetCore.Analyzers.Composition.UnitTests +namespace Roslyn.Diagnostics.Analyzers.UnitTests { public class DoNotMixAttributesFromDifferentVersionsOfMEFFixerTests : CodeFixTestBase { diff --git a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs b/src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs similarity index 96% rename from src/Microsoft.NetCore.Analyzers/UnitTests/Composition/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs rename to src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs index 7a21153167..b920de8fc0 100644 --- a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs +++ b/src/Roslyn.Diagnostics.Analyzers/UnitTests/DoNotMixAttributesFromDifferentVersionsOfMEFTests.cs @@ -4,7 +4,7 @@ using Test.Utilities; using Xunit; -namespace Microsoft.NetCore.Analyzers.Composition.UnitTests +namespace Roslyn.Diagnostics.Analyzers.UnitTests { public class DoNotMixAttributesFromDifferentVersionsOfMEFTests : DiagnosticAnalyzerTestBase { @@ -575,14 +575,14 @@ End Class private static new DiagnosticResult GetCSharpResultAt(int line, int column, string attributeName, string typeName) { - var message = string.Format(MicrosoftCompositionAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFMessage, attributeName, typeName); - return DiagnosticAnalyzerTestBase.GetCSharpResultAt(line, column, DoNotMixAttributesFromDifferentVersionsOfMEFAnalyzer.RuleId, message); + var message = string.Format(RoslynDiagnosticsAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFMessage, attributeName, typeName); + return DiagnosticAnalyzerTestBase.GetCSharpResultAt(line, column, RoslynDiagnosticIds.MixedVersionsOfMefAttributesRuleId, message); } private static new DiagnosticResult GetBasicResultAt(int line, int column, string attributeName, string typeName) { - var message = string.Format(MicrosoftCompositionAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFMessage, attributeName, typeName); - return DiagnosticAnalyzerTestBase.GetBasicResultAt(line, column, DoNotMixAttributesFromDifferentVersionsOfMEFAnalyzer.RuleId, message); + var message = string.Format(RoslynDiagnosticsAnalyzersResources.DoNotMixAttributesFromDifferentVersionsOfMEFMessage, attributeName, typeName); + return DiagnosticAnalyzerTestBase.GetBasicResultAt(line, column, RoslynDiagnosticIds.MixedVersionsOfMefAttributesRuleId, message); } } } \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs b/src/Roslyn.Diagnostics.Analyzers/UnitTests/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs similarity index 85% rename from src/Microsoft.NetCore.Analyzers/UnitTests/Composition/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs rename to src/Roslyn.Diagnostics.Analyzers/UnitTests/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs index 7f87d7d326..84d5025317 100644 --- a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs +++ b/src/Roslyn.Diagnostics.Analyzers/UnitTests/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.Fixer.cs @@ -2,11 +2,11 @@ using Microsoft.CodeAnalysis.CodeFixes; using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.NetCore.CSharp.Analyzers.Composition; -using Microsoft.NetCore.VisualBasic.Analyzers.Composition; +using Roslyn.Diagnostics.CSharp.Analyzers; +using Roslyn.Diagnostics.VisualBasic.Analyzers; using Test.Utilities; -namespace Microsoft.NetCore.Analyzers.Composition.UnitTests +namespace Roslyn.Diagnostics.Analyzers.UnitTests { public class PartsExportedWithMEFv2MustBeMarkedAsSharedFixerTests : CodeFixTestBase { diff --git a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs b/src/Roslyn.Diagnostics.Analyzers/UnitTests/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs similarity index 87% rename from src/Microsoft.NetCore.Analyzers/UnitTests/Composition/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs rename to src/Roslyn.Diagnostics.Analyzers/UnitTests/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs index 57d96d508e..afa98391bd 100644 --- a/src/Microsoft.NetCore.Analyzers/UnitTests/Composition/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs +++ b/src/Roslyn.Diagnostics.Analyzers/UnitTests/PartsExportedWithMEFv2MustBeMarkedAsSharedTests.cs @@ -4,7 +4,7 @@ using Test.Utilities; using Xunit; -namespace Microsoft.NetCore.Analyzers.Composition.UnitTests +namespace Roslyn.Diagnostics.Analyzers.UnitTests { public class PartsExportedWithMEFv2MustBeMarkedAsSharedTests : DiagnosticAnalyzerTestBase { @@ -162,14 +162,14 @@ End Class private static DiagnosticResult GetCSharpResultAt(int line, int column, string typeName) { - var message = string.Format(MicrosoftCompositionAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedMessage, typeName); - return GetCSharpResultAt(line, column, PartsExportedWithMEFv2MustBeMarkedAsSharedAnalyzer.RuleId, message); + var message = string.Format(RoslynDiagnosticsAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedMessage, typeName); + return GetCSharpResultAt(line, column, RoslynDiagnosticIds.MissingSharedAttributeRuleId, message); } private static DiagnosticResult GetBasicResultAt(int line, int column, string typeName) { - var message = string.Format(MicrosoftCompositionAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedMessage, typeName); - return GetBasicResultAt(line, column, PartsExportedWithMEFv2MustBeMarkedAsSharedAnalyzer.RuleId, message); + var message = string.Format(RoslynDiagnosticsAnalyzersResources.PartsExportedWithMEFv2MustBeMarkedAsSharedMessage, typeName); + return GetBasicResultAt(line, column, RoslynDiagnosticIds.MissingSharedAttributeRuleId, message); } } } \ No newline at end of file diff --git a/src/Microsoft.NetCore.Analyzers/VisualBasic/Composition/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb similarity index 84% rename from src/Microsoft.NetCore.Analyzers/VisualBasic/Composition/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb rename to src/Roslyn.Diagnostics.Analyzers/VisualBasic/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb index 5cf7ad8e74..849327d788 100644 --- a/src/Microsoft.NetCore.Analyzers/VisualBasic/Composition/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb +++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/BasicDoNotMixAttributesFromDifferentVersionsOfMEF.Fixer.vb @@ -3,9 +3,9 @@ Imports System.Composition Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.NetCore.Analyzers.Composition +Imports Roslyn.Diagnostics.Analyzers -Namespace Microsoft.NetCore.VisualBasic.Analyzers.Composition +Namespace Roslyn.Diagnostics.VisualBasic.Analyzers ''' ''' RS0006: Do not mix attributes from different versions of MEF ''' diff --git a/src/Microsoft.NetCore.Analyzers/VisualBasic/Composition/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb similarity index 84% rename from src/Microsoft.NetCore.Analyzers/VisualBasic/Composition/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb rename to src/Roslyn.Diagnostics.Analyzers/VisualBasic/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb index da13d47aa9..cc0f6b9dc2 100644 --- a/src/Microsoft.NetCore.Analyzers/VisualBasic/Composition/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb +++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/BasicPartsExportedWithMEFv2MustBeMarkedAsShared.Fixer.vb @@ -3,9 +3,9 @@ Imports System.Composition Imports Microsoft.CodeAnalysis Imports Microsoft.CodeAnalysis.CodeFixes -Imports Microsoft.NetCore.Analyzers.Composition +Imports Roslyn.Diagnostics.Analyzers -Namespace Microsoft.NetCore.VisualBasic.Analyzers.Composition +Namespace Roslyn.Diagnostics.VisualBasic.Analyzers ''' ''' RS0023: Parts exported with MEFv2 must be marked as Shared '''