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.

Sign up for GitHub

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

Jump to bottom

Unifying duplicate msbuild properties in CoreCLR build #34261

Merged
merged 3 commits into from
Mar 30, 2020
Merged

Unifying duplicate msbuild properties in CoreCLR build #34261

merged 3 commits into from
Mar 30, 2020

Conversation

jkotas
Copy link
Member

@jkotas jkotas commented Mar 29, 2020 •
edited
Loading

  • __TargetOS -> TargetOS
  • __BuildType, BuildType -> Configuration
  • __BuildArch, BuildArch -> TargetArchitecture

jkotas
jkotas commented Mar 29, 2020
View reviewed changes
src/coreclr/dir.common.props

<!-- TODO: converge on one property for TargetOS and __TargetOS (and similar), and remove these extra lines. -->
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the TODO that made me to do this.

jkotas
jkotas commented Mar 29, 2020
View reviewed changes
src/coreclr/build-runtime.cmd
@@ -223,7 +223,7 @@ if %__BuildTypeDebug%==1 set __BuildType=Debug
if %__BuildTypeChecked%==1 set __BuildType=Checked
Copy link
Member Author

Choose a reason for hiding this comment

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

I am not renaming any variables in shell scripts to make the change manageable.

jkotas added 3 commits March 29, 2020 19:45
@jkotas
Unifying duplicate msbuild properties in CoreCLR build
db1a1d5 
- __TargetOS -> TargetOS
- __BuildType, BuildType -> Configuration
- __BuildArch, BuildArch -> TargetArchitecture
@jkotas
Delete no-ops
d56560c
@jkotas
Try workaround
439ac0a
@jkotas jkotas mentioned this pull request Mar 30, 2020
Closed
@jkotas jkotas requested review from Anipik and ViktorHofer March 30, 2020 16:35
@jkotas
Copy link
Member Author

jkotas commented Mar 30, 2020

cc @dotnet/runtime-infrastructure

@jkotas jkotas requested a review from jkoritzinsky March 30, 2020 16:36
@jashook jashook self-requested a review March 30, 2020 16:38
trylek
trylek approved these changes Mar 30, 2020
View reviewed changes
Copy link
Member

@trylek trylek left a comment

Choose a reason for hiding this comment

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

Awesome cleanup, thanks Jan for doing this!

@jkotas
Copy link
Member Author

jkotas commented Mar 30, 2020

The test failure is #28553

@jkotas jkotas merged commit 59be94b into dotnet:master Mar 30, 2020
@jkotas jkotas deleted the msbuilddups branch March 30, 2020 17:08
ViktorHofer
ViktorHofer approved these changes Mar 30, 2020
View reviewed changes
Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

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

Thanks

safern
safern reviewed Mar 30, 2020
View reviewed changes
Copy link
Member

@safern safern left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

@jaredpar jaredpar mentioned this pull request Mar 30, 2020
Closed
@ericstj ericstj mentioned this pull request Mar 30, 2020
Closed
@RobertHenry6bev
Copy link
Contributor

This is a breaking change. Running on x64 ubuntu linux 19.1

Following https://github.com/dotnet/runtime/blob/master/docs/workflow/building/coreclr/linux-instructions.md#build-the-runtime-and-systemprivatecoreli and being a little more explicit about defaults, and using the latest clang drop:

Running
bash ./build.sh
-subsetCategory coreclr
--configuration Debug
--clang10

Results in a malformed subdirectory name:
ls artifacts/bin/coreclr
Linux..Debug Linux.x64.Debug
The Linux..Debug name is incorrect. I suspect it should be Linux.x64.Debug, as it is in the commit immediately prior to this one.

@safern
Copy link
Member

safern commented Mar 31, 2020

Thanks, @RobertHenry6bev, we just fixed here: b85563d

And also, we have: #34295 which defaults it in MSBuild.

If you fetch latest you shouldn't be hitting this issue anymore. 😄

@ghost ghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@safern safern safern left review comments

@trylek trylek trylek approved these changes

@ViktorHofer ViktorHofer ViktorHofer approved these changes

@akoeplinger akoeplinger Awaiting requested review from akoeplinger

@EgorBo EgorBo Awaiting requested review from EgorBo

@marek-safar marek-safar Awaiting requested review from marek-safar

@steveisok steveisok Awaiting requested review from steveisok

@vargaz vargaz Awaiting requested review from vargaz

@Anipik Anipik Awaiting requested review from Anipik

@jkoritzinsky jkoritzinsky Awaiting requested review from jkoritzinsky

@jashook jashook Awaiting requested review from jashook

Assignees
No one assigned
Labels
area-Infrastructure-coreclr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jkotas @RobertHenry6bev @safern @ViktorHofer @trylek @Dotnet-GitSync-Bot