Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev16.0-preview2-vs-deps to master-vs-deps #32379

Merged
3 commits merged into from Jan 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 29 additions & 2 deletions src/Compilers/CSharp/Portable/CSharpResources.Designer.cs

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

13 changes: 11 additions & 2 deletions src/Compilers/CSharp/Portable/CSharpResources.resx
Expand Up @@ -2822,10 +2822,16 @@ A catch() block after a catch (System.Exception e) block can catch non-CLS excep
<value>Unrecognized #pragma directive</value>
</data>
<data name="WRN_IllegalPPWarning" xml:space="preserve">
<value>Expected disable or restore</value>
<value>Expected disable, restore, enable or safeonly</value>
</data>
<data name="WRN_IllegalPPWarning_Title" xml:space="preserve">
<value>Expected disable or restore after #pragma warning</value>
<value>Expected disable, restore, enable or safeonly after #pragma warning</value>
</data>
<data name="WRN_IllegalPPWarningSafeOnly" xml:space="preserve">
<value>Expected nullable</value>
</data>
<data name="WRN_IllegalPPWarningSafeOnly_Title" xml:space="preserve">
<value>Expected nullable after #pragma warning safeonly</value>
</data>
<data name="WRN_BadRestoreNumber" xml:space="preserve">
<value>Cannot restore warning 'CS{0}' because it was disabled globally</value>
Expand Down Expand Up @@ -5268,6 +5274,9 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
<data name="IDS_FeatureNullableReferenceTypes" xml:space="preserve">
<value>nullable reference types</value>
</data>
<data name="IDS_FeaturePragmaWarningEnableOrSafeOnly" xml:space="preserve">
<value>warning action enable or safeonly</value>
</data>
<data name="WRN_ConvertingNullableToNonNullable" xml:space="preserve">
<value>Converting null literal or possible null value to non-nullable type.</value>
</data>
Expand Down
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
Expand Up @@ -1625,6 +1625,7 @@ internal enum ErrorCode
ERR_DiscardPatternInSwitchStatement = 8523,
#endregion diagnostics introduced for recursive patterns

WRN_IllegalPPWarningSafeOnly = 8599,
WRN_ConvertingNullableToNonNullable = 8600,
WRN_NullReferenceAssignment = 8601,
WRN_NullReferenceReceiver = 8602,
Expand Down
1 change: 1 addition & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
Expand Up @@ -362,6 +362,7 @@ internal static int GetWarningLevel(ErrorCode code)
case ErrorCode.WRN_AttributesOnBackingFieldsNotAvailable:
case ErrorCode.WRN_TupleBinopLiteralNameMismatch:
case ErrorCode.WRN_TypeParameterSameAsOuterMethodTypeParameter:
case ErrorCode.WRN_IllegalPPWarningSafeOnly:
case ErrorCode.WRN_ConvertingNullableToNonNullable:
case ErrorCode.WRN_NullReferenceAssignment:
case ErrorCode.WRN_NullReferenceReceiver:
Expand Down
3 changes: 2 additions & 1 deletion src/Compilers/CSharp/Portable/Errors/MessageID.cs
Expand Up @@ -127,7 +127,7 @@ internal enum MessageID
IDS_FeatureTuples = MessageBase + 12711,
IDS_FeatureOutVar = MessageBase + 12713,

// IDS_FeatureIOperation = MessageBase + 12714,
IDS_FeaturePragmaWarningEnableOrSafeOnly = MessageBase + 12714,
IDS_FeatureExpressionBodiedAccessor = MessageBase + 12715,
IDS_FeatureExpressionBodiedDeOrConstructor = MessageBase + 12716,
IDS_ThrowExpression = MessageBase + 12717,
Expand Down Expand Up @@ -244,6 +244,7 @@ internal static LanguageVersion RequiredVersion(this MessageID feature)
case MessageID.IDS_FeatureCoalesceAssignmentExpression:
case MessageID.IDS_FeatureUnconstrainedTypeParameterInNullCoalescingOperator:
case MessageID.IDS_FeatureNullableReferenceTypes: // syntax and semantic check
case MessageID.IDS_FeaturePragmaWarningEnableOrSafeOnly:
case MessageID.IDS_FeatureObjectGenericTypeConstraint: // semantic check
case MessageID.IDS_FeatureIndexOperator: // semantic check
case MessageID.IDS_FeatureRangeOperator: // semantic check
Expand Down

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