Skip to content

Commit 8c0d0bd

Browse files
committed
Add MarkdownTextBlock, upgrade the packages
1 parent 47721dc commit 8c0d0bd

File tree

4 files changed

+21
-8
lines changed

4 files changed

+21
-8
lines changed

App1/App1.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<Version>6.2.10</Version>
148148
</PackageReference>
149149
<PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
150-
<Version>6.0.0</Version>
150+
<Version>6.0.1</Version>
151151
</PackageReference>
152152
</ItemGroup>
153153
<ItemGroup>

ClassLibrary1/ClassLibrary1.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,11 @@
130130
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
131131
<Version>6.2.10</Version>
132132
</PackageReference>
133+
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
134+
<Version>7.0.0-preview1</Version>
135+
</PackageReference>
133136
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid">
134-
<Version>6.0.0</Version>
137+
<Version>7.0.0-preview1</Version>
135138
</PackageReference>
136139
</ItemGroup>
137140
<ItemGroup>

ClassLibrary1/MyUserControl1.xaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,21 @@
1515
<TextBlock>This is a simple custom UWP control</TextBlock>
1616
<Rectangle Fill="Blue" Height="100" Width="100"/>
1717
<TextBlock Text="{x:Bind XamlIslandMessage}" FontSize="50"></TextBlock>
18-
<!--<controls:DataGrid
19-
Height="600" Width="1000" Margin="12" AutoGenerateColumns="True"
20-
>
21-
</controls:DataGrid>-->
2218

19+
<RichTextBlock SelectionHighlightColor="Green">
20+
<Paragraph>RichTextBlock provides a rich text display container that supports
21+
<Run FontStyle="Italic" FontWeight="Bold">formatted text</Run> ,
22+
<Hyperlink NavigateUri="https://docs.microsoft.com/uwp/api/Windows.UI.Xaml.Documents.Hyperlink">hyperlinks</Hyperlink> , inline images, and other rich content.
23+
</Paragraph>
24+
<Paragraph>RichTextBlock also supports a built-in overflow model.</Paragraph>
25+
</RichTextBlock>
26+
27+
<!--Uncomment lines below to reproduce the bug-->
28+
29+
<!--<controls:MarkdownTextBlock Text="**This is *Markdown*!** 😍❤💋🌹🎉😎�🐱‍👤" />-->
30+
31+
<!--<controls:DataGrid Height="600" Width="1000" Margin="12" AutoGenerateColumns="True" />-->
32+
2333
</StackPanel>
2434
</Grid>
2535
</UserControl>

WpfApp1/WpfApp1.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.0" />
12+
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.5" />
21+
<PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.6" />
2222
</ItemGroup>
2323

2424
</Project>

0 commit comments

Comments
 (0)