Merge branch 'main' into patch-1

CommunityToolkit · Feb 20, 2024 · c9870a9 · c9870a9
2 parents b8dcbc4 + c0b00f6
commit c9870a9
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 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/GenerateAllSolution.ps1 b/GenerateAllSolution.ps1
@@ -78,7 +78,7 @@ if ($UseDiagnostics.IsPresent)
     $sdkoptions = "-d"
     $diagnostics = @(
         '-bl:slngen.binlog'
-        '--consolelogger:"ShowEventId;Summary;Verbosity=Detailed"'
+        '--consolelogger:ShowEventId;Summary;Verbosity=Detailed'
     )
 }
 else
@@ -87,6 +87,9 @@ else
     $diagnostics = ""
 }
 
+# See https://learn.microsoft.com/en-us/powershell/scripting/learn/experimental-features?view=powershell-7.4#psnativecommandargumentpassing
+$PSNativeCommandArgumentPassing = 'Legacy'
+
 $cmd = 'dotnet'
 $arguments = @(
     $sdkoptions
@@ -102,6 +105,4 @@ $arguments = @(
     $projects
 )
 
-Write-Output "Running Command: $cmd $arguments"
-
 &$cmd @arguments
diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
-        <WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;</WinAppSdkTargetFramework>
+        <WinAppSdkTargetFramework>net6.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
 
         <WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
         <LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>

diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
-        <WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;</WinAppSdkTargetFramework>
+        <WinAppSdkTargetFramework>net6.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
 
         <WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
         <LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>

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/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
   </ItemGroup>
 </Project>
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
@@ -29,7 +29,7 @@
   <Choose>
     <When Condition="'$(ToolkitConvertersSourceProject)' == ''">
       <ItemGroup>
-        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Converters" Version="8.0.230823-rc"/>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Converters" Version="8.0.230907"/>
       </ItemGroup>
     </When>
     <!-- This is tripping up the linux build using dotnet build as we have a duplicate reference 
@@ -46,7 +46,7 @@
   <Choose>
     <When Condition="'$(ToolkitSettingsControlsSourceProject)' == ''">
       <ItemGroup>
-        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Controls.SettingsControls" Version="8.0.230823-rc"/>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Controls.SettingsControls" Version="8.0.230907"/>
       </ItemGroup>
     </When>
     <When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('SettingsControls')) == 'false'">
@@ -58,7 +58,7 @@
   <Choose>
     <When Condition="'$(ToolkitExtensionsSourceProject)' == ''">
       <ItemGroup>
-        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.230823-rc"/>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.230907"/>
       </ItemGroup>
     </When>
     <When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('Extensions')) == 'false'">
@@ -70,7 +70,7 @@
   <Choose>
     <When Condition="'$(ToolkitTriggersSourceProject)' == ''">
       <ItemGroup>
-        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Triggers" Version="8.0.230823-rc"/>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Triggers" Version="8.0.230907"/>
       </ItemGroup>
     </When>
     <When Condition="'$(IsSingleExperimentHead)' == 'true' and $(MSBuildProjectName.StartsWith('Triggers')) == 'false'">

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.230801-preview"/>
+        <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>

diff --git a/Scripts/PackEachExperiment.ps1 b/Scripts/PackEachExperiment.ps1
@@ -6,6 +6,6 @@ Param (
     [string]$postfix
 )
 
-foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../components/*/src/*.csproj') {
+foreach ($experimentProjPath in Get-ChildItem -Recurse -Path "$PSScriptRoot/../../components/*/src/*.csproj") {
   & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable /p:DateForVersion=$date /p:PreviewVersion=$postfix $experimentProjPath
 }