Skip to content

Commit 1ecf6f9

Browse files
committed
fix merge issue
1 parent ce61476 commit 1ecf6f9

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,9 @@
969969
</Page>
970970
<Content Include="SamplePages\TabbedCommandBar\TabbedCommandBar.bind">
971971
<SubType>Designer</SubType>
972-
</Page>
972+
</Content>
973973
<Content Include="SamplePages\MetadataControl\MetadataControlCode.bind">
974974
<SubType>Designer</SubType>
975-
<Generator>MSBuild:Compile</Generator>
976975
</Content>
977976
<Page Include="SamplePages\MetadataControl\MetadataControlPage.xaml">
978977
<SubType>Designer</SubType>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MetadataControl/MetadataControlPage.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System;
6-
using System.Collections.ObjectModel;
75
using Microsoft.Toolkit.Uwp.SampleApp.Common;
6+
using Microsoft.Toolkit.Uwp.UI;
87
using Microsoft.Toolkit.Uwp.UI.Controls;
9-
using Microsoft.Toolkit.Uwp.UI.Extensions;
8+
using System;
9+
using System.Collections.ObjectModel;
1010
using Windows.UI.Xaml;
1111
using Windows.UI.Xaml.Controls;
1212

@@ -35,7 +35,7 @@ public MetadataControlPage()
3535

3636
public void OnXamlRendered(FrameworkElement control)
3737
{
38-
_metadataControl = control.FindChildByName("metadataControl") as MetadataControl;
38+
_metadataControl = control.FindChild("metadataControl") as MetadataControl;
3939
if (_metadataControl != null)
4040
{
4141
_metadataControl.Items = _units;

0 commit comments

Comments
 (0)