Merge branch 'main' into uwp-net8-windows

Arlodotexe · Arlodotexe · commit 2936f5f46850 · 2024-09-20T12:37:47.000-05:00
diff --git a/CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionsRenderer.xaml.cs b/CommunityToolkit.App.Shared/Renderers/GeneratedSampleOptionsRenderer.xaml.cs
@@ -30,14 +30,14 @@ public GeneratedSampleOptionsRenderer()
     /// The backing <see cref="DependencyProperty"/> for <see cref="SampleOptions"/>.
     /// </summary>
     public static readonly DependencyProperty SampleOptionsProperty =
-        DependencyProperty.Register(nameof(SampleOptions), typeof(IEnumerable<IGeneratedToolkitSampleOptionViewModel>), typeof(GeneratedSampleOptionsRenderer), new PropertyMetadata(null));
+        DependencyProperty.Register(nameof(SampleOptions), typeof(IGeneratedToolkitSampleOptionViewModel[]), typeof(GeneratedSampleOptionsRenderer), new PropertyMetadata(new List<IGeneratedToolkitSampleOptionViewModel>()));
 
     /// <summary>
     /// The generated sample options that should be displayed to the user.
     /// </summary>
-    public IEnumerable<IGeneratedToolkitSampleOptionViewModel>? SampleOptions
+    public IGeneratedToolkitSampleOptionViewModel[] SampleOptions
     {
-        get => (IEnumerable<IGeneratedToolkitSampleOptionViewModel>?)GetValue(SampleOptionsProperty);
+        get => (IGeneratedToolkitSampleOptionViewModel[])GetValue(SampleOptionsProperty);
         set => SetValue(SampleOptionsProperty, value);
     }
 
diff --git a/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs b/CommunityToolkit.App.Shared/Renderers/ToolkitSampleRenderer.xaml.cs
@@ -193,10 +193,13 @@ private async Task LoadData()
             // Generated properties reference these in getters and setters.
             propertyContainer.GeneratedPropertyMetadata = Metadata.GeneratedSampleOptions;
 
-            SampleOptionsPaneInstance = new GeneratedSampleOptionsRenderer
+            if (propertyContainer.GeneratedPropertyMetadata is not null)
             {
-                SampleOptions = propertyContainer.GeneratedPropertyMetadata
-            };
+                SampleOptionsPaneInstance = new GeneratedSampleOptionsRenderer
+                {
+                    SampleOptions = propertyContainer.GeneratedPropertyMetadata
+                };
+            }
         }
         else
         {
diff --git a/CommunityToolkit.Tooling.SampleGen/Metadata/IToolkitSampleGeneratedOptionPropertyContainer.cs b/CommunityToolkit.Tooling.SampleGen/Metadata/IToolkitSampleGeneratedOptionPropertyContainer.cs
@@ -16,5 +16,5 @@ public interface IToolkitSampleGeneratedOptionPropertyContainer
     /// as a proxy between the current actual value and the
     /// generated properties which consume them.
     /// </summary>
-    public IEnumerable<IGeneratedToolkitSampleOptionViewModel>? GeneratedPropertyMetadata { get; set; }
+    public IGeneratedToolkitSampleOptionViewModel[]? GeneratedPropertyMetadata { get; set; }
 }
diff --git a/CommunityToolkit.Tooling.SampleGen/Metadata/ToolkitSampleMetadata.cs b/CommunityToolkit.Tooling.SampleGen/Metadata/ToolkitSampleMetadata.cs
@@ -50,7 +50,7 @@ public sealed class ToolkitSampleMetadata
     /// <summary>
     /// Gets or sets the generated sample options that were declared alongside this sample, if any.
     /// </summary>
-    public IEnumerable<IGeneratedToolkitSampleOptionViewModel>? GeneratedSampleOptions { get; set; }
+    public IGeneratedToolkitSampleOptionViewModel[]? GeneratedSampleOptions { get; set; }
 
     /// <summary>
     /// Contains the metadata needed to identify and display a toolkit sample.
