diff --git a/components/MarkdownTextBlock/src/CommunityToolkit.WinUI.Controls.MarkdownTextBlock.csproj b/components/MarkdownTextBlock/src/CommunityToolkit.WinUI.Controls.MarkdownTextBlock.csproj
index f9a01416e..64edb1843 100644
--- a/components/MarkdownTextBlock/src/CommunityToolkit.WinUI.Controls.MarkdownTextBlock.csproj
+++ b/components/MarkdownTextBlock/src/CommunityToolkit.WinUI.Controls.MarkdownTextBlock.csproj
@@ -25,7 +25,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
diff --git a/components/MarkdownTextBlock/src/Extensions.cs b/components/MarkdownTextBlock/src/Extensions.cs
index 8c682fe2d..4eb5203b4 100644
--- a/components/MarkdownTextBlock/src/Extensions.cs
+++ b/components/MarkdownTextBlock/src/Extensions.cs
@@ -365,7 +365,7 @@ public static string ToAlphabetical(this int index)
else
{
// Try to find the next insertion position by moving one symbol forward
- TextPointer next = position.GetPositionAtOffset(1, logicalDirection);
+ TextPointer? next = position.GetPositionAtOffset(1, logicalDirection);
// If there is no next position, return null
if (next == null)
{
@@ -384,7 +384,7 @@ public static bool IsAtInsertionPosition(this TextPointer position, LogicalDirec
// Get the character rect of the current position
Rect currentRect = position.GetCharacterRect(logicalDirection);
// Try to get the next position by moving one symbol forward
- TextPointer next = position.GetPositionAtOffset(1, logicalDirection);
+ TextPointer? next = position.GetPositionAtOffset(1, logicalDirection);
// If there is no next position, return false
if (next == null)
{
diff --git a/components/MarkdownTextBlock/src/MultiTarget.props b/components/MarkdownTextBlock/src/MultiTarget.props
index 18f6c7c98..81a497fd2 100644
--- a/components/MarkdownTextBlock/src/MultiTarget.props
+++ b/components/MarkdownTextBlock/src/MultiTarget.props
@@ -4,6 +4,6 @@
MultiTarget is a custom property that indicates which target a project is designed to be built for / run on.
Used to create project references, generate solution files, enable/disable TargetFrameworks, and build nuget packages.
-->
- uwp;wasdk;
+ uwp;wasdk;wasm;win32;linux;macos;ios;android;
diff --git a/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs b/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
index 090f1a21d..8edffe312 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
@@ -29,9 +29,14 @@ public MyInlineCode(CodeInline codeInline, MarkdownConfig config)
border.BorderThickness = _config.Themes.InlineCodeBorderThickness;
border.CornerRadius = _config.Themes.InlineCodeCornerRadius;
border.Padding = _config.Themes.InlineCodePadding;
+#if HAS_UNO
+ // UIElement.Transform3D is not implemented on Uno
+ border.RenderTransform = new TranslateTransform { Y = 4 };
+#else
CompositeTransform3D transform = new CompositeTransform3D();
transform.TranslateY = 4;
border.Transform3D = transform;
+#endif
var textBlock = new TextBlock();
textBlock.FontSize = _config.Themes.InlineCodeFontSize;
textBlock.Foreground = _config.Themes.InlineCodeForeground;
diff --git a/components/MarkdownTextBlock/src/TextElements/MyTaskListCheckBox.cs b/components/MarkdownTextBlock/src/TextElements/MyTaskListCheckBox.cs
index afd9d39f2..19ca34adb 100644
--- a/components/MarkdownTextBlock/src/TextElements/MyTaskListCheckBox.cs
+++ b/components/MarkdownTextBlock/src/TextElements/MyTaskListCheckBox.cs
@@ -15,9 +15,14 @@ public MyTaskListCheckBox(TaskList taskList)
{
_taskList = taskList;
var grid = new Grid();
+#if HAS_UNO
+ // UIElement.Transform3D is not implemented on Uno
+ grid.RenderTransform = new TranslateTransform { Y = 2 };
+#else
CompositeTransform3D transform = new CompositeTransform3D();
transform.TranslateY = 2;
grid.Transform3D = transform;
+#endif
grid.Width = 16;
grid.Height = 16;
grid.Margin = new Thickness(2, 0, 2, 0);
diff --git a/global.json b/global.json
index 338ca727d..7f21440ea 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,11 @@
{
"sdk": {
- "version": "9.0.310",
+ "version": "10.0.401",
"rollForward": "latestFeature"
},
"msbuild-sdks":
{
- "MSBuild.Sdk.Extras":"3.0.23"
+ "MSBuild.Sdk.Extras":"3.0.44",
+ "Uno.Sdk": "7.0.0-dev.51"
}
}
diff --git a/tooling b/tooling
index 5ebeaabec..843a88ab2 160000
--- a/tooling
+++ b/tooling
@@ -1 +1 @@
-Subproject commit 5ebeaabeccc7a1d157ab40b784686a8758d15766
+Subproject commit 843a88ab27f6240dc1f540e981602955122cf3b0