Skip to content

Commit c85520b

Browse files
committed
fix cmdpal toolkit restore failure for slnx
1 parent d515c67 commit c85520b

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PathToRoot>..\..\..\..\..\</PathToRoot>
55
<WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003</WasdkNuget>
66
<CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
7-
<WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188</WindowsSdkBuildToolsNuget>
7+
<WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.6901</WindowsSdkBuildToolsNuget>
88
<WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40</WebView2Nuget>
99
</PropertyGroup>
1010
<Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
1313
<package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
1414
<package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
15-
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4188" targetFramework="native" />
15+
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.6901" targetFramework="native" />
1616
<package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
17-
</packages>
17+
</packages>

src/modules/cmdpal/extensionsdk/nuget/BuildSDKHelper.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,15 @@ if ($IsAzurePipelineBuild) {
5454
} else {
5555
$nugetPath = (Join-Path $PSScriptRoot "NugetWrapper.cmd")
5656
}
57+
$solutionPath = (Join-Path $PSScriptRoot "..\..\..\..\..\PowerToys.slnx")
5758

5859
if (($BuildStep -ieq "all") -Or ($BuildStep -ieq "build")) {
59-
& $nugetPath restore (Join-Path $PSScriptRoot "..\..\..\..\..\PowerToys.slnx")
60+
$restoreArgs = @(
61+
$solutionPath
62+
"/t:Restore"
63+
"/p:RestorePackagesConfig=true"
64+
)
65+
& $msbuildPath $restoreArgs
6066

6167
Try {
6268
foreach ($config in $Configuration.Split(",")) {

0 commit comments

Comments
 (0)