Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit dfc03e7

Browse files
committed
Build localized satellite assemblies
1 parent 14028c9 commit dfc03e7

File tree

7 files changed

+16
-5
lines changed

7 files changed

+16
-5
lines changed

build/DependencyVersions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
2323
<MicroBuildVersion>0.2.0</MicroBuildVersion>
2424
<SpaTemplateVersion>1.0.0-preview-000249</SpaTemplateVersion>
25+
<XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
2526

2627
<!-- This should either be timestamped or notimestamp as appropriate -->
2728
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>

build/GenerateResxSource.targets

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
</Target>
1616

1717
<Target Name="CustomizeResourceNames"
18-
BeforeTargets="PrepareResourceNames"
18+
BeforeTargets="PrepareResourceNames;GatherXlf"
1919
>
2020
<ItemGroup>
21-
<EmbeddedResource>
22-
<ManifestResourceName Condition="'%(EmbeddedResource.Namespace)' != ''">%(EmbeddedResource.Namespace).%(EmbeddedResource.Filename)</ManifestResourceName>
21+
<EmbeddedResource Condition="'%(EmbeddedResource.Namespace)' != ''">
22+
<ManifestResourceName>%(EmbeddedResource.Namespace).%(EmbeddedResource.Filename)</ManifestResourceName>
2323
</EmbeddedResource>
24+
<XlfSource Condition="'%(XlfSource.Namespace)' != ''">
25+
<ManifestResourceName>%(XlfSource.Namespace).%(XlfSource.Filename)</ManifestResourceName>
26+
<XlfTranslatedFileName>%(XlfSource.Namespace).%(XlfSource.Filename)</XlfTranslatedFileName>
27+
</XlfSource>
2428
</ItemGroup>
2529
</Target>
2630

@@ -35,7 +39,7 @@
3539

3640
<Target Name="GetEmbeddedResourcesWithSourceGeneration">
3741
<ItemGroup>
38-
<EmbeddedResourceSG Include="@(EmbeddedResource)" Condition="'%(EmbeddedResource.GenerateSource)' == 'true'" />
42+
<EmbeddedResourceSG Include="@(EmbeddedResource)" Condition="'%(EmbeddedResource.GenerateSource)' == 'true' and '%(EmbeddedResource.XlfLanguage)' == ''" />
3943
<EmbeddedResourceSG>
4044
<SourceOutputPath>$(IntermediateOutputPath)%(EmbeddedResourceSG.ManifestResourceName).cs</SourceOutputPath>
4145
</EmbeddedResourceSG>

build/Signing.proj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@
3939
<FilesToSign Include="$(OutputDirectory)/sdk/**/csc.exe;
4040
$(OutputDirectory)/sdk/**/csc.dll;
4141
$(OutputDirectory)/sdk/**/dotnet.dll;
42+
$(OutputDirectory)/sdk/**/dotnet.resources.dll;
4243
$(OutputDirectory)/sdk/**/System.*.dll;
4344
$(OutputDirectory)/sdk/**/Microsoft.*.dll;
4445
$(OutputDirectory)/sdk/**/NuGet*.dll;
4546
$(OutputDirectory)/sdk/**/datacollector.dll;
4647
$(OutputDirectory)/sdk/**/MSBuild.dll;
4748
$(OutputDirectory)/sdk/**/testhost.dll;
48-
$(OutputDirectory)/sdk/**/vstest.console.dll">
49+
$(OutputDirectory)/sdk/**/vstest.console.dll;
50+
$(OutputDirectory)/sdk/**/vstest.console.resources.dll">
4951
<Authenticode>$(InternalCertificateId)</Authenticode>
5052
</FilesToSign>
5153
<!-- Built files for the packages -->

src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
<PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
2525
<PackageReference Include="System.Text.RegularExpressions" Version="4.1.0" />
2626
<PackageReference Include="NETStandard.Library" Version="1.6.0" />
27+
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
2728
</ItemGroup>
2829
</Project>

src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
2626
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(CLI_MSBuild_Version)" />
2727
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
28+
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
2829
</ItemGroup>
2930

3031
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">

src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ItemGroup>
2020
<PackageReference Include="NuGet.Common" Version="$(CLI_NuGet_Version)" />
2121
<PackageReference Include="NuGet.Configuration" Version="$(CLI_NuGet_Version)" />
22+
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
2223
</ItemGroup>
2324

2425
<ItemGroup>

src/dotnet/dotnet.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
6868
<PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />
6969
<PackageReference Include="Microsoft.TemplateEngine.Utils" Version="$(TemplateEngineVersion)" />
70+
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
7071
</ItemGroup>
7172
<ItemGroup>
7273
<Folder Include="commands\dotnet-migrate\xlf" />

0 commit comments

Comments
 (0)