Skip to content

Fix build failures (issue #638) and remove private C++ toolset workaround #640

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
Merged
merged 5 commits into from
May 3, 2019
Merged

Fix build failures (issue #638) and remove private C++ toolset workaround #640

merged 5 commits into from
May 3, 2019

Conversation

vatsan-madhavan
Copy link
Member

@vatsan-madhavan vatsan-madhavan commented May 3, 2019 •
edited
Loading

  • Fixes build break by changing when LimitNetCoreAppReferences runs
  • Removes dependence on private C++/CLI tooling in favor of tools that are now present in Dev16.1 P2 builds (that are already on our build servers)
  • Add a workaround in tests for a type missing from System.Runtime

@vatsan-madhavan
Updating SdkReferences.targets so that LimitNetCoreAppReferences runs…
4ba66eb 
… earlier than ResolveAssemblyReferences, after ResolveTargetingPacks. To ensure this happens, updating Sdk targets by bumping version in global.json to Preview 5 candidate.

It creates a side effect during nuget-restore for test-builds - adding a workaround for that. This side-effect nuget failure will go away when we fix our tests to use Microsoft.NET.Sdk (verified locally that this is so).
@vatsan-madhavan
We no longer need the private C++/CLI frontend - the current Dev16.1 …
c1d158f 
…P2 builds that are already on the build servers have the right tools. Removing that workaround.
@vatsan-madhavan vatsan-madhavan changed the title Fix Fix build failures (issue #638) and remove private C++ toolset workaround May 3, 2019
@ryalanms ryalanms self-requested a review May 3, 2019 18:43
@vatsan-madhavan vatsan-madhavan requested a review from rladuca May 3, 2019 18:44
@vatsan-madhavan vatsan-madhavan added the * NO MERGE * metadata: The PR is not ready for merge yet (see discussion for detailed reasons) label May 3, 2019
@vatsan-madhavan
LimitNetCoreAppReferences should now deal in @(Reference) which is th…
607d1f7 
…e output from ResolveTargetingPacks - and not in @(ReferencePath)

Also There is no longer an OriginalItemSpec - so make up our own
@vatsan-madhavan vatsan-madhavan removed the * NO MERGE * metadata: The PR is not ready for merge yet (see discussion for detailed reasons) label May 3, 2019
rladuca
rladuca approved these changes May 3, 2019
View reviewed changes
Copy link
Member

@rladuca rladuca left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@vatsan-madhavan vatsan-madhavan merged commit aedc0d0 into master May 3, 2019
@vatsan-madhavan vatsan-madhavan deleted the dev/vatsanm/use-p5build-globaljson branch May 3, 2019 19:53
@vatsan-madhavan vatsan-madhavan mentioned this pull request May 4, 2019
Closed
@ghost ghost locked as resolved and limited conversation to collaborators Apr 17, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rladuca rladuca rladuca approved these changes

@ryalanms ryalanms Awaiting requested review from ryalanms

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vatsan-madhavan @rladuca