Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<PackageReference Include="Markdig" Version="0.38.0" />
<PackageReference Include="Roman-Numerals" Version="2.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<ItemGroup Condition="'$(IsUwp)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2')">
<Using Include="Windows.UI" />
<Using Include="Windows.UI.Xaml.Documents" />
<Using Include="Windows.UI.Xaml.Media.Imaging" />
<Using Include="Windows.UI.Xaml.Media.Media3D" />
<Using Include="Windows.UI.Xaml.Shapes" />
<Using Include="Windows.UI.Text" />
</ItemGroup>
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3')">
<Using Include="Microsoft.UI" />
<Using Include="Microsoft.UI.Xaml.Documents" />
<Using Include="Microsoft.UI.Xaml.Media.Imaging" />
Expand Down
4 changes: 2 additions & 2 deletions components/MarkdownTextBlock/src/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion components/MarkdownTextBlock/src/MultiTarget.props
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<MultiTarget>uwp;wasdk;</MultiTarget>
<MultiTarget>uwp;wasdk;wasm;win32;linux;macos;ios;android;</MultiTarget>
</PropertyGroup>
</Project>
5 changes: 5 additions & 0 deletions components/MarkdownTextBlock/src/TextElements/MyInlineCode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion tooling
Submodule tooling updated 92 files
+3 −3 .config/dotnet-tools.json
+8 −7 .devcontainer/Dockerfile
+1 −3 .devcontainer/devcontainer.json
+63 −21 .github/workflows/build.yml
+4 −4 Build-Toolkit-Components.ps1
+75 −13 Build-Toolkit-Gallery.ps1
+1 −0 CommunityToolkit.App.Shared/CommunityToolkit.App.Shared.projitems
+130 −0 CommunityToolkit.App.Shared/Polyfills/ColorCode/RichTextBlockFormatter.cs
+52 −5 CommunityToolkit.App.Shared/Renderers/Markdown/MarkdownTextBlock.cs
+1 −1 CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml
+2 −2 CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs
+2 −12 CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml
+36 −5 CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs
+32 −9 GenerateAllSolution.ps1
+31 −4 GenerateSingleSolution.ps1
+31 −2 GenerateVSCodeLaunchConfig.ps1
+17 −12 MultiTarget/AvailableTargetFrameworks.props
+1 −1 MultiTarget/Defaults.props
+5 −1 MultiTarget/DefinedConstants.props
+10 −4 MultiTarget/EnabledTargetFrameworks.props
+2 −2 MultiTarget/Filter-Supported-Components.ps1
+2 −2 MultiTarget/GenerateAllProjectReferences.ps1
+5 −4 MultiTarget/GenerateMultiTargetAwareProjectReferenceProps.ps1
+8 −1 MultiTarget/Library.props
+2 −1 MultiTarget/MultiTargetAwareProjectReference.props.template
+1 −1 MultiTarget/MultiTargetAwareSharedProjectImport.props.template
+13 −7 MultiTarget/MultiTargetIdentifiers.props
+42 −12 MultiTarget/PackageReferences/Uno.props
+28 −1 MultiTarget/ReadMe.md
+10 −7 MultiTarget/Test-Component-Support.ps1
+3 −3 MultiTarget/UseTargetFrameworks.ps1
+0 −3 MultiTarget/UseUnoWinUI.ps1
+42 −0 ProjectHeads/AllComponents/Uno/Assets/Icons/icon.svg
+137 −0 ProjectHeads/AllComponents/Uno/Assets/Icons/icon_foreground.svg
+32 −0 ProjectHeads/AllComponents/Uno/Assets/SharedAssets.md
+137 −0 ProjectHeads/AllComponents/Uno/Assets/Splash/splash_screen.svg
+131 −0 ProjectHeads/AllComponents/Uno/CommunityToolkit.App.Uno.csproj
+5 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/AndroidManifest.xml
+5 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/Assets/AboutAssets.txt
+23 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/Main.Android.cs
+20 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/MainActivity.Android.cs
+4 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/Resources/values/Strings.xml
+8 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/Resources/values/Styles.xml
+2 −0 ProjectHeads/AllComponents/Uno/Platforms/Android/environment.conf
+23 −0 ProjectHeads/AllComponents/Uno/Platforms/Desktop/Program.cs
+3 −0 ProjectHeads/AllComponents/Uno/Platforms/WebAssembly/LinkerConfig.xml
+19 −0 ProjectHeads/AllComponents/Uno/Platforms/WebAssembly/Program.cs
+3 −0 ProjectHeads/AllComponents/Uno/Platforms/WebAssembly/WasmScripts/AppManifest.js
+10 −0 ProjectHeads/AllComponents/Uno/Platforms/WebAssembly/manifest.webmanifest
+6 −0 ProjectHeads/AllComponents/Uno/Platforms/iOS/Entitlements.plist
+43 −0 ProjectHeads/AllComponents/Uno/Platforms/iOS/Info.plist
+21 −0 ProjectHeads/AllComponents/Uno/Platforms/iOS/Main.iOS.cs
+20 −0 ProjectHeads/AllComponents/Uno/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
+31 −0 ProjectHeads/AllComponents/Uno/Platforms/iOS/PrivacyInfo.xcprivacy
+2 −1 ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj
+13 −1 ProjectHeads/AllComponents/Wasm/Program.cs
+7 −0 ProjectHeads/App.Head.Android.props
+0 −2 ProjectHeads/App.Head.Uno.UI.Dependencies.props
+11 −1 ProjectHeads/App.Head.Uno.WinUI.Dependencies.props
+5 −3 ProjectHeads/App.Head.Uno.props
+13 −1 ProjectHeads/App.Head.Wasm.props
+1 −1 ProjectHeads/GenerateSingleSampleHeads.ps1
+42 −0 ProjectHeads/SingleComponent/Uno/Assets/Icons/icon.svg
+137 −0 ProjectHeads/SingleComponent/Uno/Assets/Icons/icon_foreground.svg
+32 −0 ProjectHeads/SingleComponent/Uno/Assets/SharedAssets.md
+137 −0 ProjectHeads/SingleComponent/Uno/Assets/Splash/splash_screen.svg
+5 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/AndroidManifest.xml
+5 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/Assets/AboutAssets.txt
+23 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/Main.Android.cs
+20 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/MainActivity.Android.cs
+4 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/Resources/values/Strings.xml
+8 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/Resources/values/Styles.xml
+2 −0 ProjectHeads/SingleComponent/Uno/Platforms/Android/environment.conf
+23 −0 ProjectHeads/SingleComponent/Uno/Platforms/Desktop/Program.cs
+3 −0 ProjectHeads/SingleComponent/Uno/Platforms/WebAssembly/LinkerConfig.xml
+19 −0 ProjectHeads/SingleComponent/Uno/Platforms/WebAssembly/Program.cs
+3 −0 ProjectHeads/SingleComponent/Uno/Platforms/WebAssembly/WasmScripts/AppManifest.js
+10 −0 ProjectHeads/SingleComponent/Uno/Platforms/WebAssembly/manifest.webmanifest
+6 −0 ProjectHeads/SingleComponent/Uno/Platforms/iOS/Entitlements.plist
+43 −0 ProjectHeads/SingleComponent/Uno/Platforms/iOS/Info.plist
+21 −0 ProjectHeads/SingleComponent/Uno/Platforms/iOS/Main.iOS.cs
+20 −0 ProjectHeads/SingleComponent/Uno/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
+31 −0 ProjectHeads/SingleComponent/Uno/Platforms/iOS/PrivacyInfo.xcprivacy
+123 −0 ProjectHeads/SingleComponent/Uno/ProjectTemplate.Uno.csproj
+16 −0 ProjectHeads/SingleComponent/Wasm/Program.cs
+12 −0 ProjectHeads/Targets/AddMultiTargetCompatibleSampleDocs.targets
+16 −1 ProjectHeads/Tasks/CheckMultiTarget.props
+1 −1 ProjectTemplate/src/MultiTarget.props
+3 −3 ReadMe.md
+1 −1 ToolkitComponent.SampleProject.props
+1 −1 ToolkitComponent.SourceProject.props
+4 −3 global.json
Loading