Skip to content

Commit 9b2f07e

Browse files
halflifefanhalflifefan
authored
Remove vendor schema (#4816)
* Relax validation * Add additionalProperties * Changelog entry
1 parent 3394b85 commit 9b2f07e

9 files changed

+41
-192
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Features:
1313
- Add `cmake.setBuildTargetSameAsLaunchTarget` setting to automatically set the build target when the launch/debug target is changed. [#4519](https://github.com/microsoft/vscode-cmake-tools/pull/4519) [@nikita-karatun](https://github.com/nikita-karatun)
1414
- Add `cmake.additionalBuildProblemMatchers` setting to define custom problem matchers for build output. Supports tools like clang-tidy, PCLint Plus, cppcheck, or custom scripts integrated via `add_custom_command`/`add_custom_target`. [#4077](https://github.com/microsoft/vscode-cmake-tools/issues/4077)
1515
- Support `targetName` argument for launch-target command substitutions (`cmake.launchTargetPath`, etc.) via `${input:...}` variables, enabling build-before-run for non-active executable targets without changing the active launch target. [#4656](https://github.com/microsoft/vscode-cmake-tools/issues/4656)
16+
- Relax `intelliSenseMode` validation in CMake Presets. [#4815](https://github.com/microsoft/vscode-cmake-tools/issues/4815) [@halflifefan](https://github.com/halflifefan)
1617

1718
Improvements:
1819
- Add `.github/copilot-instructions.md` to ground GitHub Copilot in the repo's architecture and coding conventions.

‎schemas/CMakePresets-schema.json‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,7 @@
9898
},
9999
"intelliSenseMode": {
100100
"type": "string",
101-
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code.",
102-
"enum": [
103-
"windows-msvc-x86",
104-
"windows-msvc-x64",
105-
"windows-msvc-arm",
106-
"windows-msvc-arm64",
107-
"android-clang-x86",
108-
"android-clang-x64",
109-
"android-clang-arm",
110-
"android-clang-arm64",
111-
"ios-clang-x86",
112-
"ios-clang-x64",
113-
"ios-clang-arm",
114-
"ios-clang-arm64",
115-
"windows-clang-x86",
116-
"windows-clang-x64",
117-
"windows-clang-arm",
118-
"windows-clang-arm64",
119-
"linux-gcc-x86",
120-
"linux-gcc-x64",
121-
"linux-gcc-arm"
122-
]
101+
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code."
123102
},
124103
"intelliSenseOptions": {
125104
"type": "object",
@@ -171,7 +150,8 @@
171150
"type": "string",
172151
"description": "A command line tool (specified as a command line program + arguments, e.g. \"gencache.bat debug\") to generate the CMake cache. This command will run from the shell in the preset’s specified environment when cache generation is invoked. This key is only supported by the \"Open Existing Cache\" scenario in Visual Studio."
173152
}
174-
}
153+
},
154+
"additionalProperties": true
175155
},
176156
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
177157
"type": "object",
@@ -284,7 +264,8 @@
284264
"default": false,
285265
"description": "If true, Visual Studio will always use the WSL1 toolset when targeting WSL from Visual Studio. The WSL1 toolset executes all commands locally and relies on Windows drives mounted under the /mnt folder to access local source files from WSL. These operations may be slower with WSL2."
286266
}
287-
}
267+
},
268+
"additionalProperties": true
288269
}
289270
}
290271
},

‎schemas/CMakePresets-v10-schema.json‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,28 +111,7 @@
111111
},
112112
"intelliSenseMode": {
113113
"type": "string",
114-
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code.",
115-
"enum": [
116-
"windows-msvc-x86",
117-
"windows-msvc-x64",
118-
"windows-msvc-arm",
119-
"windows-msvc-arm64",
120-
"android-clang-x86",
121-
"android-clang-x64",
122-
"android-clang-arm",
123-
"android-clang-arm64",
124-
"ios-clang-x86",
125-
"ios-clang-x64",
126-
"ios-clang-arm",
127-
"ios-clang-arm64",
128-
"windows-clang-x86",
129-
"windows-clang-x64",
130-
"windows-clang-arm",
131-
"windows-clang-arm64",
132-
"linux-gcc-x86",
133-
"linux-gcc-x64",
134-
"linux-gcc-arm"
135-
]
114+
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code."
136115
},
137116
"intelliSenseOptions": {
138117
"type": "object",
@@ -184,7 +163,8 @@
184163
"type": "string",
185164
"description": "A command line tool (specified as a command line program + arguments, e.g. \"gencache.bat debug\") to generate the CMake cache. This command will run from the shell in the preset’s specified environment when cache generation is invoked. This key is only supported by the \"Open Existing Cache\" scenario in Visual Studio."
186165
}
187-
}
166+
},
167+
"additionalProperties": true
188168
},
189169
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
190170
"type": "object",
@@ -297,7 +277,8 @@
297277
"default": false,
298278
"description": "If true, Visual Studio will always use the WSL1 toolset when targeting WSL from Visual Studio. The WSL1 toolset executes all commands locally and relies on Windows drives mounted under the /mnt folder to access local source files from WSL. These operations may be slower with WSL2."
299279
}
300-
}
280+
},
281+
"additionalProperties": true
301282
}
302283
}
303284
},

