Skip to content

Commit 0348d88

Browse files
David BritchDavid Britch
authored andcommitted
Fixed relationship between XAML and their code-behind files in the PCL. Fixes dotnet-architecture#354
1 parent 745cb39 commit 0348d88

1 file changed

Lines changed: 87 additions & 33 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

Lines changed: 87 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<Compile Include="Animations\StoryBoard.cs" />
3737
<Compile Include="Animations\Base\AnimationBase.cs" />
3838
<Compile Include="Animations\Base\EasingType.cs" />
39-
<Compile Include="Controls\AddBasketButton.xaml.cs" />
39+
<Compile Include="Controls\AddBasketButton.xaml.cs">
40+
<DependentUpon>AddBasketButton.xaml</DependentUpon>
41+
</Compile>
4042
<Compile Include="Controls\CustomTabbedPage.cs" />
4143
<Compile Include="Controls\ToggleButton.cs" />
4244
<Compile Include="Behaviors\EventToCommandBehavior.cs" />
@@ -59,23 +61,57 @@
5961
<Compile Include="Helpers\RandomNumberGenerator.cs" />
6062
<Compile Include="Helpers\ServicesHelper.cs" />
6163
<Compile Include="Helpers\Settings.cs" />
62-
<Compile Include="Views\Templates\BasketItemTemplate.xaml.cs" />
63-
<Compile Include="Views\Templates\CampaignTemplate.xaml.cs" />
64-
<Compile Include="Views\Templates\OrderItemTemplate.xaml.cs" />
65-
<Compile Include="Views\Templates\OrderTemplate.xaml.cs" />
66-
<Compile Include="Views\Templates\ProductTemplate.xaml.cs" />
67-
<Compile Include="Views\BasketView.xaml.cs" />
68-
<Compile Include="Views\CampaignDetailsView.xaml.cs" />
69-
<Compile Include="Views\CampaignView.xaml.cs" />
70-
<Compile Include="Views\CatalogView.xaml.cs" />
71-
<Compile Include="Views\CheckoutView.xaml.cs" />
72-
<Compile Include="Views\CustomNavigationView.xaml.cs" />
73-
<Compile Include="Views\FiltersView.xaml.cs" />
74-
<Compile Include="Views\LoginView.xaml.cs" />
75-
<Compile Include="Views\MainView.xaml.cs" />
76-
<Compile Include="Views\OrderDetailView.xaml.cs" />
77-
<Compile Include="Views\ProfileView.xaml.cs" />
78-
<Compile Include="Views\SettingsView.xaml.cs" />
64+
<Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
65+
<DependentUpon>BasketItemTemplate.xaml</DependentUpon>
66+
</Compile>
67+
<Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
68+
<DependentUpon>CampaignTemplate.xaml</DependentUpon>
69+
</Compile>
70+
<Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
71+
<DependentUpon>OrderItemTemplate.xaml</DependentUpon>
72+
</Compile>
73+
<Compile Include="Views\Templates\OrderTemplate.xaml.cs">
74+
<DependentUpon>OrderTemplate.xaml</DependentUpon>
75+
</Compile>
76+
<Compile Include="Views\Templates\ProductTemplate.xaml.cs">
77+
<DependentUpon>ProductTemplate.xaml</DependentUpon>
78+
</Compile>
79+
<Compile Include="Views\BasketView.xaml.cs">
80+
<DependentUpon>BasketView.xaml</DependentUpon>
81+
</Compile>
82+
<Compile Include="Views\CampaignDetailsView.xaml.cs">
83+
<DependentUpon>CampaignDetailsView.xaml</DependentUpon>
84+
</Compile>
85+
<Compile Include="Views\CampaignView.xaml.cs">
86+
<DependentUpon>CampaignView.xaml</DependentUpon>
87+
</Compile>
88+
<Compile Include="Views\CatalogView.xaml.cs">
89+
<DependentUpon>CatalogView.xaml</DependentUpon>
90+
</Compile>
91+
<Compile Include="Views\CheckoutView.xaml.cs">
92+
<DependentUpon>CheckoutView.xaml</DependentUpon>
93+
</Compile>
94+
<Compile Include="Views\CustomNavigationView.xaml.cs">
95+
<DependentUpon>CustomNavigationView.xaml</DependentUpon>
96+
</Compile>
97+
<Compile Include="Views\FiltersView.xaml.cs">
98+
<DependentUpon>FiltersView.xaml</DependentUpon>
99+
</Compile>
100+
<Compile Include="Views\LoginView.xaml.cs">
101+
<DependentUpon>LoginView.xaml</DependentUpon>
102+
</Compile>
103+
<Compile Include="Views\MainView.xaml.cs">
104+
<DependentUpon>MainView.xaml</DependentUpon>
105+
</Compile>
106+
<Compile Include="Views\OrderDetailView.xaml.cs">
107+
<DependentUpon>OrderDetailView.xaml</DependentUpon>
108+
</Compile>
109+
<Compile Include="Views\ProfileView.xaml.cs">
110+
<DependentUpon>ProfileView.xaml</DependentUpon>
111+
</Compile>
112+
<Compile Include="Views\SettingsView.xaml.cs">
113+
<DependentUpon>SettingsView.xaml</DependentUpon>
114+
</Compile>
79115
<Compile Include="Extensions\ObservableExtension.cs" />
80116
<Compile Include="Exceptions\ServiceAuthenticationException.cs" />
81117
<Compile Include="Models\Basket\BasketCheckout.cs" />
@@ -162,57 +198,75 @@
162198
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
163199
</EmbeddedResource>
164200
<EmbeddedResource Include="Controls\AddBasketButton.xaml">
165-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
201+
<SubType>Designer</SubType>
202+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
166203
</EmbeddedResource>
167204
<EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
168-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
205+
<SubType>Designer</SubType>
206+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
169207
</EmbeddedResource>
170208
<EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
171-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
209+
<SubType>Designer</SubType>
210+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
172211
</EmbeddedResource>
173212
<EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
174-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
213+
<SubType>Designer</SubType>
214+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
175215
</EmbeddedResource>
176216
<EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
177-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
217+
<SubType>Designer</SubType>
218+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
178219
</EmbeddedResource>
179220
<EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
180-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
221+
<SubType>Designer</SubType>
222+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
181223
</EmbeddedResource>
182224
<EmbeddedResource Include="Views\BasketView.xaml">
183-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
225+
<SubType>Designer</SubType>
226+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
184227
</EmbeddedResource>
185228
<EmbeddedResource Include="Views\CampaignDetailsView.xaml">
186-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
229+
<SubType>Designer</SubType>
230+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
187231
</EmbeddedResource>
188232
<EmbeddedResource Include="Views\CampaignView.xaml">
189-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
233+
<SubType>Designer</SubType>
234+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
190235
</EmbeddedResource>
191236
<EmbeddedResource Include="Views\CatalogView.xaml">
192-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
237+
<SubType>Designer</SubType>
238+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
193239
</EmbeddedResource>
194240
<EmbeddedResource Include="Views\SettingsView.xaml">
195-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
241+
<SubType>Designer</SubType>
242+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
196243
</EmbeddedResource>
197244
<EmbeddedResource Include="Views\ProfileView.xaml">
198-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
245+
<SubType>Designer</SubType>
246+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
199247
</EmbeddedResource>
200248
<EmbeddedResource Include="Views\OrderDetailView.xaml">
201-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
249+
<SubType>Designer</SubType>
250+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
202251
</EmbeddedResource>
203252
<EmbeddedResource Include="Views\MainView.xaml">
204-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
253+
<SubType>Designer</SubType>
254+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
205255
</EmbeddedResource>
206256
<EmbeddedResource Include="Views\LoginView.xaml">
207-
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
257+
<SubType>Designer</SubType>
258+
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
208259
</EmbeddedResource>
209260
<EmbeddedResource Include="Views\FiltersView.xaml">
261+
<SubType>Designer</SubType>
210262
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
211263
</EmbeddedResource>
212264
<EmbeddedResource Include="Views\CustomNavigationView.xaml">
265+
<SubType>Designer</SubType>
213266
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
214267
</EmbeddedResource>
215268
<EmbeddedResource Include="Views\CheckoutView.xaml">
269+
<SubType>Designer</SubType>
216270
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
217271
</EmbeddedResource>
218272
</ItemGroup>

0 commit comments

Comments
 (0)