Skip to content

Commit 0958b62

Browse files
authored
Update versioning for SM 6.10 2605 preview release (#8395)
This change updates versioning for the SM 6.10 2605 preview. It also adds a preview_minor field to latest-release.json for use by gen_version.py to override the last released minor version in file versioning for a preview, without changing what's considered the most recent released DXIL version.
1 parent c763461 commit 0958b62

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

utils/version/gen_version.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,13 @@ def rc_version_field_1(self):
8080
return self.latest_release_info["version"]["major"]
8181

8282
def rc_version_field_2(self):
83-
return self.latest_release_info["version"]["minor"]
83+
minor = self.latest_release_info["version"]["minor"]
84+
# If this is a preview branch, we use the preview_minor field as the
85+
# minor version in the RC file. This allows us to have a different
86+
# minor version for preview releases, without changing the highest
87+
# released minor version.
88+
minor = self.latest_release_info["version"].get("preview_minor", minor)
89+
return minor
8490

8591
def rc_version_field_3(self):
8692
return self.latest_release_info["version"]["rev"] if self.options.official else "0"

utils/version/latest-release.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"version": {
33
"major": "1",
44
"minor": "9",
5-
"rev": "2602"
5+
"preview_minor": "10",
6+
"rev": "2605"
67
},
7-
"sha": "f255809c3dd408c32349d6b7b16019b8b24e1d2e"
8+
"sha": "c763461468246fb779fb234b08ad3b460fb93a02"
89
}

utils/version/version.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
#ifdef RC_VERSION_FIELD_2
1414
#undef RC_VERSION_FIELD_2
1515
#endif
16-
#define RC_VERSION_FIELD_2 9
16+
#define RC_VERSION_FIELD_2 10
1717

1818
#ifdef RC_VERSION_FIELD_3
1919
#undef RC_VERSION_FIELD_3
2020
#endif
21-
#define RC_VERSION_FIELD_3 2602
21+
#define RC_VERSION_FIELD_3 2605
2222

2323
#ifdef RC_VERSION_FIELD_4
2424
#undef RC_VERSION_FIELD_4
@@ -28,7 +28,7 @@
2828
#ifdef RC_FILE_VERSION
2929
#undef RC_FILE_VERSION
3030
#endif
31-
#define RC_FILE_VERSION "1.9.2602.0"
31+
#define RC_FILE_VERSION "1.10.2605.0"
3232

3333
#ifdef RC_FILE_DESCRIPTION
3434
#undef RC_FILE_DESCRIPTION
@@ -49,7 +49,7 @@
4949
#ifdef RC_PRODUCT_VERSION
5050
#undef RC_PRODUCT_VERSION
5151
#endif
52-
#define RC_PRODUCT_VERSION "1.9.2602.0"
52+
#define RC_PRODUCT_VERSION "1.10.2605.0"
5353

5454
#ifdef HLSL_TOOL_NAME
5555
#undef HLSL_TOOL_NAME

0 commit comments

Comments
 (0)