Skip to content

[release/v7.6.6] Update the manifest resource names for the localized resources embedded in satellite assemblies #27921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dongbo Wang (daxian-dbw) merged 5 commits into from
Sep 1, 2026
Merged

[release/v7.6.6] Update the manifest resource names for the localized resources embedded in satellite assemblies #27921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f742ea
Update the manifest resource names for the localized resources embedd…
daxian-dbw Aug 3, 2026
d4f1fad
Merge branch 'release/v7.6.6' into backport/release/v7.6.6/27756-cb75…
SeeminglyScience Sep 1, 2026
6a0ccad
Merge branch 'release/v7.6.6' into backport/release/v7.6.6/27756-cb75…
SeeminglyScience Sep 1, 2026
c32065d
Merge branch 'release/v7.6.6' into backport/release/v7.6.6/27756-cb75…
SeeminglyScience Sep 1, 2026
12361fe
Update BOM
SeeminglyScience Sep 1, 2026
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
5 changes: 5 additions & 0 deletions ...anagement.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
10 changes: 6 additions & 4 deletions src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<UseWPF>True</UseWPF>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Resource Include="resources\Graphics\Add16.png" />
<Resource Include="resources\Graphics\CloseTile16.png" />
Expand All @@ -35,4 +31,10 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.PowerShell.Commands.Utility\Microsoft.PowerShell.Commands.Utility.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
9 changes: 5 additions & 4 deletions ...icrosoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.5" />
</ItemGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(IsWindows)' != 'true' ">
<Compile Remove="GetCounterCommand.cs" />
<Compile Remove="CounterSample.cs" />
Expand All @@ -29,4 +25,9 @@
<Compile Remove="NewWinEventCommand.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
9 changes: 5 additions & 4 deletions src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
<ProjectReference Include="..\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.csproj" />
</ItemGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.5" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
9 changes: 5 additions & 4 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
<PackageReference Include="JsonSchema.Net" Version="7.4.0" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
9 changes: 5 additions & 4 deletions src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
</ItemGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(IsWindows)' != 'true' ">
<Compile Remove="WindowsTaskbarJumpList\*.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.5" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
8 changes: 5 additions & 3 deletions src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.5" />
</ItemGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>

</Project>
10 changes: 6 additions & 4 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
<PackageReference Include="System.Windows.Extensions" Version="10.0.5" />
</ItemGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
</PropertyGroup>

<ItemGroup>
<!-- exclude code of source generators from compilation and IDEs (e.g. vscode and visual studio) -->
<Compile Remove="SourceGenerators\**\*.cs" />
Expand All @@ -78,4 +74,10 @@
<ItemGroup Condition=" '$(IsWindows)' == 'true' ">
<Compile Remove="engine\Interop\Unix\**\*.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="resources\*\*.resx">
<ManifestResourceName>$(RootNamespace).resources.%(Filename)</ManifestResourceName>
</EmbeddedResource>
</ItemGroup>
</Project>
101 changes: 101 additions & 0 deletions test/powershell/engine/ResourceValidation/LocalizedResource.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

