Skip to content

Commit dd076f3

Browse files
committed
EmbeddedResource items does not nest generated sources
The "EmbeddedResourceUseDependentUponConvention" does not automatically nest the generated sources to its parent files.
1 parent 7f681ce commit dd076f3

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,16 @@
1313
<PackageTags>Controls;XAML;UI;Data;Grid;DataGrid</PackageTags>
1414
</PropertyGroup>
1515

16-
<ItemGroup>
17-
<Compile Update="Properties\Resources.Designer.cs">
18-
<DesignTime>True</DesignTime>
19-
<AutoGen>True</AutoGen>
20-
<DependentUpon>Resources.resx</DependentUpon>
21-
</Compile>
22-
</ItemGroup>
23-
2416
<ItemGroup>
2517
<EmbeddedResource Update="Properties\Resources.resx">
2618
<Generator>ResXFileCodeGenerator</Generator>
2719
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
2820
</EmbeddedResource>
21+
<Compile Update="Properties\Resources.Designer.cs">
22+
<AutoGen>True</AutoGen>
23+
<DesignTime>True</DesignTime>
24+
<DependentUpon>Resources.resx</DependentUpon>
25+
</Compile>
2926
</ItemGroup>
3027

3128
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.UWP.Controls.targets" />

build/Windows.Toolkit.VisualStudio.Design.targets

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@
55
<OutputPath>$(ParentProjectOutputPath)Design\</OutputPath>
66
</PropertyGroup>
77

8+
<PropertyGroup Condition="'$(EnableDefaultEmbeddedResourceItems)' == 'True'">
9+
<EmbeddedResourceUseDependentUponConvention>True</EmbeddedResourceUseDependentUponConvention>
10+
</PropertyGroup>
11+
12+
<ItemGroup Condition="'$(EnableDefaultEmbeddedResourceItems)' == 'True' AND '$(EmbeddedResourceUseDependentUponConvention)' == 'True'">
13+
<EmbeddedResource Update="**\*.resx">
14+
<Generator>ResXFileCodeGenerator</Generator>
15+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
16+
</EmbeddedResource>
17+
<Compile Update="Properties\Resources.Designer.cs">
18+
<AutoGen>True</AutoGen>
19+
<DesignTime>True</DesignTime>
20+
<DependentUpon>Resources.resx</DependentUpon>
21+
</Compile>
22+
</ItemGroup>
23+
824
<ItemGroup Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">
925
<ProjectReference Include="..\$(ParentProjectName)\$(ParentProjectName)$(MSBuildProjectExtension)">
1026
<Private>False</Private>

0 commit comments

Comments
 (0)