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" diff --git a/utils/version/latest-release.json b/utils/version/latest-release.json index 2d925bbc7d..4faf42b7b4 100644 --- a/utils/version/latest-release.json +++ b/utils/version/latest-release.json @@ -2,7 +2,8 @@ "version": { "major": "1", "minor": "9", - "rev": "2602" + "preview_minor": "10", + "rev": "2605" }, - "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