Skip to content

Fix build for System.Text.Encodings.Web #39448

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

Merged
eiriktsarpalis merged 1 commit into from
Jul 16, 2020
Merged

Fix build for System.Text.Encodings.Web #39448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
Copy link

@pgovind pgovind Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should've caught this sooner. I'm wondering if this should be NETCOREAPPCURRENT instead of netcoreapp3.0?

Copy link
Member Author

@eiriktsarpalis eiriktsarpalis Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, no. If you take a look at the particular proj file, it is hardcoding netcoreapp3.0 in most places.

Copy link

@pgovind pgovind Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, you just refactored this. Still, the USE_INTERNAL_ACCESSIBILITY flag itself should be turned on only for NETCOREAPPCURRENT maybe?

Copy link

@pgovind pgovind Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can test this by trying both -f netcoreapp30 and -f netcoreapp50 locally

Copy link
Member Author

@eiriktsarpalis eiriktsarpalis Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, it's not needed. If you look at the item group at line 36, you'll see that the shims are only included for netcoreapp3.0.

<DefineConstants>$(DefineConstants),USE_INTERNAL_ACCESSIBILITY</DefineConstants>
<!-- CS3019: CLS attributes on internal types. Some shared source files are internal in this project. -->
<NoWarn Condition="'$(TargetFramework)' == 'netcoreapp3.0'">$(NoWarn);CS3019</NoWarn>
<NoWarn>$(NoWarn);CS3019</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Include="System\Text\Encodings\Web\DefaultJavaScriptEncoder.cs" />
Expand Down