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

Update CoreLib path for consolidation#42577

Merged
ViktorHofer merged 1 commit intodotnet:masterfrom
ViktorHofer:CoreLibPath
Nov 13, 2019
Merged

Update CoreLib path for consolidation#42577
ViktorHofer merged 1 commit intodotnet:masterfrom
ViktorHofer:CoreLibPath

Conversation

@ViktorHofer
Copy link
Copy Markdown
Member

Search&Replace update of the CoreLib sources from $(CommonPath)\CoreLib\ to $(CoreLibDir). $(CoreLibDir) detects automatically adapts to the runtime repo and changes paths accordingly.

Comment thread src/Common/tests/Common.Tests.csproj Outdated
</Compile>
<Compile Include="$(CommonPath)\CoreLib\Interop\Unix\System.Native\Interop.PathConf.cs">
<Compile Include="$(CoreLibDir)Interop\Unix\System.Native\Interop.PathConf.cs">
<Link>Common\Interop\Unix\Interop.PathConf.cs</Link>
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.

It seems like this Link didn't contain CoreLib so it still contains the Common prefix.

</Compile>
<Compile Include="$(CommonPath)\CoreLib\Interop\Unix\System.Native\Interop.MountPoints.cs">
<Compile Include="$(CoreLibDir)Interop\Unix\System.Native\Interop.MountPoints.cs">
<Link>Common\Interop\Unix\Interop.MountPoints.cs</Link>
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.

Ditto.

</Compile>
<Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.CloseHandle.cs">
<Compile Include="$(CoreLibDir)Interop\Windows\Kernel32\Interop.CloseHandle.cs">
<Link>Common\Interop\Windows\Interop.CloseHandle.cs</Link>
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.

Ditto.

</Compile>
<Compile Include="$(CommonPath)\CoreLib\Interop\Unix\System.Native\Interop.Read.cs">
<Compile Include="$(CoreLibDir)Interop\Unix\System.Native\Interop.Read.cs">
<Link>Common\Interop\Unix\libc\Interop.Read.cs</Link>
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.

Ditto. I guess we don't want to fix these? There are many like this, seem to be out of the scope of this PR?

@ViktorHofer
Copy link
Copy Markdown
Member Author

Yes that's out of scope.

@ViktorHofer ViktorHofer merged commit dc6136f into dotnet:master Nov 13, 2019
@stephentoub
Copy link
Copy Markdown
Member

Looks good to me. I might have chosen a name more like CoreLibSharedDir, but you've merged, and it's not a big deal.

@ViktorHofer ViktorHofer deleted the CoreLibPath branch November 13, 2019 19:50
@karelz karelz added this to the 5.0 milestone Dec 19, 2019
macrogreg pushed a commit to open-telemetry/opentelemetry-dotnet-instrumentation that referenced this pull request Sep 24, 2020
Sign up for free to 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.

4 participants