Skip to content

Commit 5c52dcd

Browse files
author
Ben Hillis
committed
cleanup: rename wsla -> wslc
1 parent e3918c2 commit 5c52dcd

143 files changed

Lines changed: 3446 additions & 3371 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"
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"
31+
- target: "wsl;libwsl;wslg;wslservice;wslhost;wslrelay;wslinstaller;wslinstall;initramfs;wslserviceproxystub;wslsettings;wslinstallerproxystub;testplugin;wslcsession;wslc;wsltests"
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"
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ add_subdirectory(msipackage)
467467
add_subdirectory(msixinstaller)
468468
add_subdirectory(src/windows/common)
469469
add_subdirectory(src/windows/service)
470-
add_subdirectory(src/windows/wslasession)
470+
add_subdirectory(src/windows/wslcsession)
471471
add_subdirectory(src/windows/wslinstaller/inc)
472472
add_subdirectory(src/windows/wslinstaller/stub)
473473
add_subdirectory(src/windows/wslinstaller/exe)

‎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>

‎diagnostics/wsl.wprp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@
259259
<EventProvider Id="Winsock_WPP" Name="1D44957B-7181-4835-B70A-D0B16112A4DE" />
260260
<EventProvider Id="wlidsvc_WPP" Name="3F8B9EF5-BBD2-4C81-B6C9-DA3CDB72D3C5" />
261261
<EventProvider Id="wsl_devicehost" Name="9d6c7b9e-2581-4d8a-b8c5-b90b4a17094a"/>
262-
<EventProvider Id="wslapi" Name="beb94edf-1a7b-5058-0696-ff9e6b1798d1"/>
263-
<EventProvider Id="wslaservice" Name="0383CE62-8F86-4766-AFB2-9D66A7FB1E90"/>
262+
<EventProvider Id="wslcpi" Name="beb94edf-1a7b-5058-0696-ff9e6b1798d1"/>
263+
<EventProvider Id="wslc" Name="0383CE62-8F86-4766-AFB2-9D66A7FB1E90"/>
264264
<EventProvider Id="wslclient" Name="8cbb7724-7223-5d6f-8137-564dac45104d"/>
265265

266266
<!-- PROFILE: General WSL Tracing (Default, also serves as base for other profiles) -->
@@ -321,8 +321,8 @@
321321
<EventProviderId Value="vmmm"/>
322322
<EventProviderId Value="vmwp"/>
323323
<EventProviderId Value="wsl_devicehost"/>
324-
<EventProviderId Value="wslapi"/>
325-
<EventProviderId Value="wslaservice"/>
324+
<EventProviderId Value="wslcpi"/>
325+
<EventProviderId Value="wslc"/>
326326
<EventProviderId Value="wslclient"/>
327327
</EventProviders>
328328
</EventCollectorId>

‎doc/docs/technical-documentation/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ graph
1616
wsl.exe[<a href="wsl.exe">wsl.exe</a>]---|COM|wslservice.exe;
1717
wslg.exe[<a href="wslg.exe">wslg.exe</a>]---|COM|wslservice.exe;
1818
wslconfig.exe[<a href="wslconfig.exe">wslconfig.exe</a>]---|COM|wslservice.exe;
19-
wslapi.dll[<a href="https://learn.microsoft.com/windows/win32/api/wslapi/">wslapi.dll</a>]---|COM|wslservice.exe;
20-
id[debian.exe, ubuntu.exe, ]---|"LoadLibrary()"|wslapi.dll;
19+
wslcpi.dll[<a href="https://learn.microsoft.com/windows/win32/api/wslcpi/">wslcpi.dll</a>]---|COM|wslservice.exe;
20+
id[debian.exe, ubuntu.exe, ]---|"LoadLibrary()"|wslcpi.dll;
2121
wslservice.exe[<a href="wslservice.exe">wslservice.exe</a>]---|"CreateProcessAsUser()"|wslrelay.exe[<a href="wslrelay.exe">wslrelay.exe</a>];
2222
wslservice.exe---|"CreateProcessAsUser()"|wslhost.exe[<a href="wslhost.exe">wslhost.exe</a>];
2323
fs["Windows filesystem (//wsl.localhost)"]

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1908,39 +1908,39 @@ Usage:
19081908
wslc --help</value>
19091909
<comment>{Locked="--help"}Command line arguments, file names and string inserts should not be translated</comment>
19101910
</data>
1911-
<data name="MessageWslaSessionNotFound" xml:space="preserve">
1911+
<data name="MessageWslcSessionNotFound" xml:space="preserve">
19121912
<value>Session not found: '{}'</value>
19131913
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19141914
</data>
19151915
<data name="MessageInvalidIp" xml:space="preserve">
19161916
<value>Invalid IP address '{}'</value>
19171917
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19181918
</data>
1919-
<data name="MessageWslaOpenSessionFailed" xml:space="preserve">
1919+
<data name="MessageWslcOpenSessionFailed" xml:space="preserve">
19201920
<value>OpenSessionByName('{}') failed</value>
19211921
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19221922
</data>
1923-
<data name="MessageWslaNoSessionsFound" xml:space="preserve">
1924-
<value>No WSLA sessions found.</value>
1923+
<data name="MessageWslcNoSessionsFound" xml:space="preserve">
1924+
<value>No WSLC sessions found.</value>
19251925
</data>
1926-
<data name="MessageWslaSessionsFound" xml:space="preserve">
1927-
<value>Found {} WSLA session{}:</value>
1926+
<data name="MessageWslcSessionsFound" xml:space="preserve">
1927+
<value>Found {} WSLC session{}:</value>
19281928
<comment>{FixedPlaceholder="{}"}{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19291929
</data>
1930-
<data name="MessageWslaShellExited" xml:space="preserve">
1930+
<data name="MessageWslcShellExited" xml:space="preserve">
19311931
<value>{} exited with: {}</value>
19321932
<comment>{FixedPlaceholder="{}"}{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19331933
</data>
1934-
<data name="MessageWslaHeaderId" xml:space="preserve">
1934+
<data name="MessageWslcHeaderId" xml:space="preserve">
19351935
<value>ID</value>
19361936
</data>
1937-
<data name="MessageWslaHeaderCreatorPid" xml:space="preserve">
1937+
<data name="MessageWslcHeaderCreatorPid" xml:space="preserve">
19381938
<value>Creator PID</value>
19391939
</data>
1940-
<data name="MessageWslaHeaderDisplayName" xml:space="preserve">
1940+
<data name="MessageWslcHeaderDisplayName" xml:space="preserve">
19411941
<value>Display Name</value>
19421942
</data>
1943-
<data name="MessageWslaUnknownCommand" xml:space="preserve">
1943+
<data name="MessageWslcUnknownCommand" xml:space="preserve">
19441944
<value>Unknown command: '{}'</value>
19451945
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
19461946
</data>
@@ -2070,11 +2070,11 @@ Usage:
20702070
For privacy information about this product please visit https://aka.ms/privacy.</value>
20712071
<comment>Copyright notice and privacy link</comment>
20722072
</data>
2073-
<data name = "MessageWslaInvalidImage" xml:space = "preserve" >
2073+
<data name = "MessageWslcInvalidImage" xml:space = "preserve" >
20742074
<value>Invalid image: '{}'</value>
20752075
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20762076
</data>
2077-
<data name = "MessageWslaInvalidContainerName" xml:space = "preserve" >
2077+
<data name = "MessageWslcInvalidContainerName" xml:space = "preserve" >
20782078
<value>Invalid container name: '{}'</value>
20792079
<comment>{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
20802080
</data>

0 commit comments

Comments
 (0)