Skip to content

Update targets to adapt to ref-pack based references #588

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

Merged
merged 4 commits into from
Apr 16, 2019

Conversation

vatsan-madhavan
Copy link
Member

@vatsan-madhavan vatsan-madhavan commented Apr 15, 2019

  • Update related targets, esp. SdkReferences.targets and related mechanisms used to filter NetCoreReference
  • Update RuntimeFrameworkReference targets to exclude test projects because they currently depend on WindowsDesktop SDK.

… of using PackageReference.

This change adapts to that expectation.

If we are still using an older version of tools.dotnet in global.json, we will go through `ResolveMicrosoftNetCoreAppReferences` . OTOH, when global.json gets updated to a newer version of tools.dotnet, `LimitNetCoreAppReferences` will kick-in and do the right thing.

Adjust System.Xaml.csproj a bit to ensure that it has the right references. No other changes were necessary to projects in dotnet-wpf-int.

Similar paths exist for `Microsoft.WindowsDesktop.App[.Ref]` - this is reserved for future use.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…e version in use today in release/3.0 branch.

Remove redundant PackageReference from RuntimeFrameworkReference.props.

opt-out tests from RuntimeFrameworkReference for now.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
… to update the value of tools.dotnet and sdk.version. This is so because of the following chain of events:

i. dotnet.tools downloads version A of core-sdk with version A' of Microsoft.NetCore.App
ii. core-sdk version A contains Microsoft.WindowsDesktop.App, which contains windowsdesktop.app.runtimeconfig.json, which has a reference to Microsoft.NetCore.App version B. (A 'coherent build' would have pointed to Microsoft.NetCore.App version A', same as the one noted in (i), instead)
iii. When running tests involving Sdk.WindowsDesktop, they start off using core-sdk version A/Microsoft.NetCore.App version A', and then look for Microsoft.NetCore.App version B (because WindowsDesktop.App.RuntimeConfig.json refers to it), and fails.

Ideally, we should not be using Sdk.WindowsDesktop at all. Instead, we should be using InternalMarkupCompilation + ProjectReferences. For now, moving back to an older versin of tools.dotnet. We can update it to a newer (preview4) version later.
@vatsan-madhavan vatsan-madhavan requested a review from miguep April 16, 2019 17:21

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@vatsan-madhavan vatsan-madhavan changed the title Update global.json dotnet.tools and sdk.version to match what is used in release/3.0 branch Update targets to adapt to ref-pack based references Apr 16, 2019
@vatsan-madhavan vatsan-madhavan merged commit ff08359 into master Apr 16, 2019
@vatsan-madhavan vatsan-madhavan deleted the dev/vatsanm/netcore-ref branch May 28, 2019 18:54
@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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants