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

Add new System.Net.Http.Json project/namespace #42889

Merged
merged 5 commits into from Mar 26, 2020

Conversation

@joperezr
Copy link
Member

joperezr commented Mar 25, 2020

Porting #42879 to new blazor branch. The 3.1 PR was already approved for servicing. It includes all commits from PR dotnet/runtime#33459 up to dotnet/runtime@4970a53

cc: @ericstj @Jozkee @jeffhandley @stephentoub @terrajobst @mkArtakMSFT @safern @GrabYourPitchforks

@safern

This comment has been minimized.

Copy link
Member

safern commented Mar 25, 2020

Could you also add this package to the package list in packages.builds so that it gets built?

<ItemGroup Condition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" >
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.CoreFx.NETCoreApp\Microsoft.Private.CoreFx.NETCoreApp.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<!-- add specific builds / pkgproj's here to include in servicing builds -->
</ItemGroup>

@Jozkee

This comment has been minimized.

Copy link
Member

Jozkee commented Mar 25, 2020

CI failure reason is that tests using LoopbackServer were not compatible with .NET Framework; compatibility was recently added by dotnet/runtime#33158.

'SslProtocols' does not contain a definition for 'Tls13' and no accessible extension method 'Tls13' accepting a first argument of type 'SslProtocols' could be found (are you missing a using directive or an assembly reference?)
@joperezr

This comment has been minimized.

Copy link
Member Author

joperezr commented Mar 25, 2020

Yup, I just moved them to the netcoreapp-specific configuration

<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Net.Http.Json.csproj">

This comment has been minimized.

Copy link
@ericstj

ericstj Mar 25, 2020

Member

We should omit the ref unless we have a good reason to have it.

This comment has been minimized.

Copy link
@joperezr

joperezr Mar 25, 2020

Author Member

Our model until release/3.1 has been to always have the ref unless it causes issues (like hiding dependencies to RAR when targetting desktop) which this package isn't doing, so in my point of view it would be better to not special-case it and keep it consistent unless we think it would hurt. That said, I'm totally open for suggestions here so I can remove it too if you think we should.

This comment has been minimized.

Copy link
@ericstj

ericstj Mar 25, 2020

Member

We previously did a pass to try to limit the number of places where we expose refs to desktop. System.Text.Json, for example, does not expose a reference assembly. All new packages we try not to include refs unless we must have them for some reason.

<Project>
<PropertyGroup>
<BuildConfigurations>
netstandard;

This comment has been minimized.

Copy link
@ericstj

ericstj Mar 25, 2020

Member

should we also have a net461 configuration?

This comment has been minimized.

Copy link
@joperezr

joperezr Mar 25, 2020

Author Member

We could add a net461 config, but that would still mean we will need the facades here, since we depend on SYstem.Text.Json which will pull them in. I was planning on adding net461 config here with my configuration changes wave comming next so that we have one PR doing it for every package that needs it. If you still think I should add it here now, I can do that too.

This comment has been minimized.

Copy link
@ericstj

ericstj Mar 25, 2020

Member

Go ahead and do it now. I think the timing of the next wave will land before we stabalize this, so I'd prefer to have this done WRT coding and just need to pick up package dependency updates when we ship those.

This comment has been minimized.

Copy link
@ericstj

ericstj Mar 25, 2020

Member

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)

@joperezr

This comment has been minimized.

Copy link
Member Author

joperezr commented Mar 25, 2020

Seems like OSX Helix machines are hanging which is keeping the OSX leg running. The idea is to merge this in soon in order to start working on making sure the official build of this branch is working as expected. If there isn't more feedback I would love to merge this now to work on the official build and then put up a new PR here addressing any new feedback that comes up.

@joperezr joperezr force-pushed the joperezr:3.1-blazor/HttpJson branch from d04e772 to 799aa67 Mar 25, 2020
@@ -1,10 +1,13 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Net.Http.Json.csproj">
<SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
<ProjectReference Include="..\ref\System.Net.Http.Json.csproj" />

This comment has been minimized.

Copy link
@ericstj

ericstj Mar 25, 2020

Member

You should just omit the projectreference to ref.

Copy link
Member

ericstj left a comment

LGTM modulo the comment on simplifying the pkgproj

@joperezr

This comment has been minimized.

Copy link
Member Author

joperezr commented Mar 26, 2020

Osx test failure is unrelated to this pr so I’ll go ahead and merge this.

@joperezr joperezr merged commit 57f547c into dotnet:release/3.1-blazor Mar 26, 2020
13 of 15 checks passed
13 of 15 checks passed
corefx-ci Build #20200325.22 had test failures
Details
corefx-ci (MacOS Build x64_Debug) MacOS Build x64_Debug failed
Details
WIP Ready for review
Details
corefx-ci (Linux Build RedHat6_x64_Release) Linux Build RedHat6_x64_Release succeeded
Details
corefx-ci (Linux Build arm64_Debug) Linux Build arm64_Debug succeeded
Details
corefx-ci (Linux Build arm_Debug) Linux Build arm_Debug succeeded
Details
corefx-ci (Linux Build musl_arm64_Debug) Linux Build musl_arm64_Debug succeeded
Details
corefx-ci (Linux Build musl_x64_Debug) Linux Build musl_x64_Debug succeeded
Details
corefx-ci (Linux Build x64_Debug) Linux Build x64_Debug succeeded
Details
corefx-ci (Windows Build NETFX_x86_Release) Windows Build NETFX_x86_Release succeeded
Details
corefx-ci (Windows Build UWP_CoreCLR_x64_Debug) Windows Build UWP_CoreCLR_x64_Debug succeeded
Details
corefx-ci (Windows Build x64_Debug) Windows Build x64_Debug succeeded
Details
corefx-ci (Windows Build x86_Release) Windows Build x86_Release succeeded
Details
corefx-ci (Windows Packaging All Configurations x64_Debug) Windows Packaging All Configurations x64_Debug succeeded
Details
license/cla All CLA requirements met.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.