Skip to content

Commit 8bee0fd

Browse files
amaitlandamaitland
committed
Include locales in chromiumembeddedframework.runtime.win packages
Issue #93
1 parent 7ef312f commit 8bee0fd

5 files changed

+19
-54
lines changed

‎NuGet/chromiumembeddedframework.runtime.props

-54
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,4 @@
88
<CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
99
<CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
1010
</ItemGroup>
11-
12-
<Target Name="CefRedist32CopyLocales">
13-
<PropertyGroup>
14-
<_CefRedist32TargetDir>$(CefRedist32TargetDir)</_CefRedist32TargetDir>
15-
<_CefRedist32TargetDir Condition="'$(_CefRedist32TargetDir)' == ''">$(TargetDir)</_CefRedist32TargetDir>
16-
<_CefRedist32TargetDir>$(_CefRedist32TargetDir)\locales</_CefRedist32TargetDir>
17-
</PropertyGroup>
18-
<!--
19-
Cannot gurantee access to the main CefRuntimeWin32Locales ItemGroup here
20-
so we create a duplicate inside our target.
21-
https://github.com/dotnet/project-system/issues/4158
22-
-->
23-
<ItemGroup>
24-
<_CefRedist32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
25-
</ItemGroup>
26-
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(CefRedist32TargetDir)\locales" />
27-
<Copy SourceFiles="@(_CefRedist32)" DestinationFiles="@(_CefRedist32Locales->'$(_CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
28-
</Target>
29-
30-
<Target Name="CefRedist64CopyLocales">
31-
<PropertyGroup>
32-
<_CefRedist64TargetDir>$(CefRedist64TargetDir)</_CefRedist64TargetDir>
33-
<_CefRedist64TargetDir Condition="'$(_CefRedist64TargetDir)' == ''">$(TargetDir)</_CefRedist64TargetDir>
34-
<_CefRedist64TargetDir>$(_CefRedist64TargetDir)\locales</_CefRedist64TargetDir>
35-
</PropertyGroup>
36-
<!--
37-
Cannot gurantee access to the main CefRuntimeWin64Locales ItemGroup here
38-
so we create a duplicate inside our target.
39-
https://github.com/dotnet/project-system/issues/4158
40-
-->
41-
<ItemGroup>
42-
<_CefRedist64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
43-
</ItemGroup>
44-
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x64 files from $(MSBuildThisFileDirectory)..\CEF\win-x64\locales to $(CefRedist64TargetDir)\locales" />
45-
<Copy SourceFiles="@(_CefRedist64)" DestinationFiles="@(_CefRedist64Locales->'$(_CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
46-
</Target>
47-
48-
<Target Name="CefRedistArm64CopyLocales">
49-
<PropertyGroup>
50-
<_CefRedistArm64TargetDir>$(CefRedistArm64TargetDir)</_CefRedistArm64TargetDir>
51-
<_CefRedistArm64TargetDir Condition="'$(_CefRedistArm64TargetDir)' == ''">$(TargetDir)</_CefRedistArm64TargetDir>
52-
<_CefRedistArm64TargetDir>$(_CefRedistArm64TargetDir)\locales</_CefRedistArm64TargetDir>
53-
</PropertyGroup>
54-
<!--
55-
Cannot gurantee access to the main CefRuntimeWinArm64Locales ItemGroup here
56-
so we create a duplicate inside our target.
57-
https://github.com/dotnet/project-system/issues/4158
58-
-->
59-
<ItemGroup>
60-
<_CefRedistArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
61-
</ItemGroup>
62-
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales arm64 files from $(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\ to $(CefRedistArm64TargetDir)\locales" />
63-
<Copy SourceFiles="@(_CefRedistArm64)" DestinationFiles="@(_CefRedistArm64Locales->'$(_CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
64-
</Target>
6511
</Project>

‎NuGet/chromiumembeddedframework.runtime.win-arm64.props

+6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88

99
<ItemGroup>
1010
<CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
11+
<CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
1112
</ItemGroup>
1213

1314
<Target Name="CefRedistArm64CopyResources">
1415
<PropertyGroup>
1516
<CefRedistArm64TargetDir Condition="'$(CefRedistArm64TargetDir)' == ''">$(TargetDir)</CefRedistArm64TargetDir>
17+
<_CefRedistArm64LocalesTargetDir>$(CefRedistArm64TargetDir)\locales</_CefRedistArm64LocalesTargetDir>
1618
</PropertyGroup>
1719
<!--
1820
Cannot gurantee access to the main CefRuntimeWinArm64 ItemGroup here
@@ -21,8 +23,12 @@
2123
-->
2224
<ItemGroup>
2325
<_CefRuntimeWinArm64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\native\*.*" />
26+
<_CefRuntimeWinArm64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-arm64\locales\*.*" />
2427
</ItemGroup>
2528
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime arm64 files from $(MSBuildThisFileDirectory)..\runtimes\win-arm64\native to $(CefRedistArm64TargetDir)" />
2629
<Copy SourceFiles="@(_CefRuntimeWinArm64)" DestinationFiles="@(_CefRuntimeWinArm64->'$(CefRedistArm64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
30+
31+
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(_CefRedistArm64LocalesTargetDir)" />
32+
<Copy SourceFiles="@(_CefRuntimeWinArm64Locales)" DestinationFiles="@(_CefRuntimeWinArm64Locales->'$(_CefRedistArm64LocalesTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
2733
</Target>
2834
</Project>

‎NuGet/chromiumembeddedframework.runtime.win-x64.props

+6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88

99
<ItemGroup>
1010
<CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
11+
<CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
1112
</ItemGroup>
1213

1314
<Target Name="CefRedist64CopyResources">
1415
<PropertyGroup>
1516
<CefRedist64TargetDir Condition="'$(CefRedist64TargetDir)' == ''">$(TargetDir)</CefRedist64TargetDir>
17+
<_CefRedist64LocalesTargetDir>$(CefRedist64TargetDir)\locales</_CefRedist64LocalesTargetDir>
1618
</PropertyGroup>
1719
<!--
1820
Cannot gurantee access to the main CefRuntimeWin64 ItemGroup here
@@ -21,8 +23,12 @@
2123
-->
2224
<ItemGroup>
2325
<_CefRuntimeWin64 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\*.*" />
26+
<_CefRuntimeWin64Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x64\locales\*.*" />
2427
</ItemGroup>
2528
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x64 files from $(MSBuildThisFileDirectory)..\runtimes\win-x64\native to $(CefRedist64TargetDir)" />
2629
<Copy SourceFiles="@(_CefRuntimeWin64)" DestinationFiles="@(_CefRuntimeWin64->'$(CefRedist64TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
30+
31+
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(_CefRedist64LocalesTargetDir)" />
32+
<Copy SourceFiles="@(_CefRuntimeWin64Locales)" DestinationFiles="@(_CefRuntimeWin64Locales->'$(_CefRedist64LocalesTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
2733
</Target>
2834
</Project>

‎NuGet/chromiumembeddedframework.runtime.win-x86.props

+6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88

99
<ItemGroup>
1010
<CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
11+
<CefRuntimeWin32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
1112
</ItemGroup>
1213

1314
<Target Name="CefRedist32CopyResources">
1415
<PropertyGroup>
1516
<CefRedist32TargetDir Condition="'$(CefRedist32TargetDir)' == ''">$(TargetDir)</CefRedist32TargetDir>
17+
<_CefRedist32LocalesTargetDir>$(CefRedist32TargetDir)\locales</_CefRedist32LocalesTargetDir>
1618
</PropertyGroup>
1719
<!--
1820
Cannot gurantee access to the main CefRuntimeWin32 ItemGroup here
@@ -21,8 +23,12 @@
2123
-->
2224
<ItemGroup>
2325
<_CefRuntimeWin32 Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\*.*" />
26+
<_CefRuntimeWin32Locales Include="$(MSBuildThisFileDirectory)..\CEF\win-x86\locales\*.*" />
2427
</ItemGroup>
2528
<Message Importance="high" Text="Copying Chromium Embedded Framework Runtime x86 files from $(MSBuildThisFileDirectory)..\runtimes\win-x86\native to $(CefRedist32TargetDir)" />
2629
<Copy SourceFiles="@(_CefRuntimeWin32)" DestinationFiles="@(_CefRuntimeWin32->'$(CefRedist32TargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
30+
31+
<Message Importance="high" Text="Copying Chromium Embedded Framework Locales x86 files from $(MSBuildThisFileDirectory)..\CEF\win-x86\locales to $(_CefRedist32LocalesTargetDir)" />
32+
<Copy SourceFiles="@(_CefRuntimeWin32Locales)" DestinationFiles="@(_CefRuntimeWin32Locales->'$(_CefRedist32LocalesTargetDir)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
2733
</Target>
2834
</Project>

‎NuGet/chromiumembeddedframework.runtime.win.nuspec

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<file src="..\cef_binary_3.y.z_$CPlatform$\$Configuration$\*.json" target="runtimes\win-$Platform$\native\" />
2828
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.pak" target="runtimes\win-$Platform$\native\"/>
2929
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\*.dat" target="runtimes\win-$Platform$\native\"/>
30+
<file src="..\cef_binary_3.y.z_$CPlatform$\Resources\locales\*.pak" target="CEF\win-$Platform$\locales"/>
3031
<file src="..\cef_binary_3.y.z_$CPlatform$\Readme.txt" target="\"/>
3132
<file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="build\" />
3233
<file src="chromiumembeddedframework.runtime.win-$Platform$.props" target="buildTransitive\" />

0 commit comments

Comments
 (0)