Skip to content

Commit 48e21b6

Browse files
chemwolf6922chemwolf6922
committed
Merge branch 'master' into user/chemwolf6922/protect-wsl-core-processes-with-memory-cgroup
2 parents ee20fe8 + 946f280 commit 48e21b6

84 files changed

Lines changed: 1959 additions & 394 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/workflows/distributions.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
name: Validate distributions
22

3-
on:
4-
pull_request:
3+
on:
4+
pull_request:
55
paths: ['distributions/**']
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
check:
912
name: Validate distributions

‎.github/workflows/modern-distributions.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55
paths: ['distributions/**']
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
check:
912
name: Validate tar based distributions changes

‎.github/workflows/winget.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
release:
55
types: [released]
66

7+
permissions: {}
8+
79
jobs:
810
publish:
911
if: github.event.release.prerelease == false

‎.pipelines/build-job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
displayName: "CMake ${{ parameters.platform }}"
125125
inputs:
126126
workingDirectory: "."
127-
cmakeArgs: . --fresh -A ${{ parameters.platform }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION=10.0.26100.0 -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DSKIP_PACKAGE_SIGNING=${{ parameters.isRelease }} -DOFFICIAL_BUILD=${{ parameters.isRelease }} -DINCLUDE_PACKAGE_STAGE=${{ or(parameters.isRelease, parameters.isNightly) }} -DPIPELINE_BUILD_ID=$(Build.BuildId) -DVSO_ORG=${{ parameters.vsoOrg }} -DVSO_PROJECT=${{ parameters.vsoProject }} -DWSL_BUILD_WSL_SETTINGS=true -DWSL_BUILD_SDKCS=true $(packageInputDirArg)\${{ parameters.platform }}
127+
cmakeArgs: . --fresh -A ${{ parameters.platform }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION=10.0.26100.0 -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DSKIP_PACKAGE_SIGNING=${{ parameters.isRelease }} -DOFFICIAL_BUILD=${{ parameters.isRelease }} -DINCLUDE_PACKAGE_STAGE=${{ or(parameters.isRelease, parameters.isNightly) }} -DPIPELINE_BUILD_ID=$(Build.BuildId) -DVSO_ORG=${{ parameters.vsoOrg }} -DVSO_PROJECT=${{ parameters.vsoProject }} -DWSL_BUILD_WSL_SETTINGS=true -DWSL_INCLUDE_SDK_CSHARP=true $(packageInputDirArg)\${{ parameters.platform }}
128128

129129
# Workaround for WSL Settings NuGet restore authentication issue
130130
- script: _deps\nuget.exe restore -NonInteractive

‎.pipelines/package-stage.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ stages:
4545
ob_outputDirectory: '$(Build.SourcesDirectory)\out'
4646
ob_artifactBaseName: 'drop_wsl'
4747
ob_artifactSuffix: '_package'
48+
# Outputs are explicitly signed+verified by the EsrpCodeSigning tasks below.
49+
ob_sdl_codeSignValidation_enabled: false
4850
buildStagePackageVersion: $[ stageDependencies.build_x64.build_x64.outputs['version.WSL_PACKAGE_VERSION'] ]
4951
buildStageNugetVersion: $[ stageDependencies.build_x64.build_x64.outputs['version.WSL_NUGET_PACKAGE_VERSION'] ]
5052

@@ -98,7 +100,7 @@ stages:
98100
displayName: "CMake configure (bundle-only)"
99101
inputs:
100102
workingDirectory: "."
101-
cmakeArgs: . -DBUNDLE_ONLY=TRUE -DCMAKE_BUILD_TYPE=Release -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION)
103+
cmakeArgs: . -DBUNDLE_ONLY=TRUE -DCMAKE_BUILD_TYPE=Release -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DWSL_INCLUDE_SDK_CSHARP=true
102104

103105
- script: cmake --build . --config Release --target bundle -- -m
104106
displayName: Create msixbundle

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ if (NOT DEFINED WSL_BUILD_WSL_SETTINGS)
175175
set(WSL_BUILD_WSL_SETTINGS false)
176176
endif ()
177177

178-
if (NOT DEFINED WSL_BUILD_SDKCS)
179-
set(WSL_BUILD_SDKCS false)
178+
if (NOT DEFINED WSL_INCLUDE_SDK_CSHARP)
179+
set(WSL_INCLUDE_SDK_CSHARP false)
180180
endif ()
181181

182182
find_commit_hash(COMMIT_HASH)

‎UserConfig.cmake.sample‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ endif()
3737
# set(WSL_BUILD_WSL_SETTINGS true)
3838

3939
# # Uncomment to build the C# WSLC sdk
40-
# set(WSL_BUILD_SDKCS true)
40+
# set(WSL_INCLUDE_SDK_CSHARP true)
41+
42+
# # Uncomment to configure the WSLC SDK NuGet to only target the current platform
43+
# set(WSL_NUGET_SINGLE_PLATFORM true)
4144

4245
# # Uncomment to generate a "thin" MSI package which builds and installs faster
4346
# set(WSL_BUILD_THIN_PACKAGE true)

‎distributions/DistributionInfo.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,38 +164,38 @@
164164
"FriendlyName": "AlmaLinux OS 9",
165165
"Default": false,
166166
"Amd64Url": {
167-
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v9.7.20260311.0/AlmaLinux-9.7_x64_20260311.0.wsl",
168-
"Sha256": "c7d9c8f9bbe8f52a34d920988d6cea913f0251c457aef55f5ed66cce90561f92"
167+
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v9.8.20260526.0/AlmaLinux-9.8_x64_20260526.0.wsl",
168+
"Sha256": "4a4377d451a4ede509e61ab4e4870f9654bc99beb7a0b40c8b54e71a6752cd8e"
169169
},
170170
"Arm64Url": {
171-
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v9.7.20260311.0/AlmaLinux-9.7_ARM64_20260311.0.wsl",
172-
"Sha256": "e9b5e184aa04e6f72574e2c29cda919d4aaed0c7408dcb81905f6c9391516c7f"
171+
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v9.8.20260526.0/AlmaLinux-9.8_ARM64_20260526.0.wsl",
172+
"Sha256": "b94a298f207782d37c0e2c019e7f95f52a94f933ad702b8479340bcfde68c4b3"
173173
}
174174
},
175175
{
176176
"Name": "AlmaLinux-Kitten-10",
177177
"FriendlyName": "AlmaLinux OS Kitten 10",
178178
"Default": false,
179179
"Amd64Url": {
180-
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10-kitten.20260311.0/AlmaLinux-Kitten-10_x64_20260311.0.wsl",
181-
"Sha256": "b04ab8ae277ca4bbeb70a15381124609ca7f97b8f7c275930b3fd91195c385ad"
180+
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10-kitten.20260330.0/AlmaLinux-Kitten-10_x64_20260330.0.wsl",
181+
"Sha256": "ada0914f1331fddfa626eaffd2e21288cc35b1c9c7a07d466f488d36b9b90cca"
182182
},
183183
"Arm64Url": {
184-
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10-kitten.20260311.0/AlmaLinux-Kitten-10_ARM64_20260311.0.wsl",
185-
"Sha256": "d502ab27654fa326888940ebce573dbe5abf7e44f709e67b53030da49572a92f"
184+
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10-kitten.20260330.0/AlmaLinux-Kitten-10_ARM64_20260330.0.wsl",
185+
"Sha256": "597bd7717d796550f85a3e9307f75fdd73d6c18a71b58898dd43a0dbca3da0fc"
186186
}
187187
},
188188
{
189189
"Name": "AlmaLinux-10",
190190
"FriendlyName": "AlmaLinux OS 10",
191191
"Default": true,
192192
"Amd64Url": {
193-
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10.1.20260311.0/AlmaLinux-10.1_x64_20260311.0.wsl",
194-
"Sha256": "6bc470081100ec507d933ee58b467f1903acc07da719ad37532b942439fc16c4"
193+
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10.2.20260526.0/AlmaLinux-10.2_x64_20260526.0.wsl",
194+
"Sha256": "55e75d87bad292bdb14c8c57bc35aaa5bd253e4f565321dd196c3f25b692be48"
195195
},
196196
"Arm64Url": {
197-
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10.1.20260311.0/AlmaLinux-10.1_ARM64_20260311.0.wsl",
198-
"Sha256": "2aedea16c5bdbc83b61d78634cc2f6b839435ad9066df1ea1a0bba7ad2fbdc39"
197+
"Url": "https://github.com/AlmaLinux/wsl-images/releases/download/v10.2.20260526.0/AlmaLinux-10.2_ARM64_20260526.0.wsl",
198+
"Sha256": "d3b3ecc7b58ee3cceaa656de04175e81df2e7969efb2e22aba95c9ff1f430949"
199199
}
200200
}
201201
],

