Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pipelines/build-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parameters:
type: object
default:
- target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;initramfs;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin;wslaclient;wsltests"
pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings.dll,wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,lxutil.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll,wslaclient.dll"
pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings.dll,wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll,wslaclient.dll"
- target: "msixgluepackage"
pattern: "gluepackage.msix"
- target: "msipackage"
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/flight-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ stages:
displayName: Copy AppxUpload artifact

# creates a submission package that is published to the store; containers store page information and the WSL appxupload
- task: MS-RDX-MRO.windows-store-publish-dev.package-task.store-package@3
- task: MS-RDX-MRO.windows-store-publish.package-task.store-package@3
displayName: 'Creating StoreBroker Payload'
inputs:
serviceEndpoint: 'AzureConnection-StoreBroker-WIF'
Expand All @@ -88,7 +88,7 @@ stages:
displayName: Copy StoreBrokerPayload to drop

# submit the package flight to the WSL SelfHost Flight Group
- task: MS-RDX-MRO.windows-store-publish-dev.flight-task.store-flight@3
- task: MS-RDX-MRO.windows-store-publish.flight-task.store-flight@3
displayName: 'Flight StoreBroker Package to Partner Center - WSL SelfHost Flight Group'
condition: and(succeeded(), eq('${{ parameters.publishPackage }}', true))
inputs:
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,11 @@ find_nuget_package(Wix WIX /tools/net6.0/any)
if (${TARGET_PLATFORM} STREQUAL "x64")
find_nuget_package(Microsoft.DXCore.Linux.amd64fre DXCORE /build/native)
find_nuget_package(Microsoft.WSL.Dependencies.amd64fre WSLDEPS /build/native)
find_nuget_package(Microsoft.WSL.LxUtil.amd64fre LXUTIL /build/native)
endif()

if (${TARGET_PLATFORM} STREQUAL "arm64")
find_nuget_package(Microsoft.DXCore.Linux.arm64fre DXCORE /build/native)
find_nuget_package(Microsoft.WSL.Dependencies.arm64fre WSLDEPS /build/native)
find_nuget_package(Microsoft.WSL.LxUtil.arm64fre LXUTIL /build/native)
endif()

# Wsl Settings packages
Expand Down Expand Up @@ -154,7 +152,6 @@ file(MAKE_DIRECTORY ${GENERATED_DIR})

set(PACKAGE_CERTIFICATE ${GENERATED_DIR}/dev-cert.pfx)
file(CREATE_LINK ${WSL_DEVICE_HOST_SOURCE_DIR}/bin/${TARGET_PLATFORM}/wsldevicehost.dll ${BIN}/wsldevicehost.dll)
file(CREATE_LINK ${LXUTIL_SOURCE_DIR}/bin/lxutil.dll ${BIN}/lxutil.dll)
file(CREATE_LINK ${WSLG_SOURCE_DIR}/${TARGET_PLATFORM}/${WSLG_TS_PLUGIN_DLL} ${BIN}/${WSLG_TS_PLUGIN_DLL})
file(CREATE_LINK ${WSLDEPS_SOURCE_DIR}/bin/wsldeps.dll ${BIN}/wsldeps.dll)

