Skip to content

Conversation

@DHowett-MSFT
Copy link
Contributor

@DHowett-MSFT DHowett-MSFT commented Feb 11, 2020

This commit upgrades C++/WinRT to 2.0.200316.3 and fixes a couple of the
transitive dependency issues we had in the process.

Because the latest version has better dependency resolution, we're able
to properly depend on Microsoft.UI.Xaml and the Toolkit in TerminalApp
and TerminalAppLib so we no longer need to manually include .dll and
.pri files.

Because of nebulous other changes in dependency resolution,
WindowsTerminalUniversal isn't picking up transitive .winmd dependencies
from TerminalApp, and needs to include them as ProjectReferences
directly. This was already happening transitively, so now it's explicit.

I've also taken the time to upgrade GSL to v2.1.0, the last release
before they removed span::at and blew up our world.

Copy link
Member

@zadjii-msft zadjii-msft left a comment

Choose a reason for hiding this comment

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

You know, I viewed this back when it was first pushed and I don't think I had any comments, but never hit the "Review Changes" button. I'm doing this now to get it out of my queue.

I dunno if we need this to land before 1.0, but so far looks fine to me

@DHowett-MSFT DHowett-MSFT changed the title deps: upgrade CppWinRT to 2.0.200203.5 deps: upgrade CppWinRT to 2.0.200316.3, gsl to v2.1.0, wil Mar 23, 2020
@DHowett-MSFT DHowett-MSFT marked this pull request as ready for review March 23, 2020 00:35
@DHowett-MSFT DHowett-MSFT changed the title deps: upgrade CppWinRT to 2.0.200316.3, gsl to v2.1.0, wil deps: upgrade CppWinRT to 2.0.200316.3, gsl to v2.1.0 Mar 23, 2020
@DHowett-MSFT DHowett-MSFT force-pushed the dev/duhowett/c++++winrt branch from 0574bdc to 6214856 Compare March 23, 2020 00:50
@DHowett-MSFT
Copy link
Contributor Author

Completely anecdotal: I've been having issues with incremental rebuild across launches of Visual Studio -- like, pressing F5 on a new launch would fail because of winmd or xbf files. I just tried that with this change and it seems like it's better? Somewhat better.

@zadjii-msft
Copy link
Member

like, pressing F5 on a new launch would fail because of winmd or xbf files

I see that all the time, especially when switching branches. There doesn't seem to be any rhyme or reason, but I'd be happy if this helped even a little.

Copy link
Member

@zadjii-msft zadjii-msft left a comment

Choose a reason for hiding this comment

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

K cool with me. Kinda shocked there wasn't more that needed to be done, but I guess that's a good thing

@DHowett-MSFT DHowett-MSFT added the AutoMerge Marked for automatic merge by the bot when requirements are met label Mar 23, 2020
@ghost
Copy link

ghost commented Mar 23, 2020

Hello @DHowett-MSFT!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 69d99a7 into master Mar 23, 2020
@ghost ghost deleted the dev/duhowett/c++++winrt branch March 23, 2020 17:15
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AutoMerge Marked for automatic merge by the bot when requirements are met

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants