Skip to content

Commit 9afcebe

Browse files
ptrivediptrivedi
authored
Merge branch 'feature/wsl-for-apps' into user/ptrivedi/cli-version
2 parents 70b1e83 + 933aedc commit 9afcebe

148 files changed

Lines changed: 4779 additions & 3413 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
# Reviewers for all files in the repository
44
* @microsoft/wsl-maintainers
5-
* @microsoft/wsla-team
5+
* @microsoft/wslc-team

‎.pipelines/build-stage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ parameters:
2828
- name: targets
2929
type: object
3030
default:
31-
- target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;initramfs;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin;wslasession;wslc;wsltests;wslcsdk"
32-
pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings/wslsettings.dll,wslsettings/wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll,wslasession.exe,wslc.exe,wslcsdk.dll"
31+
- target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;initramfs;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin;wslcsession;wslc;wsltests;wslcsdk"
32+
pattern: "wsl.exe,libwsl.dll,wslg.exe,wslservice.exe,wslhost.exe,wslrelay.exe,wslinstaller.exe,wslinstall.dll,wslserviceproxystub.dll,wslsettings/wslsettings.dll,wslsettings/wslsettings.exe,wslinstallerproxystub.dll,wsldevicehost.dll,WSLDVCPlugin.dll,testplugin.dll,wsldeps.dll,wslcsession.exe,wslc.exe,wslcsdk.dll"
3333
- target: "msixgluepackage"
3434
pattern: "gluepackage.msix"
3535
- target: "msipackage"

‎.pipelines/test-stage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ parameters:
1212
default:
1313
- wsl1
1414
- wsl2
15-
- wsla
15+
- wslc
1616

1717
- name: test_images
1818
type: object

‎CMakeLists.txt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@ FetchContent_Declare(nlohmannjson
4848
FetchContent_MakeAvailable(nlohmannjson)
4949
FetchContent_GetProperties(nlohmannjson SOURCE_DIR NLOHMAN_JSON_SOURCE_DIR)
5050

51+
FetchContent_Declare(yaml-cpp
52+
URL https://github.com/jbeder/yaml-cpp/releases/download/yaml-cpp-0.9.0/yaml-cpp-yaml-cpp-0.9.0.tar.gz
53+
URL_HASH SHA256=298593d9c440fd9034b8b193d96318b76d49bc97c6ceadb7b0836edf0b6d7539)
54+
55+
set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
56+
set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
57+
set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "" FORCE)
58+
set(YAML_MSVC_SHARED_RT OFF CACHE BOOL "" FORCE)
59+
60+
FetchContent_MakeAvailable(yaml-cpp)
61+
FetchContent_GetProperties(yaml-cpp SOURCE_DIR YAML_CPP_SOURCE_DIR)
62+
5163
set(BOOST_VERSION "1.90.0")
5264
set(BOOST_TARBALL "boost_${BOOST_VERSION}")
5365
string(REPLACE "." "_" BOOST_TARBALL "${BOOST_TARBALL}")
@@ -466,7 +478,7 @@ add_subdirectory(msipackage)
466478
add_subdirectory(msixinstaller)
467479
add_subdirectory(src/windows/common)
468480
add_subdirectory(src/windows/service)
469-
add_subdirectory(src/windows/wslasession)
481+
add_subdirectory(src/windows/wslcsession)
470482
add_subdirectory(src/windows/wslinstaller/inc)
471483
add_subdirectory(src/windows/wslinstaller/stub)
472484
add_subdirectory(src/windows/wslinstaller/exe)

‎cgmanifest.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@
4141
"hash": "sha1:44500f8d6b279ec314a4cdce1290ddc30f530ed7"
4242
}
4343
}
44+
},
45+
{
46+
"component": {
47+
"type": "other",
48+
"other": {
49+
"name": "yaml-cpp",
50+
"version": "0.9.0",
51+
"downloadUrl": "https://github.com/jbeder/yaml-cpp/releases/download/yaml-cpp-0.9.0/yaml-cpp-yaml-cpp-0.9.0.tar.gz",
52+
"hash": "sha256:298593d9c440fd9034b8b193d96318b76d49bc97c6ceadb7b0836edf0b6d7539"
53+
}
54+
}
4455
}
4556
]
4657
}

‎cloudtest/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ function(add_test_group image version)
3333
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestGroup.xml.in ${DIR}/TestGroup.xml)
3434
endfunction()
3535

36-
function(add_wsla_test_group image)
37-
set(version "a")
38-
set(DIR ${OUT}/${image}-wsla)
36+
function(add_wslc_test_group image)
37+
set(version "c")
38+
set(DIR ${OUT}/${image}-wslc)
3939

