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

Centralize CppWinRT version setting #9238

Merged
merged 6 commits into from
Dec 6, 2021
Merged

Centralize CppWinRT version setting #9238

merged 6 commits into from
Dec 6, 2021

Conversation

JunielKatarn
Copy link
Contributor

@JunielKatarn JunielKatarn commented Dec 5, 2021 •
edited
Loading

This change introduces a shared props file to allow setting C NuGet depedency versions on a single place.

  • Defines vnext\PropertySheets\External\Microsoft.ReactNative.Cpp.Dependencies.props
  • Defines MSBuild property CppWinRTVersion
  • Imports Microsoft.ReactNative.Cpp.Dependencies.props within React.Cpp.props and Microsoft.ReactNative.Common.props
Microsoft Reviewers: Open in CodeFlow

@JunielKatarn JunielKatarn requested review from a team as code owners December 5, 2021 02:40
@JunielKatarn JunielKatarn requested a review from a team as a code owner December 5, 2021 06:05
@JunielKatarn JunielKatarn requested a review from a team December 6, 2021 16:29
vmoroz
vmoroz approved these changes Dec 6, 2021
View reviewed changes
Copy link
Member

@vmoroz vmoroz left a comment

Choose a reason for hiding this comment

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

:shipit:

@NickGerleman
Copy link
Collaborator

Does this apply to the template app/module?

@dannyvv
Copy link
Member

dannyvv commented Dec 6, 2021 •
edited
Loading

Note: Another way would be to add support for packages.props per earlier discussion. This is a good change for now, please merge :) Just sharing as FYI...
And with that approach we'll have to see about our code vs templated code as well...

@JunielKatarn
Copy link
Contributor Author

Does this apply to the template app/module?

Certainly. For exampple:

packages\sample-apps\windows\SampleAppCPP\SampleAppCpp.vcxproj
-> $(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.props
    -> Microsoft.ReactNative.Uwp.Common.props
        -> Microsoft.ReactNative.Common.props
            -> Microsoft.ReactNative.Cpp.Dependencies.props => <CppWinRTVersion>...

@JunielKatarn
Copy link
Contributor Author

Note: Another way would be to add support for packages.props per earlier discussion. This is a good change for now, please merge :) Just sharing as FYI... And with that approach we'll have to see about our code vs templated code as well...

To be honest, I forgot about packages.props. Let's discuss offline so following PRs consider it.

@JunielKatarn JunielKatarn merged commit 4033556 into microsoft:main Dec 6, 2021
@JunielKatarn JunielKatarn deleted the shared-pkgdeps-props branch December 6, 2021 19:53
NickGerleman added a commit to NickGerleman/react-native-windows that referenced this pull request Dec 18, 2021
@NickGerleman
Revert "Centralize CppWinRT version setting (microsoft#9238)"
ab5219f 
This reverts commit 4033556.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dannyvv dannyvv dannyvv approved these changes

@vmoroz vmoroz vmoroz approved these changes

@NickGerleman NickGerleman NickGerleman approved these changes

Assignees
No one assigned
Labels
Area: Build Infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JunielKatarn @NickGerleman @dannyvv @vmoroz