@@ -127,17 +127,31 @@ std::vector<std::wstring> available_versions() noexcept {
127
127
}
128
128
129
129
namespace msvc {
130
- // TODO(compnerd) add support for VS2022
130
+ // Current Build Tools
131
+ static const wchar_t toolset_current_x86_x64[] =
132
+ L" Microsoft.VisualStudio.Component.VC.Tools.x86.x64" ;
133
+ static const wchar_t toolset_current_arm[] =
134
+ L" Microsoft.VisualStudio.Component.VC.Tools.ARM" ;
135
+ static const wchar_t toolset_current_arm64[] =
136
+ L" Microsoft.VisualStudio.Component.VC.Tools.ARM64" ;
137
+ static const wchar_t toolset_current_arm64ec[] =
138
+ L" Microsoft.VisualStudio.Component.VC.Tools.ARM64EC" ;
139
+
140
+ // VS2022 v143 Build Tools
141
+ static const wchar_t toolset_v143_x86_x64[] =
142
+ L" Microsoft.VisualStudio.Component.VC.14.30.17.0.x86.x64" ;
143
+ static const wchar_t toolset_v143_arm[] =
144
+ L" Microsoft.VisualStudio.Component.VC.14.30.17.0.ARM" ;
145
+ static const wchar_t toolset_v143_arm64[] =
146
+ L" Microsoft.VisualStudio.Component.VC.14.30.17.0.ARM64" ;
131
147
132
148
// VS2019 v142 Build Tools
133
149
static const wchar_t toolset_v142_x86_x64[] =
134
- L" Microsoft.VisualStudio.Component.VC.Tools .x86.x64" ;
150
+ L" Microsoft.VisualStudio.Component.VC.14.29.16.11 .x86.x64" ;
135
151
static const wchar_t toolset_v142_arm[] =
136
- L" Microsoft.VisualStudio.Component.VC.Tools .ARM" ;
152
+ L" Microsoft.VisualStudio.Component.VC.14.29.16.11 .ARM" ;
137
153
static const wchar_t toolset_v142_arm64[] =
138
- L" Microsoft.VisualStudio.Component.VC.Tools.ARM64" ;
139
- static const wchar_t toolset_v142_arm64ec[] =
140
- L" Microsoft.VisualStudio.Component.VC.Tools.ARM64EC" ;
154
+ L" Microsoft.VisualStudio.Component.VC.14.29.16.11.ARM64" ;
141
155
142
156
// VS2017 v141 Build Tools
143
157
static const wchar_t toolset_v141_x86_x64[] =
@@ -148,8 +162,16 @@ static const wchar_t toolset_v141_arm64[] =
148
162
L" Microsoft.VisualStudio.Component.VC.v141.ARM64" ;
149
163
150
164
static const wchar_t *known_toolsets[] = {
165
+ toolset_current_x86_x64,
166
+ toolset_current_arm64ec,
167
+ toolset_current_arm64,
168
+ toolset_current_arm,
169
+
170
+ toolset_v143_x86_x64,
171
+ toolset_v143_arm64,
172
+ toolset_v143_arm,
173
+
151
174
toolset_v142_x86_x64,
152
- toolset_v142_arm64ec,
153
175
toolset_v142_arm64,
154
176
toolset_v142_arm,
155
177
0 commit comments