4040
file(MAKE_DIRECTORY ${DIR})
4141

4242
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestMap.xml.in ${DIR}/TestMap.xml)
43-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestGroup-wsla.xml.in ${DIR}/TestGroup.xml)
43+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TestGroup-wslc.xml.in ${DIR}/TestGroup.xml)
4444
endfunction()
4545

4646
foreach(image ${CLOUDTEST_IMAGES})
4747
add_test_group("${image}" "1")
4848
add_test_group("${image}" "2")
49-
add_wsla_test_group("${image}")
49+
add_wslc_test_group("${image}")
5050
endforeach()

cloudtest/TestGroup-wsla.xml.in renamed to cloudtest/TestGroup-wslc.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
</Setup>
2323

2424
<TestJob Name="CloudTest.Taef" TimeoutMins="120">
25-
<Execution Type="TAEF" Path="[WorkingDirectory]\wsltests.dll" Args="/p:bugReportDirectory=[LoggingDirectory]\BugReportOutput /errorOnCrash /testmode:etwlogger /EtwLogger:WPRProfileFile=[WorkingDirectory]\wsl.wprp /EtwLogger:WPRProfile=WSL /EtwLogger:SavePoint=ExecutionComplete /EtwLogger:RecordingScope=Execution /p:SetupScript=.\test-setup.ps1 /p:Package=[WorkingDirectory]\Microsoft.WSL_${PACKAGE_VERSION}_x64_ARM64.msixbundle /p:Version=2 /p:AllowUnsigned=${ALLOW_UNSIGNED_PACKAGE} /p:UnitTestsPath=[WorkingDirectory]\unit_tests /p:DistroPath=[WorkingDirectory]\test_distro.tar.xz /p:TestDataPath=[WorkingDirectory]\test_data /p:DistroName=test_distro /logOutput:High /p:RedirectStdout=[LoggingDirectory]\stdout.txt /p:RedirectStderr=[LoggingDirectory]\stderr.txt /p:KernelLogs=[LoggingDirectory]\dmesg.txt /p:DumpFolder=[LoggingDirectory] /p:WerReport /p:LogDmesg /p:PipelineBuildId=${PIPELINE_BUILD_ID} /p:DumpTool=DumpTool.exe /select:&quot;@TestCategory='WSLA'&quot;" />
25+
<Execution Type="TAEF" Path="[WorkingDirectory]\wsltests.dll" Args="/p:bugReportDirectory=[LoggingDirectory]\BugReportOutput /errorOnCrash /testmode:etwlogger /EtwLogger:WPRProfileFile=[WorkingDirectory]\wsl.wprp /EtwLogger:WPRProfile=WSL /EtwLogger:SavePoint=ExecutionComplete /EtwLogger:RecordingScope=Execution /p:SetupScript=.\test-setup.ps1 /p:Package=[WorkingDirectory]\Microsoft.WSL_${PACKAGE_VERSION}_x64_ARM64.msixbundle /p:Version=2 /p:AllowUnsigned=${ALLOW_UNSIGNED_PACKAGE} /p:UnitTestsPath=[WorkingDirectory]\unit_tests /p:DistroPath=[WorkingDirectory]\test_distro.tar.xz /p:TestDataPath=[WorkingDirectory]\test_data /p:DistroName=test_distro /logOutput:High /p:RedirectStdout=[LoggingDirectory]\stdout.txt /p:RedirectStderr=[LoggingDirectory]\stderr.txt /p:KernelLogs=[LoggingDirectory]\dmesg.txt /p:DumpFolder=[LoggingDirectory] /p:WerReport /p:LogDmesg /p:PipelineBuildId=${PIPELINE_BUILD_ID} /p:DumpTool=DumpTool.exe /select:&quot;@TestCategory='WSLC'&quot;" />
2626
</TestJob>
2727
</TestJobGroup>

‎cloudtest/TestGroup.xml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
</Setup>
2323

