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

Force the bundle major version to be over 3000 #12819

Merged
5 commits merged into from Apr 4, 2022

Conversation

DHowett
Copy link
Member

@DHowett DHowett commented Apr 4, 2022

Before #12691, the msixbundle version was of the format YYYY.MM.DD.0.
After #12691, it became the same as the build of Terminal it contained.

This caused some trouble for some systems: major version 1 is much,
much smaller than 2022.

Adding 3000 to the major version component, only for the bundle, gets
around this. Ugh.

Fixes #12816.

Before #12691, the msixbundle version was of the format YYYY.MM.DD.0.
After #12691, it became the same as the build of Terminal it contained.

This caused some trouble for _some_ systems: major version 1 is much,
much smaller than 2022.

Adding 3000 to the major version component, _only for the bundle_, gets
around this. Ugh.

Fixes #12816.
@DHowett DHowett added this to To Cherry Pick in 1.13 Servicing Pipeline via automation Apr 4, 2022
@DHowett DHowett added this to To Cherry Pick in 1.12 Servicing Pipeline via automation Apr 4, 2022
@ghost ghost added Issue-Bug It either shouldn't be doing this or needs an investigation. Product-Terminal The new Windows Terminal. labels Apr 4, 2022

$Files | % { Move-Item -Verbose $_.Directory $_.Directory.Parent.Parent -EA:Ignore }
pwsh: true
# - task: TouchdownBuildTask@1
Copy link
Member Author

Choose a reason for hiding this comment

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

NFCI commit, will be reverted

@DHowett
Copy link
Member Author

DHowett commented Apr 4, 2022

image

@DHowett DHowett marked this pull request as ready for review April 4, 2022 18:42
@DHowett DHowett requested review from zadjii-msft and miniksa and removed request for zadjii-msft April 4, 2022 18:43
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.

There is a risk that using this version number will fail because it is
thousands of numbers less than "2022". We'll have to see if the store
rolls it out properly

Narrator: it did not

@DHowett DHowett requested a review from lhecker April 4, 2022 21:40
Copy link
Member

@miniksa miniksa left a comment

Choose a reason for hiding this comment

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

Gross.

@DHowett
Copy link
Member Author

DHowett commented Apr 4, 2022

@msftbot merge this in 1 minute

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Apr 4, 2022
@ghost
Copy link

ghost commented Apr 4, 2022

Hello @DHowett!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Mon, 04 Apr 2022 21:46:09 GMT, which is in 1 minute

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ghost ghost merged commit bc6bf15 into main Apr 4, 2022
@ghost ghost deleted the dev/duhowett/over-three-THOUSAND branch April 4, 2022 21:47
@DHowett DHowett moved this from To Cherry Pick to Cherry Picked in 1.12 Servicing Pipeline Apr 4, 2022
@DHowett DHowett moved this from To Cherry Pick to Cherry Picked in 1.13 Servicing Pipeline Apr 4, 2022
DHowett added a commit that referenced this pull request Apr 4, 2022
Before #12691, the msixbundle version was of the format YYYY.MM.DD.0.
After #12691, it became the same as the build of Terminal it contained.

This caused some trouble for _some_ systems: major version 1 is much,
much smaller than 2022.

Adding 3000 to the major version component, _only for the bundle_, gets
around this. Ugh.

Fixes #12816.

(cherry picked from commit bc6bf15)
Service-Card-Id: 80144497
Service-Version: 1.13
DHowett added a commit that referenced this pull request Apr 4, 2022
Before #12691, the msixbundle version was of the format YYYY.MM.DD.0.
After #12691, it became the same as the build of Terminal it contained.

This caused some trouble for _some_ systems: major version 1 is much,
much smaller than 2022.

Adding 3000 to the major version component, _only for the bundle_, gets
around this. Ugh.

Fixes #12816.

(cherry picked from commit bc6bf15)
Service-Card-Id: 80144496
Service-Version: 1.12
@DHowett DHowett moved this from Cherry Picked to Validated in 1.12 Servicing Pipeline Apr 8, 2022
@ghost
Copy link

ghost commented Apr 19, 2022

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

Handy links:

@ghost
Copy link

ghost commented Apr 19, 2022

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

Handy links:

@DHowett DHowett moved this from Cherry Picked to Validated in 1.13 Servicing Pipeline May 10, 2022
@DHowett DHowett moved this from Validated to Shipped in 1.13 Servicing Pipeline May 10, 2022
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 Issue-Bug It either shouldn't be doing this or needs an investigation. Product-Terminal The new Windows Terminal.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Can't install Terminal 1.12.10732.0 using DISM on Windows 11
3 participants