This repository was archived by the owner on Jan 23, 2023. It is now read-only.

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

Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged

Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom
joperezr:3.1-blazor/HttpJson

Conversation

@joperezr

@joperezrjoperezr commented Mar 25, 2020•
edited by jozkee
Loading

Copy link
Copy Markdown
Member

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

@joperezrjoperezr mentioned this pull request Mar 25, 2020
Closed
safern
safern reviewed Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props Outdated
safern
safern reviewed Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props Outdated
@safern

safern commented Mar 25, 2020

Copy link
Copy Markdown
Member

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

corefx/src/packages.builds

Lines 21 to 29 in 5251f9c

<ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" >
<ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<ProjectInclude="$(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

jozkee commented Mar 25, 2020•
edited
Loading

Copy link
Copy Markdown
Member

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

joperezr commented Mar 25, 2020

Copy link
Copy Markdown
MemberAuthor

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

ericstj
ericstj reviewed Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj Outdated
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
<ItemGroup>
<ProjectReference Include="..\ref\System.Net.Http.Json.csproj">

@ericstjericstjMar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

@joperezrjoperezrMar 25, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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.

@ericstjericstjMar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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.

ericstj
ericstj reviewed Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
<PropertyGroup>
<BuildConfigurations>
netstandard;

@ericstjericstjMar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

should we also have a net461 configuration?

@joperezrjoperezrMar 25, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

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.

@ericstjericstjMar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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.

@ericstjericstjMar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

@joperezr

joperezr commented Mar 25, 2020

Copy link
Copy Markdown
MemberAuthor

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.

@safernsafern mentioned this pull request Mar 25, 2020
Merged
@joperezr
joperezrforce-pushed the 3.1-blazor/HttpJson branch from d04e772 to 799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj reviewed Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj Outdated
<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" />

@ericstjericstjMar 25, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.

ericstj
ericstj approved these changes Mar 25, 2020
View reviewed changes

@ericstjericstj left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj

@joperezr

joperezr commented Mar 26, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers
@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-System.Net

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Add new System.Net.Http.Json project/namespace - #42889
Merged
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Mar 26, 2020
Merged
Add new System.Net.Http.Json project/namespace#42889
joperezr merged 5 commits into
dotnet:release/3.1-blazorfrom 
joperezr:3.1-blazor/HttpJson
Conversation
@joperezr
@joperezrjoperezr
commented
Mar 25, 2020•

edited by jozkee

Loading

Copy link


Copy Markdown

Member
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
@joperezrjoperezr
mentioned this pull request
Mar 25, 2020
 Closed

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

safern
safern
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/Directory.Build.props
Outdated

@safern
safern
commented
Mar 25, 2020

Copy link


Copy Markdown

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

Lines 21 to 29
in
5251f9c
 <ItemGroupCondition="'$(BuildAllPackages)' == 'false' AND '$(SkipManagedPackageBuild)' != 'true'" > 
 <ProjectInclude="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Private.PackageBaseline\Microsoft.Private.PackageBaseline.builds"> 
 <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties> 
 </Project> 
 <ProjectInclude="$(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
jozkee
commented
Mar 25, 2020•

edited

Loading

Copy link


Copy Markdown

Member
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
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Yup, I just moved them to the netcoreapp-specific configuration
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

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

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We should omit the ref unless we have a good reason to have it.
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/src/Configurations.props
<Project>
 <PropertyGroup>
 <BuildConfigurations>
 netstandard;
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

should we also have a net461 configuration?
@joperezrjoperezrMar 25, 2020

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

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.
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

(assuming this is a small task, if anything gets complicated we can postpone this until after the first preview)
@joperezr
joperezr
commented
Mar 25, 2020

Copy link


Copy Markdown

MemberAuthor
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.
@safernsafern
mentioned this pull request
Mar 25, 2020
 Merged

@joperezr
joperezrforce-pushed
the
3.1-blazor/HttpJson
branch
from
d04e772 to
799aa67CompareMarch 25, 2020 23:09
ericstj
ericstj
reviewed
Mar 25, 2020
View reviewed changes
Comment threadsrc/System.Net.Http.Json/pkg/System.Net.Http.Json.pkgproj
Outdated

 <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" />
@ericstjericstjMar 25, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

You should just omit the projectreference to ref.
ericstj
ericstj
approved these changes
Mar 25, 2020
View reviewed changes
@ericstjericstj
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM modulo the comment on simplifying the pkgproj
@joperezr
joperezr
commented
Mar 26, 2020•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
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-blazorMar 26, 2020
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers


2 more reviewers

@safernsafernsafern left review comments
@ericstjericstjericstj approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-System.Net

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@joperezr@safern@jozkee@ericstj@Dotnet-GitSync-Bot