diff --git a/common/changes/@microsoft/rush/fix-build-cache-schema_2024-11-19-23-27.json b/common/changes/@microsoft/rush/fix-build-cache-schema_2024-11-19-23-27.json new file mode 100644 index 00000000000..69319334969 --- /dev/null +++ b/common/changes/@microsoft/rush/fix-build-cache-schema_2024-11-19-23-27.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Update schema for build-cache.json to include recent updates to the @rushstack/rush-azure-storage-build-cache-plugin.", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index e075a4ebbcd..28a569ebe8f 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -103,7 +103,7 @@ "policyName": "rush", "definitionName": "lockStepVersion", "version": "5.141.0", - "nextBump": "minor", + "nextBump": "patch", "mainProject": "@microsoft/rush" } ] diff --git a/libraries/rush-lib/assets/rush-init/common/config/rush/build-cache.json b/libraries/rush-lib/assets/rush-init/common/config/rush/build-cache.json index 95c6e272202..072e9f7d497 100644 --- a/libraries/rush-lib/assets/rush-init/common/config/rush/build-cache.json +++ b/libraries/rush-lib/assets/rush-init/common/config/rush/build-cache.json @@ -68,7 +68,17 @@ /** * If set to true, allow writing to the cache. Defaults to false. */ - // "isCacheWriteAllowed": true + // "isCacheWriteAllowed": true, + + /** + * The Entra ID login flow to use. Defaults to 'AdoCodespacesAuth' on GitHub Codespaces, 'InteractiveBrowser' otherwise. + */ + // "loginFlow": "InteractiveBrowser", + + /** + * If set to true, reading the cache requires authentication. Defaults to false. + */ + // "readRequiresAuthentication": true }, /** diff --git a/libraries/rush-lib/src/schemas/build-cache.schema.json b/libraries/rush-lib/src/schemas/build-cache.schema.json index a26e40aeb2a..4131a90bd6e 100644 --- a/libraries/rush-lib/src/schemas/build-cache.schema.json +++ b/libraries/rush-lib/src/schemas/build-cache.schema.json @@ -54,6 +54,11 @@ "description": "The Azure environment the storage account exists in. Defaults to AzurePublicCloud.", "enum": ["AzurePublicCloud", "AzureChina", "AzureGermany", "AzureGovernment"] }, + "loginFlow": { + "type": "string", + "description": "The Entra ID login flow to use. Defaults to 'AdoCodespacesAuth' on GitHub Codespaces, 'InteractiveBrowser' otherwise.", + "enum": ["AdoCodespacesAuth", "InteractiveBrowser", "DeviceCode"] + }, "blobPrefix": { "type": "string", "description": "An optional prefix for cache item blob names." @@ -61,6 +66,10 @@ "isCacheWriteAllowed": { "type": "boolean", "description": "If set to true, allow writing to the cache. Defaults to false." + }, + "readRequiresAuthentication": { + "type": "boolean", + "description": "If set to true, reading the cache requires authentication. Defaults to false." } } },