diff --git a/src/Compilers/CSharp/Portable/Binder/Binder_Constraints.cs b/src/Compilers/CSharp/Portable/Binder/Binder_Constraints.cs index a81c1a8bb9a9b..fbde5e72919e8 100644 --- a/src/Compilers/CSharp/Portable/Binder/Binder_Constraints.cs +++ b/src/Compilers/CSharp/Portable/Binder/Binder_Constraints.cs @@ -451,7 +451,7 @@ private static bool IsValidConstraint( if (constraintTypes.Count > 0) { - // "The class type constraint '{0}' must come before any other constraints" + // "The type constraint '{0}' must come before any other constraints" Error(diagnostics, ErrorCode.ERR_ClassBoundNotFirst, syntax, type.Type); return false; } diff --git a/src/Compilers/CSharp/Portable/CSharpResources.resx b/src/Compilers/CSharp/Portable/CSharpResources.resx index 92bed07080910..47ba86ce2c32c 100644 --- a/src/Compilers/CSharp/Portable/CSharpResources.resx +++ b/src/Compilers/CSharp/Portable/CSharpResources.resx @@ -547,7 +547,7 @@ Inconsistent accessibility: parameter type '{1}' is less accessible than delegate '{0}' - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' Inconsistent accessibility: base interface '{1}' is less accessible than interface '{0}' @@ -1138,7 +1138,7 @@ Partial declarations of '{0}' have conflicting accessibility modifiers - Partial declarations of '{0}' must not specify different base classes + Partial declarations of '{0}' must not specify different base types Partial declarations of '{0}' must have the same type parameter names in the same order @@ -1276,7 +1276,7 @@ Duplicate constraint '{0}' for type parameter '{1}' - The class type constraint '{0}' must come before any other constraints + The type constraint '{0}' must come before any other constraints '{1} {0}' has the wrong return type diff --git a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs index 1ed394955d888..3802a8795930a 100644 --- a/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs +++ b/src/Compilers/CSharp/Portable/Symbols/Source/SourceNamedTypeSymbol_Bases.cs @@ -360,7 +360,7 @@ private Tuple> MakeDeclaredBase if (!this.IsNoMoreVisibleThan(baseType, ref useSiteInfo)) { - // Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' + // Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' diagnostics.Add(ErrorCode.ERR_BadVisBaseClass, baseTypeLocation, this, baseType); } } diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf index e59d0378498e5..c3b19d036c16f 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Nekonzistentní dostupnost: Základní třída {1} je míň dostupná než třída {0}. + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Nekonzistentní dostupnost: Základní třída {1} je míň dostupná než třída {0}. @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Částečné deklarace {0} nesmí určovat různé základní třídy. + Partial declarations of '{0}' must not specify different base types + Částečné deklarace {0} nesmí určovat různé základní třídy. @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - Omezení typu třídy {0} musí předcházet všem dalším omezením. + The type constraint '{0}' must come before any other constraints + Omezení typu třídy {0} musí předcházet všem dalším omezením. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf index a7f7daf9c9531..e89a74ac35a27 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Inkonsistenter Zugriff: Basisklasse "{1}" ist weniger zugreifbar als Klasse "{0}". + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Inkonsistenter Zugriff: Basisklasse "{1}" ist weniger zugreifbar als Klasse "{0}". @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Partielle Deklarationen von "{0}" dürfen keine unterschiedlichen Basisklassen angeben. + Partial declarations of '{0}' must not specify different base types + Partielle Deklarationen von "{0}" dürfen keine unterschiedlichen Basisklassen angeben. @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - Die Klassentypeinschränkung "{0}" muss vor allen anderen Einschränkungen stehen. + The type constraint '{0}' must come before any other constraints + Die Klassentypeinschränkung "{0}" muss vor allen anderen Einschränkungen stehen. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf index bf8254701b669..ea7e62b6ec72f 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Incoherencia de accesibilidad: la clase base '{1}' es menos accesible que la clase '{0}' + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Incoherencia de accesibilidad: la clase base '{1}' es menos accesible que la clase '{0}' @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Las declaraciones parciales de '{0}' no deben especificar clases base diferentes + Partial declarations of '{0}' must not specify different base types + Las declaraciones parciales de '{0}' no deben especificar clases base diferentes @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - La restricción de tipo de clase '{0}' debe preceder a cualquier otra restricción + The type constraint '{0}' must come before any other constraints + La restricción de tipo de clase '{0}' debe preceder a cualquier otra restricción diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf index 27851497d9563..252546dbe0313 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Accessibilité incohérente : la classe de base '{1}' est moins accessible que la classe '{0}' + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Accessibilité incohérente : la classe de base '{1}' est moins accessible que la classe '{0}' @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Les déclarations partielles de '{0}' ne doivent pas spécifier des classes de base différentes + Partial declarations of '{0}' must not specify different base types + Les déclarations partielles de '{0}' ne doivent pas spécifier des classes de base différentes @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - La contrainte de type classe '{0}' doit précéder toute autre contrainte + The type constraint '{0}' must come before any other constraints + La contrainte de type classe '{0}' doit précéder toute autre contrainte diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf index 8e618c1df1719..6e1288925502f 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Accessibilità incoerente: la classe base '{1}' è meno accessibile della classe '{0}' + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Accessibilità incoerente: la classe base '{1}' è meno accessibile della classe '{0}' @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Le dichiarazioni parziali di '{0}' non devono specificare classi base diverse + Partial declarations of '{0}' must not specify different base types + Le dichiarazioni parziali di '{0}' non devono specificare classi base diverse @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - Il vincolo di tipo classe '{0}' deve precedere gli altri vincoli + The type constraint '{0}' must come before any other constraints + Il vincolo di tipo classe '{0}' deve precedere gli altri vincoli diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf index b3e7c9c2ea654..a8f6a992f6416 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - アクセシビリティに一貫性がありません。基底クラス '{1}' のアクセシビリティはクラス '{0}' よりも低く設定されています + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + アクセシビリティに一貫性がありません。基底クラス '{1}' のアクセシビリティはクラス '{0}' よりも低く設定されています @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - '{0}' の partial 宣言では、異なる基底クラスを指定してはいけません + Partial declarations of '{0}' must not specify different base types + '{0}' の partial 宣言では、異なる基底クラスを指定してはいけません @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - クラス型制約 '{0}' は、他の制約の前に指定されなければなりません + The type constraint '{0}' must come before any other constraints + クラス型制約 '{0}' は、他の制約の前に指定されなければなりません diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf index b85ec5a5945db..bf8ff90a283e4 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf @@ -3256,8 +3256,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - 일관성 없는 액세스 가능성: '{1}' 기본 클래스가 '{0}' 클래스보다 액세스하기 어렵습니다. + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + 일관성 없는 액세스 가능성: '{1}' 기본 클래스가 '{0}' 클래스보다 액세스하기 어렵습니다. @@ -4156,8 +4156,8 @@ - Partial declarations of '{0}' must not specify different base classes - '{0}'의 partial 선언에는 서로 다른 기본 클래스를 지정할 수 없습니다. + Partial declarations of '{0}' must not specify different base types + '{0}'의 partial 선언에는 서로 다른 기본 클래스를 지정할 수 없습니다. @@ -4366,8 +4366,8 @@ - The class type constraint '{0}' must come before any other constraints - 클래스 형식 제약 조건 '{0}'은(는) 다른 모든 제약 조건보다 앞에 와야 합니다. + The type constraint '{0}' must come before any other constraints + 클래스 형식 제약 조건 '{0}'은(는) 다른 모든 제약 조건보다 앞에 와야 합니다. diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf index e4ffe0585be1f..8419477c65963 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Niespójność dostępności: klasa bazowa „{1}” jest mniej dostępna niż klasa „{0}” + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Niespójność dostępności: klasa bazowa „{1}” jest mniej dostępna niż klasa „{0}” @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Częściowe deklaracje elementu „{0}” nie mogą określać różnych klas bazowych + Partial declarations of '{0}' must not specify different base types + Częściowe deklaracje elementu „{0}” nie mogą określać różnych klas bazowych @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - Ograniczenie typu klasy „{0}” musi występować przed wszystkimi innymi ograniczeniami + The type constraint '{0}' must come before any other constraints + Ograniczenie typu klasy „{0}” musi występować przed wszystkimi innymi ograniczeniami diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf index 96850ee838524..0f77409d013ea 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Acessibilidade inconsistente: classe base "{1}" é menos acessível do que a classe "{0}" + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Acessibilidade inconsistente: classe base "{1}" é menos acessível do que a classe "{0}" @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Declarações parciais de "{0}" não devem especificar classes base diferentes + Partial declarations of '{0}' must not specify different base types + Declarações parciais de "{0}" não devem especificar classes base diferentes @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - A restrição de tipo de classe "{0}" deve vir antes de qualquer outra restrição + The type constraint '{0}' must come before any other constraints + A restrição de tipo de classe "{0}" deve vir antes de qualquer outra restrição diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf index 2c3eac72f5f74..8630ed60f4455 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Несогласованность по доступности: доступность базового класса "{1}" ниже доступности класса "{0}" + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Несогласованность по доступности: доступность базового класса "{1}" ниже доступности класса "{0}" @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - Разделяемые объявления "{0}" не должны указывать различные базовые классы. + Partial declarations of '{0}' must not specify different base types + Разделяемые объявления "{0}" не должны указывать различные базовые классы. @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - Все другие ограничения должны следовать после ограничения типа класса "{0}". + The type constraint '{0}' must come before any other constraints + Все другие ограничения должны следовать после ограничения типа класса "{0}". diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf index f22b18b12866e..923bc30783e10 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - Tutarsız erişilebilirlik: '{1}' temel sınıfı, '{0}' sınıfından daha az erişilebilir + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + Tutarsız erişilebilirlik: '{1}' temel sınıfı, '{0}' sınıfından daha az erişilebilir @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - '{0}' öğesinin kısmi bildirimleri farklı temel sınıflar belirtmemelidir + Partial declarations of '{0}' must not specify different base types + '{0}' öğesinin kısmi bildirimleri farklı temel sınıflar belirtmemelidir @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - '{0}' sınıf türü kısıtlaması tüm diğer kısıtlamalardan önce gelmelidir + The type constraint '{0}' must come before any other constraints + '{0}' sınıf türü kısıtlaması tüm diğer kısıtlamalardan önce gelmelidir diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf index 4c5590fec058c..e8ab2b6779304 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf @@ -3262,8 +3262,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - 可访问性不一致: 基类“{1}”的可访问性低于类“{0}” + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + 可访问性不一致: 基类“{1}”的可访问性低于类“{0}” @@ -4162,8 +4162,8 @@ - Partial declarations of '{0}' must not specify different base classes - “{0}”的分部声明一定不能指定不同的基类 + Partial declarations of '{0}' must not specify different base types + “{0}”的分部声明一定不能指定不同的基类 @@ -4372,8 +4372,8 @@ - The class type constraint '{0}' must come before any other constraints - 类类型约束“{0}”必须在其他任何约束之前 + The type constraint '{0}' must come before any other constraints + 类类型约束“{0}”必须在其他任何约束之前 diff --git a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf index 3761d02b61a95..2e6531ee32186 100644 --- a/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf +++ b/src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf @@ -3257,8 +3257,8 @@ - Inconsistent accessibility: base class '{1}' is less accessible than class '{0}' - 不一致的存取範圍: 基底類別 '{1}' 比類別 '{0}' 的存取範圍小 + Inconsistent accessibility: base type '{1}' is less accessible than type '{0}' + 不一致的存取範圍: 基底類別 '{1}' 比類別 '{0}' 的存取範圍小 @@ -4157,8 +4157,8 @@ - Partial declarations of '{0}' must not specify different base classes - '{0}' 的部分宣告不得指定不同的基底類別 + Partial declarations of '{0}' must not specify different base types + '{0}' 的部分宣告不得指定不同的基底類別 @@ -4367,8 +4367,8 @@ - The class type constraint '{0}' must come before any other constraints - 類別類型條件約束 '{0}' 必須在所有其他條件約束之前 + The type constraint '{0}' must come before any other constraints + 類別類型條件約束 '{0}' 必須在所有其他條件約束之前 diff --git a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs index 109fe86ab86f6..9ad87aed6fe73 100644 --- a/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs +++ b/src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs @@ -20557,10 +20557,10 @@ public partial class C3 : Base<(int a, int b)> { } "; var comp = CreateCompilation(source); comp.VerifyDiagnostics( - // (5,22): error CS0263: Partial declarations of 'C2' must not specify different base classes + // (5,22): error CS0263: Partial declarations of 'C2' must not specify different base types // public partial class C2 : Base<(int a, int b)> { } Diagnostic(ErrorCode.ERR_PartialMultipleBases, "C2").WithArguments("C2").WithLocation(5, 22), - // (3,22): error CS0263: Partial declarations of 'C1' must not specify different base classes + // (3,22): error CS0263: Partial declarations of 'C1' must not specify different base types // public partial class C1 : Base<(int a, int b)> { } Diagnostic(ErrorCode.ERR_PartialMultipleBases, "C1").WithArguments("C1").WithLocation(3, 22) ); diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/AccessCheckTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/AccessCheckTests.cs index 0efdcad68676c..054e3aa854405 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/AccessCheckTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/AccessCheckTests.cs @@ -429,7 +429,7 @@ public class E { } "); c.VerifyDiagnostics( - // (8,11): error CS0060: Inconsistent accessibility: base type 'X' is less accessible than class 'B.C' + // (8,11): error CS0060: Inconsistent accessibility: base type 'X' is less accessible than type 'B.C' // class C : X Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C").WithArguments("B.C", "X").WithLocation(8, 11)); } @@ -593,7 +593,7 @@ public class E { } "); c.VerifyDiagnostics( - // (8,11): error CS0060: Inconsistent accessibility: base type 'X' is less accessible than class 'B.C' + // (8,11): error CS0060: Inconsistent accessibility: base type 'X' is less accessible than type 'B.C' // class C : X Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C").WithArguments("B.C", "X").WithLocation(8, 11)); } diff --git a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs index c62c25c109303..299764da363c9 100644 --- a/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs +++ b/src/Compilers/CSharp/Test/Semantic/Semantics/RecordTests.cs @@ -25219,7 +25219,7 @@ public record E { } "); c.VerifyDiagnostics( - // (8,12): error CS0060: Inconsistent accessibility: base type 'X' is less accessible than class 'B.C' + // (8,12): error CS0060: Inconsistent accessibility: base type 'X' is less accessible than type 'B.C' // record C : X Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C").WithArguments("B.C", "X").WithLocation(8, 12), // (8,12): error CS0050: Inconsistent accessibility: return type 'X' is less accessible than method 'B.C.$()' @@ -25340,10 +25340,10 @@ public partial record C3 : Base<(int a, int b)> { } "; var comp = CreateCompilation(source); comp.VerifyDiagnostics( - // (5,23): error CS0263: Partial declarations of 'C2' must not specify different base classes + // (5,23): error CS0263: Partial declarations of 'C2' must not specify different base types // public partial record C2 : Base<(int a, int b)> { } Diagnostic(ErrorCode.ERR_PartialMultipleBases, "C2").WithArguments("C2").WithLocation(5, 23), - // (3,23): error CS0263: Partial declarations of 'C1' must not specify different base classes + // (3,23): error CS0263: Partial declarations of 'C1' must not specify different base types // public partial record C1 : Base<(int a, int b)> { } Diagnostic(ErrorCode.ERR_PartialMultipleBases, "C1").WithArguments("C1").WithLocation(3, 23), // (5,23): error CS0115: 'C2.GetHashCode()': no suitable method found to override @@ -25423,13 +25423,13 @@ class C void M() where V : U, A, B { } }"; CreateCompilation(source).VerifyDiagnostics( - // (5,18): error CS0406: The class type constraint 'A' must come before any other constraints + // (5,18): error CS0406: The type constraint 'A' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(5, 18), - // (6,18): error CS0406: The class type constraint 'B' must come before any other constraints + // (6,18): error CS0406: The type constraint 'B' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "B").WithArguments("B").WithLocation(6, 18), - // (8,30): error CS0406: The class type constraint 'A' must come before any other constraints + // (8,30): error CS0406: The type constraint 'A' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(8, 30), - // (8,33): error CS0406: The class type constraint 'B' must come before any other constraints + // (8,33): error CS0406: The type constraint 'B' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "B").WithArguments("B").WithLocation(8, 33)); } @@ -25570,7 +25570,7 @@ public partial record C1 // (6,23): error CS0051: Inconsistent accessibility: parameter type 'NV' is less accessible than method 'C1.Equals(NV?)' // public partial record C1 Diagnostic(ErrorCode.ERR_BadVisParamType, "C1").WithArguments("C1.Equals(NV?)", "NV").WithLocation(6, 23), - // (10,16): error CS0060: Inconsistent accessibility: base class 'NV' is less accessible than class 'C1' + // (10,16): error CS0060: Inconsistent accessibility: base type 'NV' is less accessible than type 'C1' // partial record C1 : NV Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C1").WithArguments("C1", "NV").WithLocation(10, 16) ); diff --git a/src/Compilers/CSharp/Test/Symbol/Compilation/GetSemanticInfoTests.cs b/src/Compilers/CSharp/Test/Symbol/Compilation/GetSemanticInfoTests.cs index 9964813c1c51e..716d9f1d816ba 100644 --- a/src/Compilers/CSharp/Test/Symbol/Compilation/GetSemanticInfoTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Compilation/GetSemanticInfoTests.cs @@ -4448,7 +4448,7 @@ public class B : A Assert.Equal(classAnother, rightInfo.CandidateSymbols.Single()); compilation.VerifyDiagnostics( - // (12,14): error CS0060: Inconsistent accessibility: base type 'A' is less accessible than class 'B' + // (12,14): error CS0060: Inconsistent accessibility: base type 'A' is less accessible than type 'B' // public class B : A Diagnostic(ErrorCode.ERR_BadVisBaseClass, "B").WithArguments("B", "A"), // (14,12): error CS0122: 'A.Nested' is inaccessible due to its protection level diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/GenericConstraintTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/GenericConstraintTests.cs index 3d48858fc7e6b..8ef4f7114cc57 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/GenericConstraintTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/GenericConstraintTests.cs @@ -2113,10 +2113,10 @@ partial class E where T : I, B { } // (7,15): error CS0265: Partial declarations of 'D' have inconsistent constraints for type parameter 'T' // partial class D where T : A, I { } Diagnostic(ErrorCode.ERR_PartialWrongConstraints, "D").WithArguments("D", "T").WithLocation(7, 15), - // (8,33): error CS0406: The class type constraint 'A' must come before any other constraints + // (8,33): error CS0406: The type constraint 'A' must come before any other constraints // partial class D where T : I, A { } Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(8, 33), - // (9,33): error CS0406: The class type constraint 'A' must come before any other constraints + // (9,33): error CS0406: The type constraint 'A' must come before any other constraints // partial class D where T : I, A { } Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(9, 33), // (10,15): error CS0265: Partial declarations of 'E' have inconsistent constraints for type parameter 'T' @@ -2647,7 +2647,7 @@ void M() where U : Z, A { } // (13,27): error CS0246: The type or namespace name 'Z' could not be found (are you missing a using directive or an assembly reference?) // void M() where U : Z, A { } Diagnostic(ErrorCode.ERR_SingleTypeNameNotFound, "Z").WithArguments("Z").WithLocation(13, 27), - // (13,30): error CS0406: The class type constraint 'A' must come before any other constraints + // (13,30): error CS0406: The type constraint 'A' must come before any other constraints // void M() where U : Z, A { } Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(13, 30)); } diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs index e37e1eaad7c06..d2101598447d3 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/Source/BaseClassTests.cs @@ -336,7 +336,7 @@ public class E : C.X { } }"; var comp = CreateCompilation(text); comp.VerifyDiagnostics( - // (16,22): error CS0060: Inconsistent accessibility: base type 'A.B.C.X' is less accessible than class 'F.D.E' + // (16,22): error CS0060: Inconsistent accessibility: base type 'A.B.C.X' is less accessible than type 'F.D.E' // public class E : C.X { } Diagnostic(ErrorCode.ERR_BadVisBaseClass, "E").WithArguments("F.D.E", "A.B.C.X") ); @@ -364,7 +364,7 @@ public partial class C1 "; var comp = CreateCompilation(text); comp.VerifyDiagnostics( - // (10,15): error CS0060: Inconsistent accessibility: base type 'NV' is less accessible than class 'C1' + // (10,15): error CS0060: Inconsistent accessibility: base type 'NV' is less accessible than type 'C1' // partial class C1 : NV Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C1").WithArguments("C1", "NV").WithLocation(10, 15)); } @@ -394,7 +394,7 @@ public partial class C1 // (10,15): error CS0709: 'C1': cannot derive from static class 'NV' // partial class C1 : NV Diagnostic(ErrorCode.ERR_StaticBaseClass, "C1").WithArguments("NV", "C1").WithLocation(10, 15), - // (10,15): error CS0060: Inconsistent accessibility: base type 'NV' is less accessible than class 'C1' + // (10,15): error CS0060: Inconsistent accessibility: base type 'NV' is less accessible than type 'C1' // partial class C1 : NV Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C1").WithArguments("C1", "NV").WithLocation(10, 15)); } diff --git a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs index 6b2fc998cfe92..aca8ad02c16a6 100644 --- a/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs +++ b/src/Compilers/CSharp/Test/Symbol/Symbols/SymbolErrorTests.cs @@ -738,13 +738,13 @@ public class C2 : B.C { } public class C3 : B.C { } public class C4 : B>.C { }"; CreateCompilation(source).VerifyDiagnostics( - // (6,14): error CS0060: Inconsistent accessibility: base type 'B' is less accessible than class 'C1' + // (6,14): error CS0060: Inconsistent accessibility: base type 'B' is less accessible than type 'C1' Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C1").WithArguments("C1", "B").WithLocation(6, 14), - // (7,14): error CS0060: Inconsistent accessibility: base type 'B.C' is less accessible than class 'C2' + // (7,14): error CS0060: Inconsistent accessibility: base type 'B.C' is less accessible than type 'C2' Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C2").WithArguments("C2", "B.C").WithLocation(7, 14), - // (8,14): error CS0060: Inconsistent accessibility: base type 'B.C' is less accessible than class 'C3' + // (8,14): error CS0060: Inconsistent accessibility: base type 'B.C' is less accessible than type 'C3' Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C3").WithArguments("C3", "B.C").WithLocation(8, 14), - // (9,14): error CS0060: Inconsistent accessibility: base type 'B>.C' is less accessible than class 'C4' + // (9,14): error CS0060: Inconsistent accessibility: base type 'B>.C' is less accessible than type 'C4' Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C4").WithArguments("C4", "B>.C").WithLocation(9, 14)); } @@ -762,7 +762,7 @@ public interface C { } public class B : A { } public class C : B { }"; CreateCompilation(source).VerifyDiagnostics( - // (9,14): error CS0060: Inconsistent accessibility: base type 'B' is less accessible than class 'C' + // (9,14): error CS0060: Inconsistent accessibility: base type 'B' is less accessible than type 'C' Diagnostic(ErrorCode.ERR_BadVisBaseClass, "C").WithArguments("C", "B").WithLocation(9, 14)); } @@ -4561,13 +4561,13 @@ class C void M() where V : U, A, B { } }"; CreateCompilation(source).VerifyDiagnostics( - // (5,18): error CS0406: The class type constraint 'A' must come before any other constraints + // (5,18): error CS0406: The type constraint 'A' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(5, 18), - // (6,18): error CS0406: The class type constraint 'B' must come before any other constraints + // (6,18): error CS0406: The type constraint 'B' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "B").WithArguments("B").WithLocation(6, 18), - // (8,30): error CS0406: The class type constraint 'A' must come before any other constraints + // (8,30): error CS0406: The type constraint 'A' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "A").WithArguments("A").WithLocation(8, 30), - // (8,33): error CS0406: The class type constraint 'B' must come before any other constraints + // (8,33): error CS0406: The type constraint 'B' must come before any other constraints Diagnostic(ErrorCode.ERR_ClassBoundNotFirst, "B").WithArguments("B").WithLocation(8, 33)); }