‎schemas/CMakePresets-v3-schema.json‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,7 @@
9898
},
9999
"intelliSenseMode": {
100100
"type": "string",
101-
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code.",
102-
"enum": [
103-
"windows-msvc-x86",
104-
"windows-msvc-x64",
105-
"windows-msvc-arm",
106-
"windows-msvc-arm64",
107-
"android-clang-x86",
108-
"android-clang-x64",
109-
"android-clang-arm",
110-
"android-clang-arm64",
111-
"ios-clang-x86",
112-
"ios-clang-x64",
113-
"ios-clang-arm",
114-
"ios-clang-arm64",
115-
"windows-clang-x86",
116-
"windows-clang-x64",
117-
"windows-clang-arm",
118-
"windows-clang-arm64",
119-
"linux-gcc-x86",
120-
"linux-gcc-x64",
121-
"linux-gcc-arm"
122-
]
101+
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code."
123102
},
124103
"intelliSenseOptions": {
125104
"type": "object",
@@ -171,7 +150,8 @@
171150
"type": "string",
172151
"description": "A command line tool (specified as a command line program + arguments, e.g. \"gencache.bat debug\") to generate the CMake cache. This command will run from the shell in the preset’s specified environment when cache generation is invoked. This key is only supported by the \"Open Existing Cache\" scenario in Visual Studio."
173152
}
174-
}
153+
},
154+
"additionalProperties": true
175155
},
176156
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
177157
"type": "object",
@@ -284,7 +264,8 @@
284264
"default": false,
285265
"description": "If true, Visual Studio will always use the WSL1 toolset when targeting WSL from Visual Studio. The WSL1 toolset executes all commands locally and relies on Windows drives mounted under the /mnt folder to access local source files from WSL. These operations may be slower with WSL2."
286266
}
287-
}
267+
},
268+
"additionalProperties": true
288269
}
289270
}
290271
},

‎schemas/CMakePresets-v4-schema.json‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,7 @@
9898
},
9999
"intelliSenseMode": {
100100
"type": "string",
101-
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code.",
102-
"enum": [
103-
"windows-msvc-x86",
104-
"windows-msvc-x64",
105-
"windows-msvc-arm",
106-
"windows-msvc-arm64",
107-
"android-clang-x86",
108-
"android-clang-x64",
109-
"android-clang-arm",
110-
"android-clang-arm64",
111-
"ios-clang-x86",
112-
"ios-clang-x64",
113-
"ios-clang-arm",
114-
"ios-clang-arm64",
115-
"windows-clang-x86",
116-
"windows-clang-x64",
117-
"windows-clang-arm",
118-
"windows-clang-arm64",
119-
"linux-gcc-x86",
120-
"linux-gcc-x64",
121-
"linux-gcc-arm"
122-
]
101+
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code."
123102
},
124103
"intelliSenseOptions": {
125104
"type": "object",
@@ -171,7 +150,8 @@
171150
"type": "string",
172151
"description": "A command line tool (specified as a command line program + arguments, e.g. \"gencache.bat debug\") to generate the CMake cache. This command will run from the shell in the preset’s specified environment when cache generation is invoked. This key is only supported by the \"Open Existing Cache\" scenario in Visual Studio."
173152
}
174-
}
153+
},
154+
"additionalProperties": true
175155
},
176156
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
177157
"type": "object",
@@ -284,7 +264,8 @@
284264
"default": false,
285265
"description": "If true, Visual Studio will always use the WSL1 toolset when targeting WSL from Visual Studio. The WSL1 toolset executes all commands locally and relies on Windows drives mounted under the /mnt folder to access local source files from WSL. These operations may be slower with WSL2."
286266
}
287-
}
267+
},
268+
"additionalProperties": true
288269
}
289270
}
290271
},

‎schemas/CMakePresets-v5-schema.json‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,7 @@
9898
},
9999
"intelliSenseMode": {
100100
"type": "string",
101-
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code.",
102-
"enum": [
103-
"windows-msvc-x86",
104-
"windows-msvc-x64",
105-
"windows-msvc-arm",
106-
"windows-msvc-arm64",
107-
"android-clang-x86",
108-
"android-clang-x64",
109-
"android-clang-arm",
110-
"android-clang-arm64",
111-
"ios-clang-x86",
112-
"ios-clang-x64",
113-
"ios-clang-arm",
114-
"ios-clang-arm64",
115-
"windows-clang-x86",
116-
"windows-clang-x64",
117-
"windows-clang-arm",
118-
"windows-clang-arm64",
119-
"linux-gcc-x86",
120-
"linux-gcc-x64",
121-
"linux-gcc-arm"
122-
]
101+
"description": "An optional key that indicates the preferred IntelliSense mode. Mode used for computing IntelliSense information in Visual Studio and Visual Studio Code."
123102
},
124103
"intelliSenseOptions": {
125104
"type": "object",
@@ -171,7 +150,8 @@
171150
"type": "string",
172151
"description": "A command line tool (specified as a command line program + arguments, e.g. \"gencache.bat debug\") to generate the CMake cache. This command will run from the shell in the preset’s specified environment when cache generation is invoked. This key is only supported by the \"Open Existing Cache\" scenario in Visual Studio."
173152
}
174-
}
153+
},
154+
"additionalProperties": true
175155
},
176156
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
177157
"type": "object",
@@ -284,7 +264,8 @@
284264
"default": false,
285265
"description": "If true, Visual Studio will always use the WSL1 toolset when targeting WSL from Visual Studio. The WSL1 toolset executes all commands locally and relies on Windows drives mounted under the /mnt folder to access local source files from WSL. These operations may be slower with WSL2."
286266
}
287-
}
267+
},
268+
"additionalProperties": true
288269
}
289270
}
290271
},

0 commit comments

Comments
 (0)