Merge

Author: Arlodotexe

Build-Toolkit-Components.ps1

@@ -132,13 +132,13 @@ function Invoke-MSBuildWithBinlog {
         # Ensure output is relative to $pwd, not to the csproj of each component. 
         $NupkgOutput = (Resolve-Path $NupkgOutput).Path
 
-        $msbuildArgs += "-t:Clean,Build,Pack"
+        $msbuildArgs += "-t:Build,Pack"
         $msbuildArgs += "/p:PackageOutputPath=$NupkgOutput"
         $msbuildArgs += "/p:DateForVersion=$DateForVersion"
         $msbuildArgs += "/p:PreviewVersion=$PreviewVersion"
     }
     else {
-        $msbuildArgs += "-t:Clean,Build"
+        $msbuildArgs += "-t:Build"
     }
 
     # Add additional properties to the msbuild arguments

CommunityToolkit.App.Shared/Converters/StringToUriConverter.cs

@@ -6,7 +6,7 @@
 
 namespace CommunityToolkit.App.Shared.Converters;
 
-public class StringToUriConverter : IValueConverter
+public partial class StringToUriConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

CommunityToolkit.App.Shared/DocOrSampleTemplateSelector.cs

@@ -14,7 +14,7 @@
 
 namespace CommunityToolkit.App.Shared;
 
-public class DocOrSampleTemplateSelector : DataTemplateSelector
+public partial class DocOrSampleTemplateSelector : DataTemplateSelector
 {
     public DataTemplate? Document { get; set; }
     public DataTemplate? Sample { get; set; }

CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionTemplateSelector.cs

@@ -9,7 +9,7 @@ namespace CommunityToolkit.App.Shared.Renderers;
 /// <summary>
 /// Selects a sample option template for the provided <see cref="IGeneratedToolkitSampleOptionViewModel"/>.
 /// </summary>
-internal class GeneratedSampleOptionTemplateSelector : DataTemplateSelector
+internal partial class GeneratedSampleOptionTemplateSelector : DataTemplateSelector
 {
     public DataTemplate? BoolOptionTemplate { get; set; }
 

GenerateAllSolution.ps1

@@ -142,7 +142,9 @@ if ($UseDiagnostics.IsPresent)
     $sdkoptions = "-d"
     $diagnostics = @(
         '-bl:slngen.binlog'
-        '--consolelogger:ShowEventId;Summary;Verbosity=Detailed'
+        # Console logger + binlog causes exception and failure
+        # Track https://github.com/microsoft/slngen/issues/451
+        #'--consolelogger:ShowEventId;Summary;Verbosity=Detailed'
     )
 }
 else

MultiTarget/EnabledTargetFrameworks.props

@@ -2,10 +2,14 @@
     <PropertyGroup>
         <UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.22621.0;</UwpTargetFramework>
         <WinAppSdkTargetFramework>net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
-
+        
         <WasmHeadTargetFramework>net8.0</WasmHeadTargetFramework>
         <LinuxHeadTargetFramework>net8.0</LinuxHeadTargetFramework>
         <WpfHeadTargetFramework>net8.0</WpfHeadTargetFramework>
+        
+        
+        
+        
 
         <!-- Used for comparison to current TargetFramework -->
         <LinuxLibTargetFramework>net8.0</LinuxLibTargetFramework>

MultiTarget/PackageReferences/WinAppSdk.props

@@ -1,9 +1,10 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240531000-experimental1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2730-prerelease" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.0-prerelease-ci.240731.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
   </ItemGroup>
 </Project>

MultiTarget/WinUI.Extra.props

@@ -61,4 +61,23 @@
       <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+    <!--
+    Workaround for WindowsAppSdk 1.6
+    Track https://github.com/CommunityToolkit/Labs-Windows/pull/561#issuecomment-2274727870
+    -->
+  <Target Condition="'$(IsWinAppSdk)' == 'true'" Name="CsWinRTRemoveXamlDllReferences" AfterTargets="ResolveTargetingPackAssets;ResolveReferences" BeforeTargets="XamlPreCompile;CoreCompile" Outputs="@(Reference)">
+      <ItemGroup>
+          <Reference Remove="@(Reference)"
+              Condition="'%(Reference.Filename)%(Reference.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
+          <ReferencePathWithRefAssemblies Remove="@(ReferencePathWithRefAssemblies)"
+              Condition="'%(ReferencePathWithRefAssemblies.Filename)%(ReferencePathWithRefAssemblies.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
+          <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
+              Condition="'%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
+          <ReferencePath Remove="@(ReferencePath)"
+              Condition="'%(ReferencePath.Filename)%(ReferencePath.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
+          <RuntimePackAsset Remove="@(RuntimePackAsset)"
+Condition="'%(RuntimePackAsset.Filename)%(RuntimePackAsset.Extension)' == 'Microsoft.Windows.UI.Xaml.dll'" />
+      </ItemGroup>
+  </Target>
 </Project>