Skip to content

Commit

Permalink
Merge release/dev17.3 to main (#62573)
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Jul 20, 2022
1 parent 43b9cb0 commit a3c05ab
Show file tree
Hide file tree
Showing 71 changed files with 702 additions and 161 deletions.
6 changes: 6 additions & 0 deletions src/Compilers/CSharp/Portable/CSharpResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -6637,6 +6637,12 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
<data name="WRN_AnalyzerReferencesFramework_Title" xml:space="preserve">
<value>The loaded assembly references .NET Framework, which is not supported.</value>
</data>
<data name="WRN_AnalyzerReferencesNewerCompiler" xml:space="preserve">
<value>The analyzer assembly '{0}' references version '{1}' of the compiler, which is newer than the currently running version '{2}'.</value>
</data>
<data name="WRN_AnalyzerReferencesNewerCompiler_Title" xml:space="preserve">
<value>The analyzer assembly references a newer version of the compiler than the currently running version.</value>
</data>
<data name="ERR_BadFieldTypeInRecord" xml:space="preserve">
<value>The type '{0}' may not be used for a field of a record.</value>
</data>
Expand Down
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2105,6 +2105,7 @@ internal enum ErrorCode
ERR_FileTypeNested = 9054,
ERR_GlobalUsingStaticFileType = 9055,
ERR_FileTypeNameDisallowed = 9056,
WRN_AnalyzerReferencesNewerCompiler = 9057,
ERR_FeatureNotAvailableInVersion11 = 9058,
ERR_RefFieldInNonRefStruct = 9059,

Expand Down
2 changes: 2 additions & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ internal static int GetWarningLevel(ErrorCode code)
case ErrorCode.WRN_UnassignedThisAutoPropertySupportedVersion:
case ErrorCode.WRN_UnassignedThisSupportedVersion:
case ErrorCode.WRN_ObsoleteMembersShouldNotBeRequired:
case ErrorCode.WRN_AnalyzerReferencesNewerCompiler:
return 1;
default:
return 0;
Expand Down Expand Up @@ -2206,6 +2207,7 @@ internal static bool IsBuildOnlyDiagnostic(ErrorCode code)
case ErrorCode.ERR_FileTypeNameDisallowed:
case ErrorCode.ERR_FeatureNotAvailableInVersion11:
case ErrorCode.ERR_RefFieldInNonRefStruct:
case ErrorCode.WRN_AnalyzerReferencesNewerCompiler:
return false;
default:
// NOTE: All error codes must be explicitly handled in this switch statement
Expand Down
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Portable/Errors/MessageProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ internal override bool ShouldAssertExpectedMessageArgumentsLength(int errorCode)
public override int WRN_NoAnalyzerInAssembly => (int)ErrorCode.WRN_NoAnalyzerInAssembly;
public override int WRN_UnableToLoadAnalyzer => (int)ErrorCode.WRN_UnableToLoadAnalyzer;
public override int WRN_AnalyzerReferencesFramework => (int)ErrorCode.WRN_AnalyzerReferencesFramework;
public override int WRN_AnalyzerReferencesNewerCompiler => (int)ErrorCode.WRN_AnalyzerReferencesNewerCompiler;
public override int INF_UnableToLoadSomeTypesInAnalyzer => (int)ErrorCode.INF_UnableToLoadSomeTypesInAnalyzer;
public override int ERR_CantReadRulesetFile => (int)ErrorCode.ERR_CantReadRulesetFile;
public override int ERR_CompileCancelled => (int)ErrorCode.ERR_CompileCancelled;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

290 changes: 150 additions & 140 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.pl.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.pt-BR.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.ru.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.tr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hans.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.zh-Hant.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ public void WarningLevel_2()
case ErrorCode.WRN_UseDefViolationPropertySupportedVersion:
case ErrorCode.WRN_UseDefViolationFieldSupportedVersion:
case ErrorCode.WRN_UseDefViolationThisSupportedVersion:
case ErrorCode.WRN_AnalyzerReferencesNewerCompiler:
Assert.Equal(1, ErrorFacts.GetWarningLevel(errorCode));
break;
case ErrorCode.WRN_InvalidVersionFormat:
Expand Down
Loading

0 comments on commit a3c05ab

Please sign in to comment.