Revert WSLG_SOURCE_DIR remap to fix UserConfig.cmake.sample (#40909)
beena352 committed
Jun 25, 2026 at 12:50 UTC
65f18b42dc526d9a37dcd1c6b0bf5925d3c79603
2 files changed
+6
-6
CMakeLists.txt
+3
-3
@@ -132,7 +132,7 @@ find_nuget_package(Microsoft.WSL.bsdtar BSDTARD /build/native/bin)
132
find_nuget_package(Microsoft.WSL.LinuxSdk LINUXSDK /)
133
find_nuget_package(Microsoft.WSL.TestDistro TEST_DISTRO /)
134
find_nuget_package(Microsoft.WSL.TestData WSL_TEST_DATA /)
135
-find_nuget_package(Microsoft.WSLg WSLG /)
135
+find_nuget_package(Microsoft.WSLg WSLG /build/native/bin)
136
find_nuget_package(vswhere VSWHERE /tools)
137
find_nuget_package(Wix WIX /tools/net6.0/any)
138
@@ -235,8 +235,8 @@ set(PACKAGE_CERTIFICATE ${GENERATED_DIR}/dev-cert.pfx)
235
# and the pipeline's symbol publishing step find them. Without the PDBs here,
236
# Watson can't resolve function names in their crash frames.
237
string(REPLACE ".dll" ".pdb" WSLG_TS_PLUGIN_PDB ${WSLG_TS_PLUGIN_DLL})
238
-file(CREATE_LINK ${WSLG_SOURCE_DIR}/build/native/bin/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_DLL} ${BIN}/${WSLG_TS_PLUGIN_DLL})
239
-file(CREATE_LINK ${WSLG_SOURCE_DIR}/build/native/bin/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_PDB} ${BIN}/${WSLG_TS_PLUGIN_PDB})
238
+file(CREATE_LINK ${WSLG_SOURCE_DIR}/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_DLL} ${BIN}/${WSLG_TS_PLUGIN_DLL})
239
+file(CREATE_LINK ${WSLG_SOURCE_DIR}/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_PDB} ${BIN}/${WSLG_TS_PLUGIN_PDB})
240
file(CREATE_LINK ${WSLDEPS_SOURCE_DIR}/bin/wsldeps.dll ${BIN}/wsldeps.dll)
241
file(CREATE_LINK ${WSLDEPS_SOURCE_DIR}/bin/wsldeps.pdb ${BIN}/wsldeps.pdb)
242
# wsldevicehost.dll is packaged directly from its NuGet package, so only its PDB
msipackage/package.wix.in
+3
-3
@@ -41,7 +41,7 @@
41
<?endif?>
42
43
<?if "${WSL_DEV_BINARY_PATH}" = "" ?>
44
- <File Id="system.vhd" Source="${WSLG_SOURCE_DIR}/build/native/bin/${TARGET_PLATFORM}/system.vhd"/>
44
+ <File Id="system.vhd" Source="${WSLG_SOURCE_DIR}/${TARGET_PLATFORM}/system.vhd" />
45
<?endif?>
46
47
<!-- Add INSTALLDIR to system PATH to make wslc.exe and other CLI tools accessible. -->
@@ -441,8 +441,8 @@
441
<Component Id="wslg" Guid="F0C8D6BA-1502-41E7-BF72-D93DFA134731" UninstallWhenSuperseded="yes" DisableRegistryReflection="yes" Bitness="always64">
442
<?if "${WSL_DEV_BINARY_PATH}" = "" ?>
443
<File Id="msrdc.exe" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/msrdc.exe" />
444
- <File Id="wslg.rdp" Source="${WSLG_SOURCE_DIR}/build/native/bin/wslg.rdp" />
445
- <File Id="wslg_desktop.rdp" Source="${WSLG_SOURCE_DIR}/build/native/bin/wslg_desktop.rdp" />
444
+ <File Id="wslg.rdp" Source="${WSLG_SOURCE_DIR}/wslg.rdp" />
445
+ <File Id="wslg_desktop.rdp" Source="${WSLG_SOURCE_DIR}/wslg_desktop.rdp" />
446
<File Id="rdclientax.dll" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/rdclientax.dll" />
447
<File Id="rdpnanoTransport.dll" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/rdpnanoTransport.dll" />
448
<File Id="RdpWinStlHelper.dll" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/RdpWinStlHelper.dll" />