Skip to content

Conversation

lbussell
Copy link
Collaborator

Related: #1146

@lbussell lbussell marked this pull request as ready for review November 25, 2024 18:54
&& expand patch.msu patch -F:* `
&& del /F /Q patch.msu `
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if PRODUCT_VERSION = "4.8.1":1}}.cab `
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isServer2025 || isNet481:1}}.cab `
Copy link
Member

Choose a reason for hiding this comment

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

I think isServer2025 is redundant in that condition.

Suggested change
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isServer2025 || isNet481:1}}.cab `
&& dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isNet481:1}}.cab `

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It is necessary. For server 2025, there is no distinction between .NET 3.5 latest patch .NET 4.8.1 latest patch. To keep the implementation simpler, I directed both of those cases to this applyPatch branch. Either we need to keep this condition so that the filename is correct in the Server 2025 3.5 Dockerfile, or we can add the 1 suffix to the "apply latest 3.5 patch" instructions instead. Then the only difference would be the comment.

@lbussell
Copy link
Collaborator Author

lbussell@36261be is an alternative to 6691140. I could go either way.

@mthalman
Copy link
Member

lbussell@36261be is an alternative to 6691140. I could go either way.

I don't mind the new style. But I do think that it should be applied consistently across all the templates in a separate PR.

@lbussell lbussell changed the base branch from main to servicing January 10, 2025 16:35
@lbussell lbussell requested a review from a team as a code owner January 10, 2025 16:35
@lbussell lbussell merged commit 0ee100b into microsoft:servicing Jan 10, 2025
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants