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

Manual darc update for arcade and coreclr#34977

Merged
stephentoub merged 4 commits into
dotnet:masterfrom
safern:ManualDarcUpdateArcadeCoreclr
Jan 31, 2019
Merged

Manual darc update for arcade and coreclr#34977
stephentoub merged 4 commits into
dotnet:masterfrom
safern:ManualDarcUpdateArcadeCoreclr

Conversation

@safern
Copy link
Copy Markdown
Member

@safern safern commented Jan 31, 2019

@stephentoub this should unblock your PR to enable Decimal test cases.

@safern
Copy link
Copy Markdown
Member Author

safern commented Jan 31, 2019

2019-01-31T03:00:20.1343511Z D:\a\1\s\src\Common\src\CoreLib\System\OperatingSystem.cs(43,16): error CS0436: The type 'PlatformID' in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs' conflicts with the imported type 'PlatformID' in 'System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e'. Using the type defined in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs'. [D:\a\1\s\src\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj]
2019-01-31T03:00:20.1344333Z D:\a\1\s\src\Common\src\CoreLib\System\OperatingSystem.cs(17,32): error CS0436: The type 'PlatformID' in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs' conflicts with the imported type 'PlatformID' in 'System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e'. Using the type defined in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs'. [D:\a\1\s\src\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj]
2019-01-31T03:00:20.1344894Z D:\a\1\s\src\Common\src\CoreLib\System\OperatingSystem.cs(21,34): error CS0436: The type 'PlatformID' in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs' conflicts with the imported type 'PlatformID' in 'System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e'. Using the type defined in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs'. [D:\a\1\s\src\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj]
2019-01-31T03:00:20.1345434Z D:\a\1\s\src\Common\src\CoreLib\System\OperatingSystem.cs(13,26): error CS0436: The type 'PlatformID' in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs' conflicts with the imported type 'PlatformID' in 'System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e'. Using the type defined in 'D:\a\1\s\src\Common\src\CoreLib\System\PlatformID.cs'. [D:\a\1\s\src\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj]

@stephentoub I guess PlatformID got pushed down to coreclr?

@safern
Copy link
Copy Markdown
Member Author

safern commented Jan 31, 2019

I see. Found your PR: #34654

Will fix it and update this PR.

@safern safern force-pushed the ManualDarcUpdateArcadeCoreclr branch 2 times, most recently from c234109 to 76b6d63 Compare January 31, 2019 08:09
@safern
Copy link
Copy Markdown
Member Author

safern commented Jan 31, 2019

It seems like uapaot doesn't yet have Environment exposed as public. Still compiling with the internal type rather than the files coming from the shared location. Is that missing to do in corert? I just conditioned everything for uapaot to keep using the local copies. Until that is done there, we can't delete the files.

@safern
Copy link
Copy Markdown
Member Author

safern commented Jan 31, 2019

@dotnet-bot test Linux x64 Release Build please

@safern safern force-pushed the ManualDarcUpdateArcadeCoreclr branch from 76b6d63 to c8c5a7c Compare January 31, 2019 09:14
<ProjectGuid>{844A2A0B-4169-49C3-B367-AFDC4894E487}</ProjectGuid>
<Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.2-Debug;netstandard1.2-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
<DefineConstants>$(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY</DefineConstants>
<DefineConstants Condition="'$(TargetGroup)' == 'uapaot'">$(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY</DefineConstants>
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.

Why did you change this?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Because for netcoreapp we can’t use Environment from System.Runtime.Extensions since it conflicts because it is now a typeforward, and since this project has a reference from runtime to System.Private.Corelib, it conflicts with the new Environment type exposed there, so we can’t use the alias for it.

However since the type for the version we have in corefx of ProjectN is internal in corelib, we need to resolve this type from System.Runtime.Extensions until we get a new ProjectN with the PR you just merged. We don’t use this constant anywhere else, right?

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.

I see, the compiler didn't like resolving the typeforward through the alias? Seems like a that might be a compiler bug.

Copy link
Copy Markdown
Member

@stephentoub stephentoub Jan 31, 2019

Choose a reason for hiding this comment

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

We don’t use this constant anywhere else, right?

Right. Ok. My plan was to remove it entirely once everything flowed through the system.

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.

Not related to this commit, but this project warrants some comments as to why it does such weird things. It's not a partial facade yet it's compiling against private surface area from System.Private.CoreLib which is why its using project references and aliases. It'd be really nice if that could be cleaned up. /cc @jeffschwMSFT

@stephentoub
Copy link
Copy Markdown
Member

Is that missing to do in corert?

dotnet/corert#6920

@stephentoub stephentoub merged commit 28c46ef into dotnet:master Jan 31, 2019
@karelz karelz added this to the 3.0 milestone Mar 18, 2019
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
* Remove target to print MCUrl now that helix sdk always prints it

* Run darc update for dotnet/arcade

* Run darc update for dotnet\coreclr

* Fix build after Environment pushed down to coreclr


Commit migrated from dotnet/corefx@28c46ef
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants