Merge branch 'main' into wasdk/upgrade/1.4.4

CommunityToolkit · Jan 25, 2024 · b34a57d · b34a57d
2 parents 49376a8 + 5a91d82
commit b34a57d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml b/CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml
@@ -19,7 +19,7 @@
     <Page.Resources>
         <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <!--  Overriding the default Markdown styling to be inline with the default Windows typography / design guidelines  -->
-        <Style TargetType="renderer:MarkdownTextBlock">
+        <win:Style TargetType="renderer:MarkdownTextBlock">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="IsTabStop" Value="False" />
             <Setter Property="LinkForeground" Value="{ThemeResource AccentTextFillColorPrimaryBrush}" />
@@ -99,7 +99,7 @@
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
-        </Style>
+        </win:Style>
 
         <DataTemplate x:Key="DocumentTemplate"
                       x:DataType="x:String">
@@ -316,4 +316,3 @@
         </Grid>
     </Grid>
 </Page>
-
diff --git a/MultiTarget/PackageReferences/Uno.props b/MultiTarget/PackageReferences/Uno.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <CommonUnoPackageVersion>4.9.45</CommonUnoPackageVersion>
+        <CommonUnoPackageVersion>5.0.152</CommonUnoPackageVersion>
     </PropertyGroup>
 
     <!-- This file is modified by UseUnoWinUI.ps1 to switch between WinUI 2 and 3 under Uno Platform -->

diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
@@ -14,14 +14,14 @@
   </ItemGroup>
 
   <Choose>
-    <When Condition="'$(ToolkitExtensionSourceProject)' == ''">
+    <When Condition="'$(ToolkitExtensionsSourceProject)' == ''">
       <ItemGroup>
         <PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.230907"/>
       </ItemGroup>
     </When>
     <When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('Extensions')) == 'false'">
       <ItemGroup>
-        <ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
+        <ProjectReference Include="$(ToolkitExtensionsSourceProject)"/>
       </ItemGroup>
     </When>
   </Choose>