diff --git a/Images/SettingsOOBEWSLContainer.png b/Images/SettingsOOBEWSLContainer.png new file mode 100644 index 0000000000..ab23c9ff47 Binary files /dev/null and b/Images/SettingsOOBEWSLContainer.png differ diff --git a/localization/strings/en-US/Resources.resw b/localization/strings/en-US/Resources.resw index af33785584..a99abfd953 100644 --- a/localization/strings/en-US/Resources.resw +++ b/localization/strings/en-US/Resources.resw @@ -1722,6 +1722,30 @@ Take a moment to preview some of the community’s favorite features or view our https://aka.ms/wsldocs {Locked}Uri to the Microsoft WSL Documentation + + Easily run Linux containers on Windows as a 1st class experience. + +You can use the `wslc.exe` CLI to build, run, push, pull and manage Linux containers all directly on Windows. + +As well you can use the WSLc API to create Windows applications that have runtime logic powered by Linux containers, making it easier to embed Linux contianers as a direct component of your Windows applications. This feature makes it easy to use code that would run in a Linux environment right on Windows, useful for applications like cloud to local, AI applications, and isolation. + + + WSL container + + + Learn more about WSL container + + + https://aka.ms/wslc + {Locked}Uri to the WSL container documentation + + + WSL container API reference + + + https://wsl.dev/api-reference/ + {Locked}Uri to the WSL container API reference + You can use graphical based Linux applications with native Windows interactions like alt-tab, start menu launching, task bar pinning, and cut & paste support. @@ -1883,6 +1907,12 @@ You can also access more VS Code Remote options through the command palette with General + + WSL container + + + NEW + GPU Acceleration diff --git a/src/windows/wslsettings/App.xaml.cs b/src/windows/wslsettings/App.xaml.cs index fca612ab46..ecbe797c6f 100644 --- a/src/windows/wslsettings/App.xaml.cs +++ b/src/windows/wslsettings/App.xaml.cs @@ -90,6 +90,8 @@ public App() services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/src/windows/wslsettings/CMakeLists.txt b/src/windows/wslsettings/CMakeLists.txt index d1c024b83e..ac8297c7b8 100644 --- a/src/windows/wslsettings/CMakeLists.txt +++ b/src/windows/wslsettings/CMakeLists.txt @@ -25,6 +25,7 @@ file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBECrossOSFileAccess.gif ${ file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBEDistroManagement.png ${BIN}/${TargetApp}/Assets/SettingsOOBEDistroManagement.png) file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBEDockerDesktopIntegration.png ${BIN}/${TargetApp}/Assets/SettingsOOBEDockerDesktopIntegration.png) file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBEGeneral.png ${BIN}/${TargetApp}/Assets/SettingsOOBEGeneral.png) +file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBEWSLContainer.png ${BIN}/${TargetApp}/Assets/SettingsOOBEWSLContainer.png) file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBEGPUAcceleration.gif ${BIN}/${TargetApp}/Assets/SettingsOOBEGPUAcceleration.gif) file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBEGUIApps.png ${BIN}/${TargetApp}/Assets/SettingsOOBEGUIApps.png) file(CREATE_LINK ${CMAKE_SOURCE_DIR}/images/SettingsOOBENetworkingIntegration.png ${BIN}/${TargetApp}/Assets/SettingsOOBENetworkingIntegration.png) @@ -87,6 +88,7 @@ add_executable( ViewModels/OOBE/VSCodeIntegrationViewModel.cs ViewModels/OOBE/VSIntegrationViewModel.cs ViewModels/OOBE/WorkingAcrossFileSystemsViewModel.cs + ViewModels/OOBE/WSLContainerViewModel.cs ViewModels/Settings/AboutViewModel.cs ViewModels/Settings/DeveloperViewModel.cs ViewModels/Settings/FileSystemViewModel.cs @@ -115,6 +117,8 @@ add_executable( Views/OOBE/VSIntegrationPage.xaml.cs Views/OOBE/WorkingAcrossFileSystemsPage.xaml Views/OOBE/WorkingAcrossFileSystemsPage.xaml.cs + Views/OOBE/WSLContainerPage.xaml + Views/OOBE/WSLContainerPage.xaml.cs Views/Settings/AboutPage.xaml Views/Settings/AboutPage.xaml.cs Views/Settings/DeveloperPage.xaml @@ -168,6 +172,8 @@ csharp_set_xaml_cs_properties( Views/OOBE/VSIntegrationPage.xaml.cs Views/OOBE/WorkingAcrossFileSystemsPage.xaml Views/OOBE/WorkingAcrossFileSystemsPage.xaml.cs + Views/OOBE/WSLContainerPage.xaml + Views/OOBE/WSLContainerPage.xaml.cs Views/Settings/AboutPage.xaml Views/Settings/AboutPage.xaml.cs Views/Settings/DeveloperPage.xaml diff --git a/src/windows/wslsettings/Services/PageService.cs b/src/windows/wslsettings/Services/PageService.cs index afaa6600f2..b41128c61e 100644 --- a/src/windows/wslsettings/Services/PageService.cs +++ b/src/windows/wslsettings/Services/PageService.cs @@ -24,6 +24,7 @@ public PageService() Configure(); Configure(); + Configure(); Configure(); Configure(); Configure(); diff --git a/src/windows/wslsettings/Styles/CommonStyles.xaml b/src/windows/wslsettings/Styles/CommonStyles.xaml index c4b12dcadb..43ce086303 100644 --- a/src/windows/wslsettings/Styles/CommonStyles.xaml +++ b/src/windows/wslsettings/Styles/CommonStyles.xaml @@ -94,6 +94,27 @@ + + +