Skip to content

Update versioning for SM 6.10 2605 preview release#8395

Merged
tex3d merged 5 commits intomicrosoft:release-preview-1.10.2605from
tex3d:update-preview-version
Apr 22, 2026
Merged

Update versioning for SM 6.10 2605 preview release#8395
tex3d merged 5 commits intomicrosoft:release-preview-1.10.2605from
tex3d:update-preview-version

Conversation

@tex3d
Copy link
Copy Markdown
Contributor

@tex3d tex3d commented Apr 21, 2026

This change updates versioning for the SM 6.10 2605 preview.

@tex3d
Copy link
Copy Markdown
Contributor Author

tex3d commented Apr 21, 2026

Note: we could probably still use ReleaseNotes additions, which could be put into a subsequent PR if necessary.

Comment thread utils/version/latest-release.json Outdated
Comment thread docs/ReleaseNotes.md Outdated
Comment thread utils/version/version.inc
#undef RC_FILE_VERSION
#endif
#define RC_FILE_VERSION "1.9.2602.0"
#define RC_FILE_VERSION "1.10.2605.0"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

pretty sure this it intended but calling out that its showing 1.10 just in case it wasn't

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah, good point. I'm not sure how extensive the impact of the json version is, so I should update these back to 9 for consistency.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmm, but I'm not sure I want to change the binary file versions this way...

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We used to update the version in the json for the preview, but that was before we drove a highest_released_minor from that value. I think it makes sense to leave the json, since it's not the released version that's incremented, but then to also update the file version for the preview. But since there have been changes to build scripts/pipelines and versioning components, I don't know for sure whether the version.inc file is even used for the official release build, or if a different one is generated from the json dynamically instead. I need to double-check some things.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ok, my latest push adds a preview_minor to the version info in latest-release.json to support overriding the minor version in gen_version.py for preview releases without disturbing the highest released DXIL version.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We could likely merge such a change to main and extend this mechanism to avoid manually updating the DXIL version in hctdb_instrhelp.py separately. The preview_minor would always be the highest supported experimental/preview version, and any version higher than the released minor version gets the PREVIEW hash from validation.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

yeah, I don't think we do that here but getting that into main would be a nice QOL change

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

What I said here wouldn't work properly for main yet, but we could think about what would work and adjust accordingly.

tex3d added 2 commits April 21, 2026 16:17
…ew releases

In latest-release.json, for a preview release branch, set preview_minor to the preview version so that the released dxil version doesn't change, but gen_version.py has something to override the minor version for binary file versioning.
# minor version in the RC file. This allows us to have a different
# minor version for preview releases, without changing the highest
# released minor version.
minor = self.latest_release_info["version"].get("preview_minor", minor)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

there is not a branch here so this just always overrides the value? (which is okay because we are branched off main?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yeah, the idea was only to add the value on the preview branch.

Now the way I was talking about it on the other thread about potentially using it on the main branch isn't going to work the way it is today, so we'd have to think about how we want that to work more later for main. For now, I'd want to merge just this change to gen_version.py to main so subsequent previews branched off main can just set the json property like this branch did.

@tex3d tex3d merged commit 0958b62 into microsoft:release-preview-1.10.2605 Apr 22, 2026
12 checks passed
@github-project-automation github-project-automation Bot moved this from New to Done in HLSL Roadmap Apr 22, 2026
Copy link
Copy Markdown
Member

@hekota hekota left a comment

Choose a reason for hiding this comment

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

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants