Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dependencies.props import #833

Merged
merged 5 commits into from
Dec 19, 2019

Conversation

ViktorHofer
Copy link
Member

All this logic should be cleaned-up anyway but this is a minimal change to unblock local dev workflows.

@@ -16,7 +16,7 @@ set "__ProjectDir=%~dp0"
:: remove trailing slash
if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%"
set "__ProjectFilesDir=%__ProjectDir%"
set "__RootBinDir=%__ProjectDir%\..\..\..\artifacts"
set "__RootBinDir=%~dp0..\..\..\artifacts"
Copy link
Member

Choose a reason for hiding this comment

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

A nit - maybe use __ThisScriptDir instead of %~dp0 here and in the change below.

@ViktorHofer ViktorHofer force-pushed the FixDependeciesPropsImport branch from dc4ae4e to 5c8cabc Compare December 16, 2019 15:40
@ViktorHofer
Copy link
Member Author

I force-pushed to resolve the conflicts without changing anything.

@janvorli janvorli merged commit bd27324 into dotnet:master Dec 19, 2019
trylek added a commit to trylek/runtime that referenced this pull request Dec 22, 2019
This reverts commit bd27324.
This is one of the four commits in the time range between the last
passing runtime-coreclr run and the first run after which all runs
have been failing on Windows ARM / ARM64.

Thanks

Tomas
@ghost ghost locked as resolved and limited conversation to collaborators Dec 11, 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.

2 participants