Enable .NET 8 for uwp MultiTarget, upgrade packages

.devcontainer/Dockerfile

@@ -1,8 +1,5 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/dotnet/.devcontainer/base.Dockerfile
-
-# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal, etc
-ARG VARIANT="8.0-bullseye-slim"
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+# See https://github.com/devcontainers/images/tree/main/src/dotnet for image choices
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:9.0
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
 ARG NODE_VERSION="none"

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
 		"args": {
 			// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
 			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0",
+			"VARIANT": "9.0",
 			// Options
 			"NODE_VERSION": "lts/*"
 		}

.github/workflows/build.yml

@@ -17,9 +17,7 @@ on:
   merge_group:
 
 env:
-  DOTNET_VERSION: ${{ '8.0.201' }}
-  DOTNET_INSTALL_DIR: dotnet-install
-  DOTNET_ROOT: dotnet-install
+  DOTNET_VERSION: ${{ '9.0.x' }}
   ENABLE_DIAGNOSTICS: false
   #COREHOST_TRACE: 1
   MSBUILD_VERBOSITY: normal
@@ -31,7 +29,7 @@ env:
 jobs:
   # This workflow contains a single job called "Xaml-Style-Check"
   Xaml-Style-Check:
-    runs-on: windows-latest-large
+    runs-on: windows-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

Directory.Build.targets

@@ -1,7 +1,11 @@
 <Project>
+  <ItemGroup>
+  <!-- Workaround for WebView2 on uap pulling in Microsoft.VCLibs.Desktop when it shouldn't -->
+    <SDKReference Remove="Microsoft.VCLibs.Desktop, Version=14.0" />
+  </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.7.0" PrivateAssets="all" Pack="false" />
+    <PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.12.1" PrivateAssets="all" Pack="false" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 

Windows.Toolkit.Common.props

@@ -29,8 +29,4 @@
     <IsPublishable>true</IsPublishable>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="$(RepositoryDirectory)tooling\GlobalUsings.cs" />
-  </ItemGroup>
 </Project>

components/AppServices/CommunityToolkit.AppServices.SourceGenerators/AppServiceGenerator.Helpers.cs

@@ -1,8 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace CommunityToolkit.AppServices.SourceGenerators;
 
@@ -18,10 +19,27 @@ private static class Helpers
         /// Gets whether the current target is a UWP application.
         /// </summary>
         /// <param name="compilation">The input <see cref="Compilation"/> instance to inspect.</param>
+        /// <param name="analyzerOptions">The analyzer options to use to get info on the target application.</param>
         /// <returns>Whether the current target is a UWP application.</returns>
-        public static bool IsUwpTarget(Compilation compilation)
+        public static bool IsUwpTarget(Compilation compilation, AnalyzerConfigOptions analyzerOptions)
         {
-            return compilation.Options.OutputKind == OutputKind.WindowsRuntimeApplication;
+            // If the application type is a Windows Runtime application, then it's for sure a UWP app
+            if (compilation.Options.OutputKind == OutputKind.WindowsRuntimeApplication)
+            {
+                return true;
+            }
+
+            // Otherwise, the application is UWP if "UseUwpTools" is set
+            if (analyzerOptions.TryGetValue("build_property.UseUwpTools", out string? propertyValue))
+            {
+                if (bool.TryParse(propertyValue, out bool useUwpTools))
+                {
+                    return true;
+                }
+            }
+
+            // The app is definitely not a UWP app
+            return false;
         }
     }
 }

components/AppServices/CommunityToolkit.AppServices.SourceGenerators/AppServiceGenerator.cs