2424
<TestJob Name="CloudTest.Taef" TimeoutMins="240">
25-
<Execution Type="TAEF" Path="[WorkingDirectory]\wsltests.dll" Args="/p:bugReportDirectory=[LoggingDirectory]\BugReportOutput /errorOnCrash /testmode:etwlogger /EtwLogger:WPRProfileFile=[WorkingDirectory]\wsl.wprp /EtwLogger:WPRProfile=WSL /EtwLogger:SavePoint=ExecutionComplete /EtwLogger:RecordingScope=Execution /p:SetupScript=.\test-setup.ps1 /p:Package=[WorkingDirectory]\Microsoft.WSL_${PACKAGE_VERSION}_x64_ARM64.msixbundle /p:Version=${version} /p:AllowUnsigned=${ALLOW_UNSIGNED_PACKAGE} /p:UnitTestsPath=[WorkingDirectory]\unit_tests /p:DistroPath=[WorkingDirectory]\test_distro.tar.xz /p:TestDataPath=[WorkingDirectory]\test_data /p:DistroName=test_distro /logOutput:High /p:RedirectStdout=[LoggingDirectory]\stdout.txt /p:RedirectStderr=[LoggingDirectory]\stderr.txt /p:KernelLogs=[LoggingDirectory]\dmesg.txt /p:DumpFolder=[LoggingDirectory] /p:WerReport /p:LogDmesg /p:PipelineBuildId=${PIPELINE_BUILD_ID} /p:DumpTool=DumpTool.exe /select:&quot;not(@TestCategory='WSLA')&quot;" />
25+
<Execution Type="TAEF" Path="[WorkingDirectory]\wsltests.dll" Args="/p:bugReportDirectory=[LoggingDirectory]\BugReportOutput /errorOnCrash /testmode:etwlogger /EtwLogger:WPRProfileFile=[WorkingDirectory]\wsl.wprp /EtwLogger:WPRProfile=WSL /EtwLogger:SavePoint=ExecutionComplete /EtwLogger:RecordingScope=Execution /p:SetupScript=.\test-setup.ps1 /p:Package=[WorkingDirectory]\Microsoft.WSL_${PACKAGE_VERSION}_x64_ARM64.msixbundle /p:Version=${version} /p:AllowUnsigned=${ALLOW_UNSIGNED_PACKAGE} /p:UnitTestsPath=[WorkingDirectory]\unit_tests /p:DistroPath=[WorkingDirectory]\test_distro.tar.xz /p:TestDataPath=[WorkingDirectory]\test_data /p:DistroName=test_distro /logOutput:High /p:RedirectStdout=[LoggingDirectory]\stdout.txt /p:RedirectStderr=[LoggingDirectory]\stderr.txt /p:KernelLogs=[LoggingDirectory]\dmesg.txt /p:DumpFolder=[LoggingDirectory] /p:WerReport /p:LogDmesg /p:PipelineBuildId=${PIPELINE_BUILD_ID} /p:DumpTool=DumpTool.exe /select:&quot;not(@TestCategory='WSLC')&quot;" />
2626
</TestJob>
2727
</TestJobGroup>

