Make browser peer for windows_nt and unix #37944

Anipik · 2020-06-16T02:41:06Z

Fixes #38559

Contributes to #37439

ghost · 2020-06-16T02:41:12Z

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

eng/targetframeworksuffix.props

Anipik · 2020-06-18T07:40:54Z

cc @ViktorHofer @safern

Anipik · 2020-06-18T17:42:55Z

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

src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj

src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj

ericstj

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.

src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj

src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj

src/libraries/System.IO.Ports/src/System.IO.Ports.csproj

src/libraries/System.Linq.Expressions/src/System.Linq.Expressions.csproj

src/libraries/System.Private.Xml.Linq/src/System.Private.Xml.Linq.csproj

src/libraries/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj

src/libraries/System.Runtime/src/System.Runtime.csproj

...braries/System.Security.Cryptography.OpenSsl/src/System.Security.Cryptography.OpenSsl.csproj

src/libraries/System.Security.Principal.Windows/src/System.Security.Principal.Windows.csproj

src/libraries/System.Xml.ReaderWriter/src/System.Xml.ReaderWriter.csproj

eng/targetframeworksuffix.props

src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj

src/libraries/System.Console/src/System.Console.csproj

src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj

src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj

src/libraries/System.Diagnostics.StackTrace/src/System.Diagnostics.StackTrace.csproj

src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj

src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj

src/libraries/System.Console/src/System.Console.csproj

src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj

src/libraries/System.Data.Odbc/ref/System.Data.Odbc.ODBC32.cs

src/libraries/System.Data.Odbc/ref/System.Data.Odbc.cs

src/libraries/System.Diagnostics.FileVersionInfo/src/System.Diagnostics.FileVersionInfo.csproj

src/libraries/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj

ViktorHofer · 2020-07-07T22:00:30Z

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 · 2020-07-08T00:25:49Z

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

akoeplinger

Looks great, thank you!

akoeplinger · 2020-07-08T10:59:18Z

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

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.

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.

src/libraries/Microsoft.Win32.Primitives/src/Microsoft.Win32.Primitives.csproj

jkotas · 2020-07-08T14:18:51Z

src/libraries/System.Data.Odbc/ref/System.Data.Odbc.ODBC32.cs

+    public static class ODBC32
+    {
+        [System.Runtime.CompilerServices.TypeForwardedFrom("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+        public enum RETCODE : int


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

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

src/libraries/System.Net.Http/src/System.Net.Http.csproj

Anipik · 2020-07-08T14:29:53Z

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

Dotnet-GitSync-Bot added the area-Infrastructure label Jun 16, 2020

jaredpar mentioned this pull request Jun 16, 2020

OSX machines are de-provisioned during CI / PR runs leading to failures #34472

Closed

Anipik requested a review from marek-safar as a code owner June 16, 2020 19:57

ericstj requested review from vargaz and lewing June 16, 2020 22:05

ericstj reviewed Jun 16, 2020

View reviewed changes

eng/targetframeworksuffix.props Outdated Show resolved Hide resolved

Anipik requested review from akoeplinger, EgorBo and steveisok as code owners June 17, 2020 21:49

Anipik changed the title ~~[Donot Review]make browser peer for windows_nt and unix~~ Make browser peer for windows_nt and unix Jun 17, 2020

ericstj reviewed Jun 18, 2020

View reviewed changes

src/libraries/Microsoft.Win32.Registry/src/Microsoft.Win32.Registry.csproj Outdated Show resolved Hide resolved

ericstj reviewed Jun 18, 2020

View reviewed changes

src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj Outdated Show resolved Hide resolved

ericstj reviewed Jun 18, 2020

View reviewed changes