@@ -24,13 +24,12 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
     {
         // Get all app service class implementations, and only enable this branch if the target is not a UWP app (the component)
         IncrementalValuesProvider<(HierarchyInfo Hierarchy, AppServiceInfo Info)> appServiceComponentInfo =
-            context.SyntaxProvider
-            .CreateSyntaxProvider(
+            context.CreateSyntaxProviderWithOptions(
                 static (node, _) => node is ClassDeclarationSyntax classDeclaration && classDeclaration.HasOrPotentiallyHasBaseTypes(),
                 static (context, token) =>
                 {
                     // Only retrieve host info if the target is not a UWP application
-                    if (Helpers.IsUwpTarget(context.SemanticModel.Compilation))
+                    if (Helpers.IsUwpTarget(context.SemanticModel.Compilation, context.GlobalOptions))
                     {
                         return default;
                     }
@@ -80,14 +79,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
         // Gather all interfaces, and only enable this branch if the target is a UWP app (the host)
         IncrementalValuesProvider<(HierarchyInfo Hierarchy, AppServiceInfo Info)> appServiceHostInfo =
-            context.SyntaxProvider
-            .ForAttributeWithMetadataName(
+            context.ForAttributeWithMetadataNameAndOptions(
                 "CommunityToolkit.AppServices.AppServiceAttribute",
                 static (node, _) => node is InterfaceDeclarationSyntax,
                 static (context, token) =>
                 {
                     // Only retrieve host info if the target is a UWP application
-                    if (!Helpers.IsUwpTarget(context.SemanticModel.Compilation))
+                    if (!Helpers.IsUwpTarget(context.SemanticModel.Compilation, context.GlobalOptions))
                     {
                         return default;
                     }

components/AppServices/CommunityToolkit.AppServices.SourceGenerators/Extensions/GeneratorAttributeSyntaxContextWithOptions.cs

@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Immutable;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace CommunityToolkit.AppServices.SourceGenerators.Extensions;
+
+/// <summary>
+/// <inheritdoc cref="GeneratorAttributeSyntaxContext" path="/summary/node()"/>
+/// </summary>
+/// <param name="syntaxContext">The original <see cref="GeneratorAttributeSyntaxContext"/> value.</param>
+/// <param name="globalOptions">The original <see cref="AnalyzerConfigOptions"/> value.</param>
+internal readonly struct GeneratorAttributeSyntaxContextWithOptions(
+    GeneratorAttributeSyntaxContext syntaxContext,
+    AnalyzerConfigOptions globalOptions)
+{
+    /// <inheritdoc cref="GeneratorAttributeSyntaxContext.TargetNode"/>
+    public SyntaxNode TargetNode { get; } = syntaxContext.TargetNode;
+
+    /// <inheritdoc cref="GeneratorAttributeSyntaxContext.TargetSymbol"/>
+    public ISymbol TargetSymbol { get; } = syntaxContext.TargetSymbol;
+
+    /// <inheritdoc cref="GeneratorAttributeSyntaxContext.SemanticModel"/>
+    public SemanticModel SemanticModel { get; } = syntaxContext.SemanticModel;
+
+    /// <inheritdoc cref="GeneratorAttributeSyntaxContext.Attributes"/>
+    public ImmutableArray<AttributeData> Attributes { get; } = syntaxContext.Attributes;
+
+    /// <inheritdoc cref="AnalyzerConfigOptionsProvider.GlobalOptions"/>
+    public AnalyzerConfigOptions GlobalOptions { get; } = globalOptions;
+}

components/AppServices/CommunityToolkit.AppServices.SourceGenerators/Extensions/GeneratorSyntaxContextWithOptions.cs

@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace CommunityToolkit.AppServices.SourceGenerators.Extensions;
+
+/// <summary>
+/// <inheritdoc cref="GeneratorSyntaxContext" path="/summary/node()"/>
+/// </summary>
+/// <param name="syntaxContext">The original <see cref="GeneratorSyntaxContext"/> value.</param>
+/// <param name="globalOptions">The original <see cref="AnalyzerConfigOptions"/> value.</param>
+internal readonly struct GeneratorSyntaxContextWithOptions(
+    GeneratorSyntaxContext syntaxContext,
+    AnalyzerConfigOptions globalOptions)
+{
+    /// <inheritdoc cref="GeneratorSyntaxContext.Node"/>
+    public SyntaxNode Node { get; } = syntaxContext.Node;
+
+    /// <inheritdoc cref="GeneratorSyntaxContext.SemanticModel"/>
+    public SemanticModel SemanticModel { get; } = syntaxContext.SemanticModel;
+
+    /// <inheritdoc cref="AnalyzerConfigOptionsProvider.GlobalOptions"/>
+    public AnalyzerConfigOptions GlobalOptions { get; } = globalOptions;
+}

components/AppServices/CommunityToolkit.AppServices.SourceGenerators/Extensions/IncrementalGeneratorInitializationContextExtensions.cs

@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace CommunityToolkit.AppServices.SourceGenerators.Extensions;
+
+/// <summary>
+/// Extension methods for <see cref="IncrementalGeneratorInitializationContext"/>.
+/// </summary>
+internal static class IncrementalGeneratorInitializationContextExtensions
+{
+    /// <inheritdoc cref="SyntaxValueProvider.ForAttributeWithMetadataName"/>
+    public static IncrementalValuesProvider<T> ForAttributeWithMetadataNameAndOptions<T>(
+        this IncrementalGeneratorInitializationContext context,
+        string fullyQualifiedMetadataName,
+        Func<SyntaxNode, CancellationToken, bool> predicate,
+        Func<GeneratorAttributeSyntaxContextWithOptions, CancellationToken, T> transform)
+    {
+        // Invoke 'ForAttributeWithMetadataName' normally, but just return the context directly
+        IncrementalValuesProvider<GeneratorAttributeSyntaxContext> syntaxContext = context.SyntaxProvider.ForAttributeWithMetadataName(
+            fullyQualifiedMetadataName,
+            predicate,
+            static (context, token) => context);
+
+        // Do the same for the analyzer config options
+        IncrementalValueProvider<AnalyzerConfigOptions> configOptions = context.AnalyzerConfigOptionsProvider.Select(static (provider, token) => provider.GlobalOptions);
+
+        // Merge the two and invoke the provided transform on these two values. Neither value
+        // is equatable, meaning the pipeline will always re-run until this point. This is
+        // intentional: we don't want any symbols or other expensive objects to be kept alive
+        // across incremental steps, especially if they could cause entire compilations to be
+        // rooted, which would significantly increase memory use and introduce more GC pauses.
+        // In this specific case, flowing non equatable values in a pipeline is therefore fine.
+        return syntaxContext.Combine(configOptions).Select((input, token) => transform(new GeneratorAttributeSyntaxContextWithOptions(input.Left, input.Right), token));
+    }
+
+    /// <inheritdoc cref="SyntaxValueProvider.CreateSyntaxProvider"/>
+    public static IncrementalValuesProvider<T> CreateSyntaxProviderWithOptions<T>(
+        this IncrementalGeneratorInitializationContext context,
+        Func<SyntaxNode, CancellationToken, bool> predicate,
+        Func<GeneratorSyntaxContextWithOptions, CancellationToken, T> transform)
+    {
+        // Invoke 'ForAttributeWithMetadataName' normally, but just return the context directly
+        IncrementalValuesProvider<GeneratorSyntaxContext> syntaxContext = context.SyntaxProvider.CreateSyntaxProvider(
+            predicate,
+            static (context, token) => context);
+
+        // Do the same for the analyzer config options
+        IncrementalValueProvider<AnalyzerConfigOptions> configOptions = context.AnalyzerConfigOptionsProvider.Select(static (provider, token) => provider.GlobalOptions);
+
+        // Merge the two and invoke the provided transform, like the extension above
+        return syntaxContext.Combine(configOptions).Select((input, token) => transform(new GeneratorSyntaxContextWithOptions(input.Left, input.Right), token));
+    }
+}

components/AppServices/src/AppServiceComponent.cs

@@ -14,7 +14,7 @@
 using System.Diagnostics.CodeAnalysis;
 using CommunityToolkit.AppServices.Helpers;
 
-#pragma warning disable CA2213, CA1063
+#pragma warning disable CA2213, CA1063, CsWinRT1028
 
 namespace CommunityToolkit.AppServices;
 
@@ -462,7 +462,7 @@ private async void Connection_RequestReceived(AppServiceConnection sender, AppSe
                 try
                 {
                     // Try to get the registered endpoint with the command name, and invoke it
-                    if (_endpoints.TryGetValue(commandStr, out Func<AppServiceParameters, Task<object?>> endpoint))
+                    if (_endpoints.TryGetValue(commandStr, out Func<AppServiceParameters, Task<object?>>? endpoint) && endpoint is {})
                     {
                         response = await endpoint(new AppServiceParameters(this, sender, parameters));
                     }

components/AppServices/src/AppServiceHost.cs

@@ -75,7 +75,7 @@ protected AppServiceHost(string appServiceName)
     private static bool CanUseAppServiceFunctionality { get; } = AnalyticsInfo.VersionInfo.DeviceFamily == "Windows.Desktop" && ApiInformation.IsApiContractPresent("Windows.ApplicationModel.FullTrustAppContract", 1, 0);
 
     /// <summary>
-    /// Handles the app service activation when <see cref="Windows.UI.Xaml.Application.OnBackgroundActivated(BackgroundActivatedEventArgs)"/> is invoked.
+    /// Handles the app service activation when <see cref="OnBackgroundActivated(BackgroundActivatedEventArgs)"/> is invoked.
     /// </summary>
     /// <param name="args">The args for the background activation.</param>
     /// <returns>Whether this activation was an app service connection that could be handled by this host.</returns>
@@ -204,9 +204,9 @@ private void AppServiceConnection_RequestReceived(AppServiceConnection sender, A
         if (args.Request.Message.TryGetValue(ProgressKey, out object? progressKey) &&
             args.Request.Message.TryGetValue(ProgressValue, out object? progressValue) &&
             progressKey is Guid id &&
-            _progressTrackers.TryGetValue(id, out IProgress<object> progress))
+            _progressTrackers.TryGetValue(id, out IProgress<object>? progress))
         {
-            progress.Report(progressValue);
+            progress?.Report(progressValue);
         }
     }
 

components/AppServices/src/CommunityToolkit.AppServices.csproj

@@ -29,15 +29,15 @@
   </PropertyGroup>
 
   <!-- Add the Desktop Extension SDK when on UWP-->
-  <ItemGroup Condition="'$(IsUwp)' == 'true'">
+  <ItemGroup Condition="'$(IsUwp)' == 'true' AND $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'windows'">
     <SDKReference Include="WindowsDesktop, Version=$(TargetPlatformVersion)">
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
 
   <!-- Add the contracts package reference to access WinRT APIs from .NET Standard -->
-  <ItemGroup Condition="'$(IsUwp)' != 'true'">
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.2" />
+  <ItemGroup Condition="'$(IsNetstandard)' == 'true'">
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1742" />
   </ItemGroup>
 
   <!-- Source generator project reference for packing -->
@@ -49,13 +49,11 @@
   <ItemGroup Label="Package">
 
     <!-- Include the custom .targets file to check the source generator -->
-    <None Include="CommunityToolkit.AppServices.targets" PackagePath="buildTransitive\netstandard2.0" Pack="true" />
-    <None Include="CommunityToolkit.AppServices.targets" PackagePath="buildTransitive\uap10.0" Pack="true" />
-    <None Include="CommunityToolkit.AppServices.targets" PackagePath="build\netstandard2.0" Pack="true" />
-    <None Include="CommunityToolkit.AppServices.targets" PackagePath="build\uap10.0" Pack="true" />
+    <None Include="CommunityToolkit.Labs.AppServices.targets" PackagePath="buildTransitive" Pack="true" />
+    <None Include="CommunityToolkit.Labs.AppServices.targets" PackagePath="build" Pack="true" />
 
     <!-- Pack the source generator to the right package folder -->
-    <None Include="..\CommunityToolkit.AppServices.SourceGenerators\bin\$(Configuration)\netstandard2.0\CommunityToolkit.AppServices.SourceGenerators.dll" PackagePath="analyzers\dotnet\cs" Pack="true" Visible="false" />
+    <None Include="..\CommunityToolkit.AppServices.SourceGenerators\bin\$(Platform)\$(Configuration)\netstandard2.0\CommunityToolkit.AppServices.SourceGenerators.dll" PackagePath="analyzers\dotnet\cs" Pack="true" Visible="false" />
   </ItemGroup>
 
   <!-- Remove imported global usings -->

components/AppServices/src/CommunityToolkit.AppServices.targets → components/AppServices/src/CommunityToolkit.Labs.AppServices.targets

@@ -1,5 +1,10 @@
 <Project>
 
+  <!-- Allow the source generators to detect whether an app on modern .NET is UWP or not -->
+  <ItemGroup>
+    <CompilerVisibleProperty Include="UseUwpTools" />
+  </ItemGroup>
+
   <!-- Get the analyzer from the CommunityToolkit.AppServices NuGet package -->
   <Target Name="CommunityToolkitAppServicesGatherAnalyzers">
     <ItemGroup>

components/CanvasView/src/CanvasView.cs

@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET8_0_OR_GREATER
+using System.Diagnostics.CodeAnalysis;
+#endif
 using CommunityToolkit.Labs.WinUI.CanvasViewInternal;
 using CommunityToolkit.WinUI.Helpers;
 
@@ -59,6 +62,9 @@ protected override void ClearContainerForItemOverride(DependencyObject element,
         }
     }
 
+#if NET8_0_OR_GREATER
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "These use of 'SetBindingExpressionValue' might be fine (we should revisit this later)")]
+#endif
     private void ContentPresenter_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
     {
         // Move the rectangle.

components/CanvasView/src/Dependencies.props

@@ -11,21 +11,21 @@
 <Project>
   <!-- WinUI 2 / UWP -->
   <ItemGroup Condition="'$(IsUwp)' == 'true'">
-    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230907"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.2.241223-build.1367"/>
   </ItemGroup>
 
   <!-- WinUI 2 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
-    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230907"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.2.241223-build.1367"/>
   </ItemGroup>
 
   <!-- WinUI 3 / WinAppSdk -->
   <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230907"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241223-build.1367"/>
   </ItemGroup>
 
   <!-- WinUI 3 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230907"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.241223-build.1367"/>
   </ItemGroup>
 </Project>