Merged
Conversation
a56c2c8 to
3c03ad1
Compare
jashook
approved these changes
Apr 1, 2019
Owner
jashook
left a comment
There was a problem hiding this comment.
Lgtm minus a few nits. We can sync up today one what InjectResource and GenClrDebugResource for my knowledge. Thanks for the work!
| <BaseOutputPath>$(MSBuildThisFileDirectory)/artifacts/Product/$(BuildOS)/</BaseOutputPath> | ||
| <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootArtifactsDir)obj/$(BuildOS)/$(BuildArch)/$(BuildType)/$(MSBuildProjectName)/</BaseIntermediateOutputPath> | ||
| <BaseOutputPath>$(MSBuildThisFileDirectory)/artifacts/Product/$(BuildOS)/</BaseOutputPath> | ||
| <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootArtifactsDir)/obj/$(BuildOS)/$(BuildArch)/$(BuildType)/$(MSBuildProjectName)/</BaseIntermediateOutputPath> |
| <!-- Output paths --> | ||
| <PropertyGroup> | ||
| <IntermediateOutputPathNonMangled Condition="'$(IntermediateOutputPathNonMangled)' == ''">$(RootArtifactsDir)obj/$(BuildOS)/$(BuildArch)/$(BuildType)/$(MSBuildProjectName)/</IntermediateOutputPathNonMangled> | ||
| <IntermediateOutputPathNonMangled Condition="'$(IntermediateOutputPathNonMangled)' == ''">$(RootArtifactsDir)/obj/$(BuildOS)/$(BuildArch)/$(BuildType)/$(MSBuildProjectName)/</IntermediateOutputPathNonMangled> |
Owner
There was a problem hiding this comment.
Same as above / should be unnecessary
| <BinDir Condition="'$(__BinDir)'==''">$(__RootArtifactsDir)Product\$(BuildOS)\$(BuildArch)\$(BuildType)\</BinDir> | ||
|
|
||
| <__IntermediatesDir Condition="'$(__IntermediatesDir)' == ''">$(RootBinDir)obj\$(BuildOS)\$(BuildArch)\$(BuildType)</__IntermediatesDir> | ||
| <__IntermediatesDir Condition="'$(__IntermediatesDir)' == ''">$(__RootArtifactsDir)\obj\$(BuildOS)\$(BuildArch)\$(BuildType)</__IntermediatesDir> |
Owner
|
Will address nits. Thanks again |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes are:
Change to use arcade to generate version files. The files generate syntactically correct output, but need to be updated to get the correct numbers we want.
Status: Windows build completes until after the SPC/SOS builds
Build fails in the packaging step.
Generating packages should ideally be done using the existing helpers in arcade (unless its determined unwise after investigation).
SOS build changes already checked in:
https://github.com/jashook/coreclr/pull/15/files