Describe "Localized resource files validation" -Tags "CI" {

BeforeAll {
$repoSrcDir = (Resolve-Path (Join-Path $PSScriptRoot ../../../../src)).Path

# Folders that exist in 'resources' folder but are not a localized resource directory.
$excludeDirs = @('Graphics')

# VS_Main_Languages set, the same as what .NET uses for localization.
$langSet = 'cs', 'de', 'es', 'fr', 'it', 'ja', 'ko', 'pl', 'pt-BR', 'ru', 'tr', 'zh-Hans', 'zh-Hant'
$asmDirs = @(
'Microsoft.Management.Infrastructure.CimCmdlets'
'Microsoft.Management.UI.Internal'
'Microsoft.PowerShell.Commands.Diagnostics'
'Microsoft.PowerShell.Commands.Management'
'Microsoft.PowerShell.Commands.Utility'
'Microsoft.PowerShell.ConsoleHost'
'Microsoft.PowerShell.CoreCLR.Eventing'
'Microsoft.PowerShell.Security'
'Microsoft.WSMan.Management'
'System.Management.Automation'
)

$asmNames = $asmDirs | ForEach-Object {
if ($_ -eq 'Microsoft.Management.UI.Internal') {
'Microsoft.PowerShell.GraphicalHost'
} else {
$_
}
}

$testCases1 = @(
$asmDirs | ForEach-Object { @{ AssemblyDir = $_ } }
)
$testCases2 = @(
$langSet | ForEach-Object { @{ Language = $_ } }
)
}

It "Assembly folders with resources should match with records" {
try {
Push-Location $repoSrcDir
$assemblies = Get-ChildItem 'resources' -Recurse -Directory | ForEach-Object { $_.Parent.Name }

## Verifies that the assembly folders containing resource files match the expected records in $asmDirs.
$result = Compare-Object -ReferenceObject $asmDirs -DifferenceObject $assemblies
$result | Should -Be $null -Because "The assembly folders with resources do not match the expected records:`n$($result | Out-String)."

## Verifies that the default English resource files exist and match the expected count.
$defaultCultureResources = $assemblies | ForEach-Object { Get-ChildItem "$_/resources/*.resx" }
$defaultCultureResources | Should -HaveCount 150 -Because "Default English resource files count: $($defaultCultureResources.Count); Expected count: 150."
}
finally {
Pop-Location
}
}

It "Localized resource files for '<AssemblyDir>' should match the records" -TestCases $testCases1 {
param($AssemblyDir)

## Get the full path to the resources directory for the current assembly folder.
$resDir = Join-Path $repoSrcDir $AssemblyDir 'resources'
## Get all the localized resource directory names under the resources directory.
$locDirNames = @(Get-ChildItem $resDir -Directory | ForEach-Object Name | Where-Object { $_ -notin $excludeDirs })

## Verifies that the localized resource directories match the expected language set.
$results = Compare-Object -ReferenceObject $langSet -DifferenceObject $locDirNames
$results | Should -Be $null -Because "The localized resource directories for '$AssemblyDir' do not match the expected language set:`n$($results | Out-String)."

## Get the default English resource file names without extensions.
$default = @(Get-ChildItem "$resDir/*.resx" | ForEach-Object { [System.IO.Path]::GetFileNameWithoutExtension($_.Name) })

foreach ($lang in $langSet) {
## Get the full path to the localized resource directory for the current language.
$langDir = Join-Path $resDir $lang
## Get all the localized resource file names without extensions for the current language.
$langResources = @(Get-ChildItem "$langDir/*.resx" | ForEach-Object { [System.IO.Path]::GetFileNameWithoutExtension($_.Name) })

## The localized resource file should have the same base name as the default English resource file, with the language suffix added.
$expectedNames = @($default | ForEach-Object { "$_.$lang" })
## Verifies that the localized resource file names match the expected names.
$langResults = Compare-Object -ReferenceObject $expectedNames -DifferenceObject $langResources
$langResults | Should -Be $null -Because "The names of localized resource files for '$lang' in '$AssemblyDir' do not match the default English files:`n$($langResults | Out-String)."
}
}

It "Satellite assemblies should be produced for '<Language>'" -TestCases $testCases2 -Skip:(!$IsWindows) {
param($Language)

$satDir = Join-Path $PSHOME $Language
Test-Path $satDir | Should -BeTrue -Because "Satellite directory for language '$Language' should exist."

foreach ($asmName in $asmNames) {
$satAssemblyPath = Join-Path $satDir "$asmName.resources.dll"
Test-Path $satAssemblyPath | Should -BeTrue -Because "Satellite assembly '$asmName.resources.dll' for language '$Language' should exist."
}
}
}
Loading
Loading