‎localization/strings/en-US/Resources.resw‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,39 +1912,39 @@ Usage:
19121912
wslc --help</value>
19131913
<comment>{Locked="--help"}Command line arguments, file names and string inserts should not be translated</comment>
19141914
</data>
1915-
<data name="MessageWslaSessionNotFound" xml:space="preserve">
1915+
<data name="MessageWslcSessionNotFound" xml:space="preserve">
19161916
<value>Session not found: '{}'</value>
19171917
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19181918
</data>
19191919
<data name="MessageInvalidIp" xml:space="preserve">
19201920
<value>Invalid IP address '{}'</value>
19211921
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19221922
</data>
1923-
<data name="MessageWslaOpenSessionFailed" xml:space="preserve">
1923+
<data name="MessageWslcOpenSessionFailed" xml:space="preserve">
19241924
<value>OpenSessionByName('{}') failed</value>
19251925
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19261926
</data>
1927-
<data name="MessageWslaNoSessionsFound" xml:space="preserve">
1928-
<value>No WSLA sessions found.</value>
1927+
<data name="MessageWslcNoSessionsFound" xml:space="preserve">
1928+
<value>No WSLC sessions found.</value>
19291929
</data>
1930-
<data name="MessageWslaSessionsFound" xml:space="preserve">
1931-
<value>Found {} WSLA session{}:</value>
1930+
<data name="MessageWslcSessionsFound" xml:space="preserve">
1931+
<value>Found {} WSLC session{}:</value>
19321932
<comment>{FixedPlaceholder="{}"}{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19331933
</data>
1934-
<data name="MessageWslaShellExited" xml:space="preserve">
1934+
<data name="MessageWslcShellExited" xml:space="preserve">
19351935
<value>{} exited with: {}</value>
19361936
<comment>{FixedPlaceholder="{}"}{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19371937
</data>
1938-
<data name="MessageWslaHeaderId" xml:space="preserve">
1938+
<data name="MessageWslcHeaderId" xml:space="preserve">
19391939
<value>ID</value>
19401940
</data>
1941-
<data name="MessageWslaHeaderCreatorPid" xml:space="preserve">
1941+
<data name="MessageWslcHeaderCreatorPid" xml:space="preserve">
19421942
<value>Creator PID</value>
19431943
</data>
1944-
<data name="MessageWslaHeaderDisplayName" xml:space="preserve">
1944+
<data name="MessageWslcHeaderDisplayName" xml:space="preserve">
19451945
<value>Display Name</value>
19461946
</data>
1947-
<data name="MessageWslaUnknownCommand" xml:space="preserve">
1947+
<data name="MessageWslcUnknownCommand" xml:space="preserve">
19481948
<value>Unknown command: '{}'</value>
19491949
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19501950
</data>
@@ -2074,31 +2074,31 @@ Usage:
20742074
For privacy information about this product please visit https://aka.ms/privacy.</value>
20752075
<comment>Copyright notice and privacy link</comment>
20762076
</data>
2077-
<data name = "MessageWslaInvalidImage" xml:space = "preserve" >
2077+
<data name = "MessageWslcInvalidImage" xml:space = "preserve" >
20782078
<value>Invalid image: '{}'</value>
20792079
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20802080
</data>
2081-
<data name = "MessageWslaInvalidName" xml:space = "preserve" >
2081+
<data name = "MessageWslcInvalidName" xml:space = "preserve" >
20822082
<value>Invalid name: '{}'</value>
20832083
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20842084
</data>
20852085
<data name = "MessagePathNotAbsolute" xml:space = "preserve" >
20862086
<value>Path is not absolute: '{}'</value>
20872087
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20882088
</data>
2089-
<data name = "MessageWslaVolumeNotFound" xml:space = "preserve" >
2089+
<data name = "MessageWslcVolumeNotFound" xml:space = "preserve" >
20902090
<value>Volume not found: '{}'</value>
20912091
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20922092
</data>
2093-
<data name = "MessageWslaInvalidVolumeOptions" xml:space = "preserve" >
2093+
<data name = "MessageWslcInvalidVolumeOptions" xml:space = "preserve" >
20942094
<value>Invalid volume options: '{}'</value>
20952095
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20962096
</data>
2097-
<data name = "MessageWslaInvalidVolumeType" xml:space = "preserve" >
2097+
<data name = "MessageWslcInvalidVolumeType" xml:space = "preserve" >
20982098
<value>Unsupported volume type: '{}'</value>
20992099
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
21002100
</data>
2101-
<data name = "MessageWslaVolumeInUse" xml:space = "preserve" >
2101+
<data name = "MessageWslcVolumeInUse" xml:space = "preserve" >
21022102
<value>Volume '{}' is in use.</value>
21032103
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
21042104
</data>

‎msipackage/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(OUTPUT_PACKAGE ${BIN}/wsl.msi)
1212
set(PACKAGE_WIX_IN ${CMAKE_CURRENT_LIST_DIR}/package.wix.in)
1313
set(PACKAGE_WIX ${BIN}/package.wix)
1414
set(CAB_CACHE ${BIN}/cab)
15-
set(WINDOWS_BINARIES wsl.exe;wslg.exe;wslhost.exe;wslrelay.exe;wslservice.exe;wslserviceproxystub.dll;wslinstall.dll;wslc.exe;wslasession.exe)
15+
set(WINDOWS_BINARIES wsl.exe;wslg.exe;wslhost.exe;wslrelay.exe;wslservice.exe;wslserviceproxystub.dll;wslinstall.dll;wslc.exe;wslcsession.exe)
1616
if (WSL_BUILD_WSL_SETTINGS)
1717
list(APPEND WINDOWS_BINARIES "wslsettings/wslsettings.dll;wslsettings/wslsettings.exe;libwsl.dll")
1818
endif()
@@ -52,7 +52,7 @@ add_custom_command(
5252

5353
add_custom_target(msipackage DEPENDS ${OUTPUT_PACKAGE})
5454
set_target_properties(msipackage PROPERTIES EXCLUDE_FROM_ALL FALSE SOURCES ${PACKAGE_WIX_IN})
55-
add_dependencies(msipackage wsl wslg wslservice wslhost wslrelay wslserviceproxystub init initramfs wslinstall msixgluepackage wslc wslasession)
55+
add_dependencies(msipackage wsl wslg wslservice wslhost wslrelay wslserviceproxystub init initramfs wslinstall msixgluepackage wslc wslcsession)
5656

5757
if (WSL_BUILD_WSL_SETTINGS)
5858
add_dependencies(msipackage wslsettings libwsl)

0 commit comments

Comments
 (0)