Expand Down Expand Up @@ -205,7 +202,6 @@ add_compile_definitions(UNICODE
WSL_DEVICE_HOST_VERSION="${WSL_DEVICE_HOST_VERSION}"
COMMIT_HASH="${COMMIT_HASH}"
WSL_PACKAGE_VERSION="${PACKAGE_VERSION}"
LXUTIL_VERSION="${LXUTIL_VERSION}"
MSRDC_VERSION="${MSRDC_VERSION}"
DIRECT3D_VERSION="${DIRECT3D_VERSION}"
DXCORE_VERSION="${DXCORE_VERSION}"
Expand Down Expand Up @@ -237,7 +233,6 @@ endif()

# Common link libraries
link_directories(${WSLDEPS_SOURCE_DIR}/lib/)
link_directories(${LXUTIL_SOURCE_DIR}/lib/)
set(COMMON_LINK_LIBRARIES
ws2_32.lib
Userenv.lib
Expand Down
33 changes: 33 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,39 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---------------------------------------------------------

---------------------------------------------------------

Microsoft.NETCore.App.Runtime.win-arm64 10.0.0 - MIT



The MIT License (MIT)

Copyright (c) .NET Foundation and Contributors

All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


---------------------------------------------------------

---------------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions distributions/DistributionInfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,18 @@
"Name": "SUSE-Linux-Enterprise-15-SP7",
"FriendlyName": "SUSE Linux Enterprise 15 SP7",
"Default": false,
"Amd64Url": {

Check warning on line 64 in distributions/DistributionInfo.json

View workflow job for this annotation

GitHub Actions / Validate tar based distributions changes

Warning: * value for oobe.command is not under /usr/lib/wsl or /usr/libexec/wsl: "/usr/sbin/wsl-firstboot" * value for shortcut.icon is not under /usr/lib/wsl or /usr/share/wsl: "/usr/share/pixmaps/SUSE-Linux-Enterprise-15-SP7.ico"
"Url": "https://github.com/SUSE/WSL-instarball/releases/download/v20250903.0/SUSE-Linux-Enterprise-15-SP7-15.7.x86_64-27.32-Build27.32.wsl",
"Sha256": "0x1e53279af609b9d67b108bc31f1318c3317338595298ef8dfbf7a5728ab8a093"
"Url": "https://github.com/SUSE/WSL-instarball/releases/download/v20251201.0/SUSE-Linux-Enterprise-15-SP7-15.7.x86_64-30.1-Build30.1.wsl",
"Sha256": "0x60924e13286ed15bdcf9069e3a24d3394fb858954de3bdfcb1ea576900b81b2e"
}
},
{
"Name": "SUSE-Linux-Enterprise-16.0",
"FriendlyName": "SUSE Linux Enterprise 16.0",
"Default": true,
"Amd64Url": {

Check warning on line 73 in distributions/DistributionInfo.json

View workflow job for this annotation

GitHub Actions / Validate tar based distributions changes

Warning: * value for oobe.command is not under /usr/lib/wsl or /usr/libexec/wsl: "/usr/sbin/wsl-firstboot" * value for shortcut.icon is not under /usr/lib/wsl or /usr/share/wsl: "/usr/share/pixmaps/SUSE-Linux-Enterprise-16.0.ico"
"Url": "https://github.com/SUSE/WSL-instarball/releases/download/v20251104.0/SUSE-Linux-Enterprise-16.0-16.0.x86_64-1.3-Build1.3.wsl",
"Sha256": "0xb91f901ba96910fa65218ef0e6aaae7b9980bd11fed63cb3507878aa8915d726"
"Url": "https://github.com/SUSE/WSL-instarball/releases/download/v20251201.0/SUSE-Linux-Enterprise-16.0-16.0.x86_64-1.9-Build1.9.wsl",
"Sha256": "0xf0fc07ed3543d3dc24cfb35b4194bbecf98485cefdd720c521034ac1c54bffd3"
}
}
],
Expand Down Expand Up @@ -166,8 +166,8 @@
"FriendlyName": "Arch Linux",
"Default": true,
"Amd64Url": {
"Url": "https://fastly.mirror.pkgbuild.com/wsl/2025.11.01.150831/archlinux-2025.11.01.150831.wsl",
"Sha256": "9dbac892c38c94fd22a8988eff4e072778f3f445378d33a81474a2b88cb04562"
"Url": "https://fastly.mirror.pkgbuild.com/wsl/2025.12.01.153427/archlinux-2025.12.01.153427.wsl",
"Sha256": "8dfe92910a188f191b0af2972bd4bda661178b769ce820a8921e8b7aeae9a517"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion msipackage/package.wix.in
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@
<File Id="RdpWinStlHelper.dll" Source="${MSRDC_SOURCE_DIR}/${TARGET_PLATFORM}/RdpWinStlHelper.dll" />
<?endif?>
<File Id="wsldevicehost.dll" Source="${BIN}/wsldevicehost.dll" />
<File Id="lxutil.dll" Source="${BIN}/lxutil.dll" />
<File Id="${WSLG_TS_PLUGIN_DLL}" Source="${BIN}/${WSLG_TS_PLUGIN_DLL}" />

<!-- MSRDC Plugin registration -->
Expand Down
4 changes: 1 addition & 3 deletions packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
<package id="Microsoft.WSL.Dependencies.amd64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
<package id="Microsoft.WSL.Dependencies.arm64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
<package id="Microsoft.WSL.DeviceHost" version="1.0.0-20251202.1" />
<package id="Microsoft.WSL.Kernel" version="6.6.87.2-1" targetFramework="native" />
<package id="Microsoft.WSL.Kernel" version="6.6.114.1-1" targetFramework="native" />
<package id="Microsoft.WSL.LinuxSdk" version="1.20.0" targetFramework="native" />
<package id="Microsoft.WSL.LxUtil.amd64fre" version="10.0.26100.1-240331-1435.ge-release" />
<package id="Microsoft.WSL.LxUtil.arm64fre" version="10.0.26100.1-240331-1435.ge-release" />
<package id="Microsoft.WSL.TestDistro" version="2.5.7-47" />
<package id="Microsoft.WSL.WSLATestDistro" version="0.1.0" />
<package id="Microsoft.WSLg" version="1.0.71" />
Expand Down
11 changes: 10 additions & 1 deletion src/linux/init/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2258,7 +2258,16 @@ Return Value:
if (Value != nullptr)
{
Config.VmId = Value;
unsetenv(LX_WSL2_VM_ID_ENV);

//
// Unset the environment variable for user distros.
//

Value = getenv(LX_WSL2_SHARED_MEMORY_OB_DIRECTORY);
if (!Value)
{
unsetenv(LX_WSL2_VM_ID_ENV);
}
}

//
Expand Down
17 changes: 3 additions & 14 deletions src/windows/common/NatNetworking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -506,23 +506,12 @@ CATCH_LOG()

void NatNetworking::UpdateMtu()
{
unique_interface_table interfaceTable{};
THROW_IF_WIN32_ERROR(::GetIpInterfaceTable(AF_UNSPEC, &interfaceTable));

ULONG minMtu = ULONG_MAX;
for (ULONG index = 0; index < interfaceTable.get()->NumEntries; index++)
{
const auto& ipInterface = interfaceTable.get()->Table[index];
if (ipInterface.Connected)
{
minMtu = std::min(ipInterface.NlMtu, minMtu);
}
}
const auto minMtu = GetMinimumConnectedInterfaceMtu();

// Only send the update if the MTU changed.
if (minMtu != ULONG_MAX && minMtu != m_networkMtu)
if (minMtu && minMtu.value() != m_networkMtu)
{
m_networkMtu = minMtu;
m_networkMtu = minMtu.value();

hns::ModifyGuestEndpointSettingRequest<hns::NetworkInterface> notification{};
notification.ResourceType = hns::GuestEndpointResourceType::Interface;
Expand Down
35 changes: 18 additions & 17 deletions src/windows/common/VirtioNetworking.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ VirtioNetworking::VirtioNetworking(
{
}

VirtioNetworking::~VirtioNetworking()
{
// Unregister the network notification callback to prevent it from using the GNS channel.
m_networkNotifyHandle.reset();
// Stop the GNS channel to unblock any stuck communications with the guest.
m_gnsChannel.Stop();
}

void VirtioNetworking::Initialize()
{
m_networkSettings = GetHostEndpointSettings();
Expand Down Expand Up @@ -270,32 +278,25 @@ void VirtioNetworking::UpdateDns(hns::DNS&& dnsSettings)

void VirtioNetworking::UpdateMtu()
{
unique_interface_table interfaceTable{};
THROW_IF_WIN32_ERROR(::GetIpInterfaceTable(AF_UNSPEC, &interfaceTable));

ULONG minMtu = ULONG_MAX;
for (ULONG index = 0; index < interfaceTable.get()->NumEntries; index++)
{
const auto& ipInterface = interfaceTable.get()->Table[index];
if (ipInterface.Connected)
{
minMtu = std::min(ipInterface.NlMtu, minMtu);
}
}
const auto minMtu = GetMinimumConnectedInterfaceMtu();

// Only send the update if the MTU changed.
if (minMtu != ULONG_MAX && minMtu != m_networkMtu)
if (minMtu && minMtu.value() != m_networkMtu)
{
m_networkMtu = minMtu.value();

hns::ModifyGuestEndpointSettingRequest<hns::NetworkInterface> notification{};
notification.ResourceType = hns::GuestEndpointResourceType::Interface;
notification.RequestType = hns::ModifyRequestType::Update;
notification.Settings.NlMtu = m_networkMtu;
notification.Settings.Connected = true;
notification.Settings.NlMtu = m_networkMtu;

WSL_LOG("VirtioNetworking::UpdateMtu", TraceLoggingValue(m_networkMtu, "VirtioMtu"));
WSL_LOG(
"VirtioNetworking::UpdateMtu",
TraceLoggingValue(m_adapterId, "endpointId"),
TraceLoggingValue(m_networkMtu, "virtioMtu"));

// TODO: Why was this commented ?
// m_gnsChannel.SendHnsNotification(ToJsonW(notification).c_str(), m_endpointId);
m_gnsChannel.SendHnsNotification(ToJsonW(notification).c_str(), m_adapterId);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/windows/common/VirtioNetworking.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class VirtioNetworking : public INetworkingEngine
{
public:
VirtioNetworking(GnsChannel&& gnsChannel, bool enableLocalhostRelay, std::shared_ptr<GuestDeviceManager> guestDeviceManager, GUID classId, wil::shared_handle userToken);
~VirtioNetworking() = default;
~VirtioNetworking();

// Note: This class cannot be moved because m_networkNotifyHandle captures a 'this' pointer.
VirtioNetworking(const VirtioNetworking&) = delete;
Expand Down
22 changes: 22 additions & 0 deletions src/windows/common/WslCoreNetworkingSupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,3 +248,25 @@ wsl::core::networking::EphemeralHcnEndpoint wsl::core::networking::CreateEphemer

return endpoint;
}

std::optional<ULONG> wsl::core::networking::GetMinimumConnectedInterfaceMtu() noexcept
{
std::optional<ULONG> minMtu{};
try
{
unique_interface_table interfaceTable{};
THROW_IF_WIN32_ERROR(::GetIpInterfaceTable(AF_UNSPEC, &interfaceTable));

for (ULONG index = 0; index < interfaceTable.get()->NumEntries; index++)
{
const auto& ipInterface = interfaceTable.get()->Table[index];
if (ipInterface.Connected)
{
minMtu = std::min(minMtu.value_or(ipInterface.NlMtu), ipInterface.NlMtu);
}
}
}
CATCH_LOG()

return minMtu;
}
5 changes: 5 additions & 0 deletions src/windows/common/WslCoreNetworkingSupport.h
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,11 @@ std::vector<wsl::core::networking::CurrentInterfaceInformation> EnumerateConnect

bool IsMetered(ABI::Windows::Networking::Connectivity::NetworkCostType cost) noexcept;

/// <summary>
/// Gets the minimum MTU across all connected network interfaces.
/// </summary>
std::optional<ULONG> GetMinimumConnectedInterfaceMtu() noexcept;

/// <summary>
/// This instance acts as an IP_ADAPTER_ADDRESS pointer.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<controls:OOBEContent.PageContent>
<StackPanel Orientation="Vertical" Spacing="12">
<TextBlock x:Uid="Settings_OOBEDistroManagement_InstallableDistrosTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,12,0,6"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_InstallableDistrosSample"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_InstallableDistrosSample" TextWrapping="Wrap"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_InstallNamedDistrosTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,24,0,12"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_InstallNamedDistrosSample"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_InstallNamedDistrosSample" TextWrapping="Wrap"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_AvailableDistrosTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,24,0,6"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_AvailableDistrosSample"/>
<TextBlock x:Uid="Settings_OOBEDistroManagement_AvailableDistrosSample" TextWrapping="Wrap"/>
<HyperlinkButton x:Uid="Settings_OOBEDistroManagementBasicWSLCommandsLink" Style="{StaticResource TextButtonStyle}" Margin="0,12,0,-12"/>
<HyperlinkButton x:Uid="Settings_OOBEDistroManagementImportCustomDistroLink" Style="{StaticResource TextButtonStyle}"/>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion src/windows/wslsettings/Views/OOBE/GUIAppsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<controls:OOBEContent x:Uid="Settings_OOBEGUIApps" HeroImage="ms-appx:///Assets/SettingsOOBEGUIApps.png">
<controls:OOBEContent.PageContent>
<StackPanel Orientation="Vertical" Spacing="12">
<TextBlock x:Uid="Settings_OOBEGUIApps_AppsListDescription"/>
<TextBlock x:Uid="Settings_OOBEGUIApps_AppsListDescription" TextWrapping="Wrap"/>
<HyperlinkButton x:Uid="Settings_OOBEGUIAppsLink" Style="{StaticResource TextButtonStyle}"/>
</StackPanel>
</controls:OOBEContent.PageContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_NetworkingAppsFromWindowsTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,0,0,-6"/>
<controls:HyperlinkTextBlock x:Uid="Settings_OOBECrossOSFileAccess_NetworkingAppsFromWindowsSample"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_MirroredModeNetworkingTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,12,0,-6"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_MirroredModeNetworkingSample"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_MirroredModeNetworkingSample" TextWrapping="Wrap"/>
<HyperlinkButton x:Uid="Settings_OOBENetworkingIntegrationLinuxNetworkingAppsLink" Style="{StaticResource TextButtonStyle}" Margin="0,6,0,-12"/>
<HyperlinkButton x:Uid="Settings_OOBENetworkingIntegrationMirroredModeLink" Style="{StaticResource TextButtonStyle}"/>
</StackPanel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<controls:OOBEContent.PageContent>
<StackPanel Orientation="Vertical" Spacing="12">
<TextBlock x:Uid="Settings_OOBEVSCodeIntegration_VSCodeInstallTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,0,0,-6"/>
<TextBlock x:Uid="Settings_OOBEVSCodeIntegration_VSCodeInstallSample" />
<TextBlock x:Uid="Settings_OOBEVSCodeIntegration_VSCodeInstallSample" TextWrapping="Wrap"/>
<TextBlock x:Uid="Settings_OOBEVSCodeIntegration_VSCodeOpenProjectTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,12,0,-6"/>
<TextBlock x:Uid="Settings_OOBEVSCodeIntegration_VSCodeOpenProjectSample" />
<TextBlock x:Uid="Settings_OOBEVSCodeIntegration_VSCodeOpenProjectSample" TextWrapping="Wrap"/>
<HyperlinkButton x:Uid="Settings_OOBEVSCodeIntegrationLink" Margin="0,6,0,0" Style="{StaticResource TextButtonStyle}"/>
</StackPanel>
</controls:OOBEContent.PageContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<controls:OOBEContent.PageContent>
<StackPanel Orientation="Vertical" Spacing="12">
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_WindowsFromLinuxTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,0,0,-6"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_WindowsFromLinuxSample"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_WindowsFromLinuxSample" TextWrapping="Wrap"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_LinuxFromFileExplorerTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,12,0,-6"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_LinuxFromFileExplorerSample"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_LinuxFromFileExplorerSample" TextWrapping="Wrap"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_LaunchWindowsFromWSLTitle" Style="{StaticResource OobeSubtitleStyle}" Margin="0,12,0,-6"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_LaunchWindowsFromWSLSample"/>
<TextBlock x:Uid="Settings_OOBECrossOSFileAccess_LaunchWindowsFromWSLSample" TextWrapping="Wrap"/>
<HyperlinkButton x:Uid="Settings_OOBECrossOSFileAccessLink" Margin="0,6,0,0" Style="{StaticResource TextButtonStyle}"/>
</StackPanel>
</controls:OOBEContent.PageContent>
Expand Down
Loading
Loading