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.

Sign up for GitHub

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

Jump to bottom

Merge release/dev17.0 to release/dev17.0-vs-deps #54572

Merged
merged 4 commits into from
Jul 2, 2021
Merged

Merge release/dev17.0 to release/dev17.0-vs-deps #54572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7e44ad
Only do partial ngen for desktop binaries
genlu Jun 30, 2021
25f1ed3
Merge pull request #54499 from genlu/ReduceIbcmerge
genlu Jul 1, 2021
c16d503
Merge pull request #54522 from dotnet/merges/release/dev16.11-to-rele…
Jul 1, 2021
ec005c8
Enhanced #line directives (#54489)
cston Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Compilers/CSharp/Portable/CSharpResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6634,6 +6634,15 @@ To remove the warning, you can use /reference instead (set the Embed Interop Typ
<data name="IDS_FeatureInferredDelegateType" xml:space="preserve">
<value>inferred delegate type</value>
</data>
<data name="IDS_FeatureLineSpanDirective" xml:space="preserve">
<value>line span directive</value>
</data>
<data name="ERR_LineSpanDirectiveInvalidValue" xml:space="preserve">
<value>The #line directive value is missing or out of range</value>
</data>
<data name="ERR_LineSpanDirectiveEndLessThanStart" xml:space="preserve">
<value>The #line directive end position must be greater than or equal to the start position</value>
</data>
<data name="WRN_DoNotCompareFunctionPointers" xml:space="preserve">
<value>Comparison of function pointers might yield an unexpected result, since pointers to the same function may be distinct.</value>
</data>
Expand Down
2 changes: 2 additions & 0 deletions src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,6 +1960,8 @@ internal enum ErrorCode
ERR_BuilderAttributeDisallowed = 8935,
ERR_FeatureNotAvailableInVersion10 = 8936,
ERR_SimpleProgramIsEmpty = 8937,
ERR_LineSpanDirectiveInvalidValue = 8938,
ERR_LineSpanDirectiveEndLessThanStart = 8939,

#endregion

Expand Down
2 changes: 2 additions & 0 deletions src/Compilers/CSharp/Portable/Errors/MessageID.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ internal enum MessageID
IDS_FeatureLambdaReturnType = MessageBase + 12804,
IDS_AsyncMethodBuilderOverride = MessageBase + 12805,
IDS_FeatureImplicitImplementationOfNonPublicMemebers = MessageBase + 12806,
IDS_FeatureLineSpanDirective = MessageBase + 12807,
}

// Message IDs may refer to strings that need to be localized.
Expand Down Expand Up @@ -354,6 +355,7 @@ internal static LanguageVersion RequiredVersion(this MessageID feature)
case MessageID.IDS_AsyncMethodBuilderOverride: // semantic check
case MessageID.IDS_FeatureConstantInterpolatedStrings: // semantic check
case MessageID.IDS_FeatureImplicitImplementationOfNonPublicMemebers: // semantic check
case MessageID.IDS_FeatureLineSpanDirective:
return LanguageVersion.CSharp10;

// C# 9.0 features.
Expand Down
15 changes: 14 additions & 1 deletion src/Compilers/CSharp/Portable/Generated/CSharp.Generated.g4
View file
Open in desktop

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

Loading