Skip to content

Make browser peer for windows_nt and unix - #37944

Merged
akoeplinger merged 50 commits into
dotnet:masterfrom
Anipik:browser
Jul 8, 2020
Merged

Make browser peer for windows_nt and unix#37944
akoeplinger merged 50 commits into
dotnet:masterfrom
Anipik:browser

Conversation

@Anipik

@AnipikAnipik commented Jun 16, 2020

Copy link
Copy Markdown
Contributor

Fixes#38559

Contributes to #37439

@ghost

Copy link
Copy Markdown

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

Comment threadeng/targetframeworksuffix.props Outdated
@AnipikAnipik changed the title [Donot Review]make browser peer for windows_nt and unixMake browser peer for windows_nt and unixJun 17, 2020
@Anipik

Copy link
Copy Markdown
ContributorAuthor

cc @ViktorHofer@safern

@Anipik

Anipik commented Jun 18, 2020

Copy link
Copy Markdown
ContributorAuthor

@ericstj@marek-safar can you review this one ?

Comment threadsrc/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj Outdated
Comment threadsrc/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj Outdated

@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.

For some of these cases we should see if we can represent netcoreapp-Browser;netcoreapp-Unix;netcoreapp-Windows_NT as netcoreapp;netcoreapp-Windows_NT instead (especially in the cases where there is no DLLImport).

There seem to be a few cases where cross-compilation is resulting because of our config system, and not due to any real ifdefs/conditional compilation (EG: anything project referencing System.Private.Uri/System.Runtime, System.Private.Xml). This is similar to the case we relaxed for System.Private.CoreLib. I wonder if we should relax it in these cases, use the vertical-defined configuration of the project reference, and remove the cross-compilation.

Comment threadsrc/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj Outdated
Comment threadsrc/libraries/System.IO.Ports/src/System.IO.Ports.csproj Outdated
Comment threadsrc/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj Outdated
Comment threadsrc/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj Outdated
Comment threadsrc/libraries/System.Runtime/src/System.Runtime.csproj Outdated
Comment threadsrc/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj Outdated
Comment threadeng/targetframeworksuffix.props Outdated
Comment threadsrc/libraries/System.Console/src/System.Console.csproj Outdated
Comment threadsrc/libraries/System.Console/src/System.Console.csproj Outdated
Comment threadsrc/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj Outdated
Comment threadsrc/libraries/System.Data.Odbc/ref/System.Data.Odbc.ODBC32.cs Outdated
Comment threadsrc/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs
@ViktorHofer

Copy link
Copy Markdown
Member

I'm not sure if all the test --> src configurations are right but we can otherwise fix them in a follow-up PR. Spot checked. Thanks

@Anipik

Copy link
Copy Markdown
ContributorAuthor

@akoeplinger can you review this one ?
i can address the caching change in a follow up pr as it might break something else. I will like to get this one in to avoid merge conflicts.

@akoeplingerakoeplinger 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.

Looks great, thank you!

@akoeplinger

Copy link
Copy Markdown
Member

The pending runtime (CoreCLR GCC Product Build Linux x64 checked) is actually green on AzDO: https://dev.azure.com/dnceng/public/_build/results?buildId=720121&view=results

@akoeplinger
akoeplinger merged commit 5ce04cc into dotnet:masterJul 8, 2020
akoeplinger added a commit to akoeplinger/runtime that referenced this pull request Jul 8, 2020
Saw these missing while reviewing dotnet#37944.
As far as I can see this is only used when building inside VS but still good to add for consistency.
akoeplinger added a commit that referenced this pull request Jul 8, 2020
Saw these missing while reviewing #37944.
As far as I can see this is only used when building inside VS but still good to add for consistency.
public static class ODBC32
{
[System.Runtime.CompilerServices.TypeForwardedFrom("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public enum RETCODE : int

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.

What is this about? This needs a better comment at least.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I added the comment in #38968. there is some more info on decision here #37944 (comment)

Comment threadsrc/libraries/System.Net.Http/src/System.Net.Http.csproj
Comment threadsrc/libraries/System.Net.Http/src/System.Net.Http.csproj
@Anipik

Copy link
Copy Markdown
ContributorAuthor

There are going to be follow up prs for this work, i will address the feedback in the next one

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Browser Implementation For various assemblies

11 participants

@Anipik@marek-safar@ViktorHofer@akoeplinger@steveisok@danmoseley@jkotas@eerhardt@ericstj@safern@Dotnet-GitSync-Bot