‎intune/nb-NO/WSL.adml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<string id="WSLContainer"><!-- _locComment_text='{Locked="WSL"}' -->WSL-beholder</string>
5454

5555
<string id="AllowWSLContainer"><!-- _locComment_text='{Locked="WSL"}' -->Tillat WSL-beholder</string>
56-
<string id="AllowWSLContainerExplain"><!-- _locComment_text='{Locked="WSL"}{Locked="Disabled"}' -->Denne policyen styrer om WSL-beholdere kan brukes på denne maskinen. Når den er aktivert eller ikke konfigurert, kan brukere og Windows-apper kjøre Linux-beholdere via WSL. Når den er deaktivert, blokkeres WSL-beholdere for alle brukere, og Windows-apper kan ikke kjøre Linux-beholdere. Advarsel: Hvis denne settes til Disabled, kan Windows-apper som er avhengige av Linux-beholdere, slutte å fungere.</string>
56+
<string id="AllowWSLContainerExplain"><!-- _locComment_text='{Locked="WSL"}{Locked="Disabled"}' -->Denne policyen styrer om WSL-beholdere kan brukes på denne maskinen. Når den er aktivert eller ikke konfigurert, kan brukere og Windows-programmer kjøre Linux-beholdere via WSL. Når den er deaktivert, blokkeres WSL-beholdere for alle brukere, og Windows-apper kan ikke kjøre Linux-beholdere. Advarsel: Hvis denne settes til 'Disabled', kan Windows-apper som er avhengige av Linux-beholdere, slutte å fungere.</string>
5757

