From 0dd7d619293730af91a207b97929da09a0171a60 Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Tue, 21 Apr 2026 12:36:09 -0700 Subject: [PATCH 1/5] Update versioning for 2605 preview release --- docs/ReleaseNotes.md | 5 +---- utils/version/latest-release.json | 6 +++--- utils/version/version.inc | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index 7ff424587f..a25456b6bb 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -17,10 +17,7 @@ The included licenses apply to the following files: ## Changelog -### Upcoming Release - -Place release notes for the upcoming release below this line and remove this -line upon naming the release. Refer to previous for appropriate section names. +### Version 1.10.2605 Preview #### Experimental Shader Model 6.10 diff --git a/utils/version/latest-release.json b/utils/version/latest-release.json index 2d925bbc7d..0f4770767d 100644 --- a/utils/version/latest-release.json +++ b/utils/version/latest-release.json @@ -1,8 +1,8 @@ { "version": { "major": "1", - "minor": "9", - "rev": "2602" + "minor": "10", + "rev": "2606" }, - "sha": "f255809c3dd408c32349d6b7b16019b8b24e1d2e" + "sha": "c763461468246fb779fb234b08ad3b460fb93a02" } diff --git a/utils/version/version.inc b/utils/version/version.inc index 9556c74345..aa81ba18f0 100644 --- a/utils/version/version.inc +++ b/utils/version/version.inc @@ -13,12 +13,12 @@ #ifdef RC_VERSION_FIELD_2 #undef RC_VERSION_FIELD_2 #endif -#define RC_VERSION_FIELD_2 9 +#define RC_VERSION_FIELD_2 10 #ifdef RC_VERSION_FIELD_3 #undef RC_VERSION_FIELD_3 #endif -#define RC_VERSION_FIELD_3 2602 +#define RC_VERSION_FIELD_3 2605 #ifdef RC_VERSION_FIELD_4 #undef RC_VERSION_FIELD_4 @@ -28,7 +28,7 @@ #ifdef RC_FILE_VERSION #undef RC_FILE_VERSION #endif -#define RC_FILE_VERSION "1.9.2602.0" +#define RC_FILE_VERSION "1.10.2605.0" #ifdef RC_FILE_DESCRIPTION #undef RC_FILE_DESCRIPTION @@ -49,7 +49,7 @@ #ifdef RC_PRODUCT_VERSION #undef RC_PRODUCT_VERSION #endif -#define RC_PRODUCT_VERSION "1.9.2602.0" +#define RC_PRODUCT_VERSION "1.10.2605.0" #ifdef HLSL_TOOL_NAME #undef HLSL_TOOL_NAME From 54c62d75376411adff8ffa48dc7879a13a1ba27c Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Tue, 21 Apr 2026 13:15:37 -0700 Subject: [PATCH 2/5] Change minor back to 9 and fix rev --- utils/version/latest-release.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/version/latest-release.json b/utils/version/latest-release.json index 0f4770767d..f2b10bfd89 100644 --- a/utils/version/latest-release.json +++ b/utils/version/latest-release.json @@ -1,8 +1,8 @@ { "version": { "major": "1", - "minor": "10", - "rev": "2606" + "minor": "9", + "rev": "2605" }, "sha": "c763461468246fb779fb234b08ad3b460fb93a02" } From 2276cf59819e4d1dc13171923e0dfa278dd4dd65 Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Tue, 21 Apr 2026 13:17:23 -0700 Subject: [PATCH 3/5] Back out ReleaseNotes.md change for separate PR to address --- docs/ReleaseNotes.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index a25456b6bb..7ff424587f 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -17,7 +17,10 @@ The included licenses apply to the following files: ## Changelog -### Version 1.10.2605 Preview +### Upcoming Release + +Place release notes for the upcoming release below this line and remove this +line upon naming the release. Refer to previous for appropriate section names. #### Experimental Shader Model 6.10 From e3f2ffb57ecde818b96d54917c721c0c3b31ca3c Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Tue, 21 Apr 2026 16:17:37 -0700 Subject: [PATCH 4/5] gen_version.py: use preview_minor to override release minor for preview 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. --- utils/version/gen_version.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/utils/version/gen_version.py b/utils/version/gen_version.py index 97856d42bf..97af4adff9 100644 --- a/utils/version/gen_version.py +++ b/utils/version/gen_version.py @@ -80,7 +80,13 @@ def rc_version_field_1(self): return self.latest_release_info["version"]["major"] def rc_version_field_2(self): - return self.latest_release_info["version"]["minor"] + minor = self.latest_release_info["version"]["minor"] + # If this is a preview branch, we use the preview_minor field as the + # 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) + return minor def rc_version_field_3(self): return self.latest_release_info["version"]["rev"] if self.options.official else "0" From 75fa7ad81ee3edd78a8c094ed5caafe8c40294e8 Mon Sep 17 00:00:00 2001 From: Tex Riddell Date: Tue, 21 Apr 2026 16:17:59 -0700 Subject: [PATCH 5/5] add preview_minor to latest-release.json --- utils/version/latest-release.json | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/version/latest-release.json b/utils/version/latest-release.json index f2b10bfd89..4faf42b7b4 100644 --- a/utils/version/latest-release.json +++ b/utils/version/latest-release.json @@ -2,6 +2,7 @@ "version": { "major": "1", "minor": "9", + "preview_minor": "10", "rev": "2605" }, "sha": "c763461468246fb779fb234b08ad3b460fb93a02"