Skip to content

Commit 66443b5

Browse files
Merge branch 'master' into AdaptiveGridImprovements
2 parents 1e778a5 + 1ee6d34 commit 66443b5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</Choose>
2424

2525
<Choose>
26-
<When Condition="$(TargetFramework.Contains('uap10.0')) == false and '$(TargetFramework)' != 'native' and '$(IsTestSampleProject)' != 'true'">
26+
<When Condition="'$(TargetFramework.Contains(`uap10.0`))' == 'false' and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true'">
2727
<PropertyGroup>
2828
<SignAssembly>true</SignAssembly>
2929
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>

Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626

2727
<!-- Add your application specific runtime directives here. -->
28-
28+
<Type Name="Windows.UI.Xaml.Controls.Border" Dynamic="Required Public" />
2929

3030
</Application>
3131
</Directives>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</controls:TokenizingTextBox.TokenItemTemplate>
6767
</controls:TokenizingTextBox>
6868

69-
<Border BorderThickness="1" BorderBrush="Black" HorizontalAlignment="Stretch">
69+
<Border BorderThickness="1" BorderBrush="Black">
7070
<ListView x:Name="EmailList" Height="200" IsItemClickEnabled="True">
7171
<ListView.ItemTemplate>
7272
<DataTemplate>

0 commit comments

Comments
 (0)