@@ -74,7 +74,7 @@ public ToolkitSampleMetadata(
         Func<object> sampleControlFactory,
         Type? sampleOptionsPaneType = null,
         Func<object, object>? sampleOptionsPaneFactory = null,
-        IEnumerable<IGeneratedToolkitSampleOptionViewModel>? generatedSampleOptions = null)
+        IGeneratedToolkitSampleOptionViewModel[]? generatedSampleOptions = null)
     {
         Id = id;
         DisplayName = displayName;
diff --git a/CommunityToolkit.Tooling.SampleGen/ToolkitSampleOptionGenerator.cs b/CommunityToolkit.Tooling.SampleGen/ToolkitSampleOptionGenerator.cs
@@ -126,9 +126,9 @@ namespace {attachedSymbol.ContainingNamespace}
 {{
     public partial class {attachedSymbol.Name} : {typeof(IToolkitSampleGeneratedOptionPropertyContainer).Namespace}.{nameof(IToolkitSampleGeneratedOptionPropertyContainer)}
     {{
-        private IEnumerable<{typeof(IGeneratedToolkitSampleOptionViewModel).FullName}>? _generatedPropertyMetadata;
+        private {typeof(IGeneratedToolkitSampleOptionViewModel).FullName}[]? _generatedPropertyMetadata;
 
-        public IEnumerable<{typeof(IGeneratedToolkitSampleOptionViewModel).FullName}>? GeneratedPropertyMetadata
+        public {typeof(IGeneratedToolkitSampleOptionViewModel).FullName}[]? GeneratedPropertyMetadata
         {{
             get => _generatedPropertyMetadata;
             set
diff --git a/MultiTarget/PackageReferences/WinAppSdk.props b/MultiTarget/PackageReferences/WinAppSdk.props
@@ -1,8 +1,7 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240807006-preview1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <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.1" />
diff --git a/MultiTarget/WinUI.Extra.props b/MultiTarget/WinUI.Extra.props
@@ -38,7 +38,9 @@
     
     <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86;win-x64;win-arm64</RuntimeIdentifiers> 
     <RuntimeIdentifiers Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <WindowsSdkPackageVersion>10.0.22621.37-preview</WindowsSdkPackageVersion>
+
+    <WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">10.0.22621.41</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion Condition="8 > $([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)'))">10.0.22621.38</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsUno)' == 'true'">
@@ -69,23 +71,4 @@
       <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>
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
@@ -17,6 +17,7 @@
 
   <PropertyGroup>
     <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsAotCompatible>
+    <CsWinRTAotWarningLevel Condition="'$(IsAotCompatible)' == 'true'">2</CsWinRTAotWarningLevel>
   </PropertyGroup>
 
   <!-- Auto Generate our own Assembly Info -->

Original file line number	Diff line number	Diff line change
`@@ -193,10 +193,13 @@ private async Task LoadData()`
`193`	`193`	`// Generated properties reference these in getters and setters.`
`194`	`194`	`propertyContainer.GeneratedPropertyMetadata = Metadata.GeneratedSampleOptions;`
`195`	`195`
`196`		`- SampleOptionsPaneInstance = new GeneratedSampleOptionsRenderer`
	`196`	`+ if (propertyContainer.GeneratedPropertyMetadata is not null)`
`197`	`197`	`{`
`198`		`- SampleOptions = propertyContainer.GeneratedPropertyMetadata`
`199`		`- };`
	`198`	`+ SampleOptionsPaneInstance = new GeneratedSampleOptionsRenderer`
	`199`	`+ {`
	`200`	`+ SampleOptions = propertyContainer.GeneratedPropertyMetadata`
	`201`	`+ };`
	`202`	`+ }`
`200`	`203`	`}`
`201`	`204`	`else`
`202`	`205`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ public interface IToolkitSampleGeneratedOptionPropertyContainer`
`16`	`16`	`/// as a proxy between the current actual value and the`
`17`	`17`	`/// generated properties which consume them.`
`18`	`18`	`/// </summary>`
`19`		`- public IEnumerable<IGeneratedToolkitSampleOptionViewModel>? GeneratedPropertyMetadata { get; set; }`
	`19`	`+ public IGeneratedToolkitSampleOptionViewModel[]? GeneratedPropertyMetadata { get; set; }`
`20`	`20`	`}`