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.

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

Remove the win10/win11 digit from our version number. #14660

Merged
3 commits merged into from
Jan 19, 2023

Conversation

zadjii-msft
Copy link
Member

@zadjii-msft zadjii-msft commented Jan 10, 2023

As of about 2022, the one's digit of the Build of our version is a placeholder value to differentiate the Windows 10 build from the Windows 11 build. Let's trim that out, it's only a source of confusion.

For additional clarity, let's omit the Revision, which must be .0, and doesn't provide any value to report.

We will need to make sure we report releases as 1.17.ABC now, instead of 1.17.ABC1.0/1.17.ABC2.0

Let's not backport this. 1.17 will be the start of the new numbering scheme. Otherwise, 1.16.EFG < 1.16.ABC1.0, for an old version ABC1 and a new version EFG.

@ghost ghost added Area-User Interface Issues pertaining to the user interface of the Console or Terminal Issue-Task It's a feature request, but it doesn't really need a major design. Product-Terminal The new Windows Terminal. labels Jan 10, 2023
@DHowett
Copy link
Member

DHowett commented Jan 10, 2023

The original author of that thread brought up a fair consideration: that version number is required, and we will have to talk about it sometimes, because it's the package version on disk. System builders/distributors will need to know the "real" number, and the filenames will contain it too. How do we square those things?

@zadjii-msft
Copy link
Member Author

How do we square those things?

That's a good question. I don't know. Hover the short version to reveal the full version string? Bold this part of the string, but show the rest at normal font weight?

@zadjii-msft
Copy link
Member Author

@DHowett I'm gonna hand this one to you for the 1.17 call. If you want to sort out this for 1.17, That's cool. Otherwise I don't mind punting on this decision for another release.

Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

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

Meh, I'm okay with this.

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp Outdated Show resolved Hide resolved
@DHowett
Copy link
Member

DHowett commented Jan 18, 2023

Screenshot 2023-01-04 094106

@zadjii-msft zadjii-msft added the Needs-Second It's a PR that needs another sign-off label Jan 18, 2023
@zadjii-msft zadjii-msft added this to the Terminal v1.17 milestone Jan 18, 2023
@DHowett DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jan 19, 2023
@ghost
Copy link

ghost commented Jan 19, 2023

Hello @DHowett!

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 0fe0868 into main Jan 19, 2023
@ghost ghost deleted the dev/migrie/b/14106-simplify-version-number branch January 19, 2023 19:32
@ghost
Copy link

ghost commented Jan 24, 2023

🎉Windows Terminal Preview v1.17.1023 has been released which incorporates this pull request.:tada:

Handy links:

DHowett added a commit that referenced this pull request Mar 23, 2023
zadjii-msft pushed a commit that referenced this pull request Mar 24, 2023
We ship a separate package to Windows 10, which contains a copy of XAML
embedded in it, because of a bug in activating classes from framework
packages while we're elevated.

We did this to avoid wasting disk space on Windows 11 installs (which is
critical given that we're preinstalled in the Windows image.)

The fix for this issue was released in a servicing update in April 2022.
Thanks to KB5011831, we no longer need this workaround!

And finally, this means that we no longer need to depend on a copy of
"pre-release" XAML. We only did that because it would copy all of its
assets into our package.

Introduced in #12560
Closes #14106
Closes (discussion) #14981
Reverts #14660
DHowett added a commit that referenced this pull request Mar 31, 2023
We ship a separate package to Windows 10, which contains a copy of XAML
embedded in it, because of a bug in activating classes from framework
packages while we're elevated.

We did this to avoid wasting disk space on Windows 11 installs (which is
critical given that we're preinstalled in the Windows image.)

The fix for this issue was released in a servicing update in April 2022.
Thanks to KB5011831, we no longer need this workaround!

And finally, this means that we no longer need to depend on a copy of
"pre-release" XAML. We only did that because it would copy all of its
assets into our package.

Introduced in #12560
Closes #14106
Closes (discussion) #14981
Reverts #14660

(cherry picked from commit f5e9e8e)
Service-Card-Id: 88600517
Service-Version: 1.17
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-User Interface Issues pertaining to the user interface of the Console or Terminal AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Task It's a feature request, but it doesn't really need a major design. Needs-Second It's a PR that needs another sign-off Product-Terminal The new Windows Terminal.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

confusing, conflicting version indication
3 participants