5858
<string id="WSLContainerRegistryAllowlist"><!-- _locComment_text='{Locked="WSL"}' -->Tillatelsesliste for WSL-beholderregistre</string>
5959
<string id="WSLContainerRegistryAllowlistExplain"><!-- _locComment_text='{Locked="WSL"}' -->Når dette er aktivert, har WSL-beholderen bare tillatelse til å hente bilder fra registrene som er oppført her. Dette påvirker både CLI for WSL-beholderen og alle programmer som bruker WSL-beholder-API-et.</string>

‎localization/strings/cs-CZ/Resources.resw‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,14 @@ Probíhá pokus o stažení webu...</value>
11261126
<data name="MessageConfigVirtio9pDisabled" xml:space="preserve">
11271127
<value>Wsl2.virtio9p je zakázáno, probíhá návrat na 9p s přenosem vsock.</value>
11281128
</data>
1129+
<data name="MessageVirtioProxyRequiresVirtio" xml:space="preserve">
1130+
<value>VirtioProxy sítě se nepodporují, pokud je wsl2.virtio zakázané. návrat k networkingMode {}.</value>
1131+
<comment>{Locked="wsl2.virtio"}{Locked="VirtioProxy"}{FixedPlaceholder="{}"}Command line arguments, file names and string inserts should not be translated</comment>
1132+
</data>
1133+
<data name="MessageSwiotlbKernelUnsupported" xml:space="preserve">
1134+
<value>The running kernel is missing a patch that significantly improves virtio device performance. Update to a more recent WSL kernel to enable this optimization.</value>
1135+
<comment>{Locked="virtio"}</comment>
1136+
</data>
11291137
<data name="MessageInstallationCorrupted" xml:space="preserve">
11301138
<value>Instalace WSL je pravděpodobně poškozena (kód chyby: {}).
11311139
Stisknutím libovolné klávesy opravíte WSL nebo CTRL-C akci zrušíte.
@@ -2826,6 +2834,15 @@ Při prvním spuštění vytvoří soubor se všemi nastaveními okomentovanými
28262834
<data name="WSLCCLI_TailArgDescription" xml:space="preserve">
28272835
<value>Počet řádků, které se mají zobrazit od konce protokolů</value>
28282836
</data>
2837+
<data name="WSLCCLI_TimestampsArgDescription" xml:space="preserve">
2838+
<value>Show timestamps in log output</value>
2839+
</data>
2840+
<data name="WSLCCLI_SinceArgDescription" xml:space="preserve">
2841+
<value>Show logs since timestamp (e.g. unix epoch seconds)</value>
2842+
</data>
2843+
<data name="WSLCCLI_UntilArgDescription" xml:space="preserve">
2844+
<value>Show logs before timestamp (e.g. unix epoch seconds)</value>
2845+
</data>
28292846
<data name="WSLCCLI_TargetArgDescription" xml:space="preserve">
28302847
<value>Nový odkaz na obrázek ve formátu image-name[:tag]</value>
28312848
</data>

0 commit comments

Comments
 (0)