Merge pull request #3038 from PrismLibrary/dev/ds/link-updates

Adding Linker Metadata

Directory.Build.props

@@ -17,6 +17,12 @@
     <PrismPackageIcon>$(MSBuildThisFileDirectory)images/prism-logo.png</PrismPackageIcon>
     <PrismLicenseFile>$(MSBuildThisFileDirectory)LICENSE</PrismLicenseFile>
     <LangVersion>latest</LangVersion>
+    <PolySharpIncludeGeneratedTypes>
+      System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute;
+      System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes;
+      System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute;
+      System.Runtime.CompilerServices.IsExternalInit;
+    </PolySharpIncludeGeneratedTypes>
   </PropertyGroup>
 
   <PropertyGroup>

Directory.Build.targets

@@ -12,4 +12,27 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
+  <!-- Generate the NotTrimmable.cs file -->
+  <Target Name="AddNotTrimmableFile" BeforeTargets="BeforeCompile" Condition=" $(IsPackable) ">
+    <PropertyGroup>
+      <!-- Define the file path -->
+      <NotTrimmableFilePath>$(IntermediateOutputPath)NotTrimmable.g.cs</NotTrimmableFilePath>
+    </PropertyGroup>
+
+    <!-- Ensure the intermediate output directory exists -->
+    <MakeDir Directories="$(IntermediateOutputPath)" />
+
+    <!-- Write the contents to the file -->
+    <WriteLinesToFile
+      File="$(NotTrimmableFilePath)"
+      Lines="[assembly: System.Reflection.AssemblyMetadata(&quot;IsTrimmable&quot;, &quot;False&quot;)]"
+      Overwrite="true"
+      Encoding="UTF-8" />
+
+    <!-- Include the generated file in the compilation -->
+    <ItemGroup>
+      <Compile Include="$(NotTrimmableFilePath)" />
+    </ItemGroup>
+  </Target>
+
 </Project>

Directory.Packages.props

@@ -1,8 +1,9 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Prism.Container.Abstractions" Version="9.0.61-pre" />
-    <PackageVersion Include="Prism.Container.DryIoc" Version="9.0.61-pre" />
-    <PackageVersion Include="Prism.Container.Unity" Version="9.0.61-pre" />
+    <PackageVersion Include="PolySharp" Version="1.14.1" />
+    <PackageVersion Include="Prism.Container.Abstractions" Version="9.0.80-pre" />
+    <PackageVersion Include="Prism.Container.DryIoc" Version="9.0.80-pre" />
+    <PackageVersion Include="Prism.Container.Unity" Version="9.0.80-pre" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="System.Reactive" Version="6.0.0" />
     <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.0.13" />
@@ -81,4 +82,4 @@
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>

src/Forms/Prism.Forms/Modularity/IModuleCatalogExtensions.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Prism.Modularity
 {
@@ -16,7 +14,7 @@ public static class IModuleCatalogExtensions
         /// <param name="catalog">Catalog</param>
         /// <param name="mode"><see cref="InitializationMode"/></param>
         /// <typeparam name="T">The <see cref="IModule"/> type parameter.</typeparam>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, InitializationMode mode = InitializationMode.WhenAvailable)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, InitializationMode mode = InitializationMode.WhenAvailable)
             where T : IModule =>
             catalog.AddModule<T>(typeof(T).Name, mode);
 
@@ -27,7 +25,7 @@ public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, Initializ
         /// <param name="catalog">Catalog.</param>
         /// <param name="name">Name.</param>
         /// <typeparam name="T">The <see cref="IModule"/> type parameter.</typeparam>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string name)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, string name)
             where T : IModule =>
             catalog.AddModule<T>(name, InitializationMode.WhenAvailable);
 
@@ -39,7 +37,7 @@ public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string na
         /// <param name="name">Name.</param>
         /// <param name="mode"><see cref="IModule"/>.</param>
         /// <typeparam name="T">The <see cref="IModule"/> type parameter.</typeparam>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string name, InitializationMode mode)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, string name, InitializationMode mode)
             where T : IModule =>
             catalog.AddModule(new ModuleInfo(typeof(T), name, mode));
 
@@ -50,7 +48,7 @@ public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string na
         /// <param name="catalog">The <see cref="IModuleCatalog"/> to add the <see cref="IModule"/> to.</param>
         /// <param name="dependsOn">The names of the <see cref="IModule"/>'s that should be loaded when this <see cref="IModule"/> is loaded.</param>
         /// <returns>The <see cref="IModuleCatalog"/></returns>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, params string[] dependsOn)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, params string[] dependsOn)
             where T : IModule => catalog.AddModule<T>(InitializationMode.WhenAvailable, dependsOn);
 
         /// <summary>
@@ -61,7 +59,7 @@ public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, params st
         /// <param name="name">The name of the <see cref="IModule"/></param>
         /// <param name="dependsOn">The names of the <see cref="IModule"/>'s that should be loaded when this <see cref="IModule"/> is loaded.</param>
         /// <returns>The <see cref="IModuleCatalog"/></returns>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string name, params string[] dependsOn)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, string name, params string[] dependsOn)
             where T : IModule =>
             catalog.AddModule<T>(name, InitializationMode.WhenAvailable, dependsOn);
 
@@ -73,7 +71,7 @@ public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string na
         /// <param name="mode"></param>
         /// <param name="dependsOn">The names of the <see cref="IModule"/>'s that should be loaded when this <see cref="IModule"/> is loaded.</param>
         /// <returns>The <see cref="IModuleCatalog"/></returns>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, InitializationMode mode, params string[] dependsOn)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, InitializationMode mode, params string[] dependsOn)
             where T : IModule =>
             catalog.AddModule<T>(typeof(T).Name, mode, dependsOn);
 
@@ -86,7 +84,7 @@ public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, Initializ
         /// <param name="mode">The <see cref="InitializationMode"/></param>
         /// <param name="dependsOn">The names of the <see cref="IModule"/>'s that should be loaded when this <see cref="IModule"/> is loaded.</param>
         /// <returns>The <see cref="IModuleCatalog"/></returns>
-        public static IModuleCatalog AddModule<T>(this IModuleCatalog catalog, string name, InitializationMode mode, params string[] dependsOn)
+        public static IModuleCatalog AddModule<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IModuleCatalog catalog, string name, InitializationMode mode, params string[] dependsOn)
             where T : IModule
         {
             var moduleInfo = new ModuleInfo(name, typeof(T).AssemblyQualifiedName, dependsOn)

src/Forms/Prism.Forms/Prism.Forms.csproj

@@ -15,6 +15,10 @@ Prism for Xamarin.Forms helps you more easily design and build rich, flexible, a
 
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" />
+    <PackageReference Include="PolySharp">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/Forms/Prism.Forms/PrismApplicationBase.cs

@@ -102,7 +102,7 @@ protected virtual void ConfigureViewModelLocator()
         {
             ViewModelLocationProvider.SetDefaultViewModelFactory((view, type) =>
             {
-                List<(Type Type, object Instance)> overrides = new List<(Type, object)>();
+                List<(Type Type, object Instance)> overrides = [];
                 if (Container.IsRegistered<IResolverOverridesHelper>())
                 {
                     var resolver = Container.Resolve<IResolverOverridesHelper>();
@@ -148,8 +148,6 @@ protected virtual void Initialize()
                 PlatformInitializer?.RegisterTypes(_containerExtension);
                 RegisterTypes(_containerExtension);
 
-                _containerExtension.FinalizeExtension();
-
                 _moduleCatalog = Container.Resolve<IModuleCatalog>();
                 ConfigureModuleCatalog(_moduleCatalog);
             }

src/Maui/Prism.Maui/Ioc/BehaviorFactoryRegistrationExtensions.cs

@@ -1,4 +1,5 @@
-using Prism.Behaviors;
+using System.Diagnostics.CodeAnalysis;
+using Prism.Behaviors;
 
 namespace Prism.Ioc;
 
@@ -31,7 +32,7 @@ public static IContainerRegistry RegisterPageBehaviorFactory(this IContainerRegi
     /// <typeparam name="TBehavior"></typeparam>
     /// <param name="container"></param>
     /// <returns></returns>
-    public static IContainerRegistry RegisterPageBehavior<TBehavior>(this IContainerRegistry container)
+    public static IContainerRegistry RegisterPageBehavior<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TBehavior>(this IContainerRegistry container)
         where TBehavior : Behavior =>
         container
             .Register<TBehavior>()
@@ -44,7 +45,7 @@ public static IContainerRegistry RegisterPageBehavior<TBehavior>(this IContainer
     /// <typeparam name="TBehavior">The type of Behavior</typeparam>
     /// <param name="container"></param>
     /// <returns></returns>
-    public static IContainerRegistry RegisterPageBehavior<TPage, TBehavior>(this IContainerRegistry container)
+    public static IContainerRegistry RegisterPageBehavior<TPage, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TBehavior>(this IContainerRegistry container)
         where TPage : Page
         where TBehavior : Behavior =>
         container
@@ -81,7 +82,7 @@ public static IServiceCollection RegisterPageBehaviorFactory(this IServiceCollec
     /// <typeparam name="TBehavior">The <see cref="Behavior"/> type.</typeparam>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
     /// <returns>The <see cref="IServiceCollection"/>.</returns>
-    public static IServiceCollection RegisterPageBehavior<TBehavior>(this IServiceCollection services)
+    public static IServiceCollection RegisterPageBehavior<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TBehavior>(this IServiceCollection services)
         where TBehavior : Behavior =>
         services
             .AddTransient<TBehavior>()
@@ -94,7 +95,7 @@ public static IServiceCollection RegisterPageBehavior<TBehavior>(this IServiceCo
     /// <typeparam name="TBehavior">The <see cref="Behavior"/> type.</typeparam>
     /// <param name="services">The <see cref="IServiceCollection"/>.</param>
     /// <returns>The <see cref="IServiceCollection"/>.</returns>
-    public static IServiceCollection RegisterPageBehavior<TPage, TBehavior>(this IServiceCollection services)
+    public static IServiceCollection RegisterPageBehavior<TPage, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TBehavior>(this IServiceCollection services)
         where TPage : Page
         where TBehavior : Behavior =>
         services

src/Maui/Prism.Maui/Ioc/DialogRegistrationExtensions.cs

@@ -1,15 +1,16 @@
+using System.Diagnostics.CodeAnalysis;
 using Prism.Dialogs;
 using Prism.Mvvm;
 
 namespace Prism.Ioc;
 
 public static class DialogRegistrationExtensions
 {
-    public static IContainerRegistry RegisterDialog<TView>(this IContainerRegistry containerRegistry, string name = null)
+    public static IContainerRegistry RegisterDialog<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView>(this IContainerRegistry containerRegistry, string name = null)
             where TView : View =>
         containerRegistry.RegisterDialog(typeof(TView), null, name);
 
-    public static IContainerRegistry RegisterDialog<TView, TViewModel>(this IContainerRegistry containerRegistry, string name = null)
+    public static IContainerRegistry RegisterDialog<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TViewModel>(this IContainerRegistry containerRegistry, string name = null)
         where TView : View =>
         containerRegistry.RegisterDialog(typeof(TView), typeof(TViewModel), name);
 
@@ -23,15 +24,15 @@ public static IContainerRegistry RegisterDialog(this IContainerRegistry containe
         return container;
     }
 
-    public static IContainerRegistry RegisterDialogContainer<T>(this IContainerRegistry container)
+    public static IContainerRegistry RegisterDialogContainer<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IContainerRegistry container)
         where T : class, IDialogContainer =>
         container.Register<IDialogContainer, T>();
 
-    public static IServiceCollection RegisterDialog<TView>(this IServiceCollection services, string name = null)
+    public static IServiceCollection RegisterDialog<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView>(this IServiceCollection services, string name = null)
             where TView : View =>
         services.RegisterDialog(typeof(TView), null, name);
 
-    public static IServiceCollection RegisterDialog<TView, TViewModel>(this IServiceCollection services, string name = null)
+    public static IServiceCollection RegisterDialog<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TViewModel>(this IServiceCollection services, string name = null)
         where TView : View =>
         services.RegisterDialog(typeof(TView), typeof(TViewModel), name);
 
@@ -45,14 +46,13 @@ public static IServiceCollection RegisterDialog(this IServiceCollection services
         return services;
     }
 
-    public static IServiceCollection RegisterDialogContainer<T>(this IServiceCollection services)
+    public static IServiceCollection RegisterDialogContainer<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] T>(this IServiceCollection services)
         where T : class, IDialogContainer =>
         services.AddTransient<IDialogContainer, T>();
 
     private static ViewRegistration GetViewRegistration(Type view, Type viewModel, string name)
     {
-        if (view is null)
-            throw new ArgumentNullException(nameof(view));
+        ArgumentNullException.ThrowIfNull(view);
 
         if (!view.IsAssignableTo(typeof(View)))
             throw new InvalidOperationException($"The Dialog '{view.FullName}' must inherit from Microsoft.Maui.Controls.View");

src/Maui/Prism.Maui/Ioc/MicrosoftDependencyInjectionExtensions.cs

@@ -1,4 +1,5 @@
-using Prism.Mvvm;
+using System.Diagnostics.CodeAnalysis;
+using Prism.Mvvm;
 
 namespace Prism.Ioc;
 
@@ -10,11 +11,11 @@ public static class MicrosoftDependencyInjectionExtensions
 #if !UNO_WINUI_PROJECT
     private static readonly Type PageType = typeof(Page);
 
-    public static IServiceCollection RegisterForNavigation<TView>(this IServiceCollection services, string name = null)
+    public static IServiceCollection RegisterForNavigation<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView>(this IServiceCollection services, string name = null)
             where TView : Page =>
             services.RegisterForNavigation(typeof(TView), null, name);
 
-    public static IServiceCollection RegisterForNavigation<TView, TViewModel>(this IServiceCollection services, string name = null)
+    public static IServiceCollection RegisterForNavigation<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TViewModel>(this IServiceCollection services, string name = null)
         where TView : Page =>
         services.RegisterForNavigation(typeof(TView), typeof(TViewModel), name);
 

src/Maui/Prism.Maui/Ioc/NavigationRegistrationExtensions.cs

@@ -1,14 +1,15 @@
-using Prism.Mvvm;
+using System.Diagnostics.CodeAnalysis;
+using Prism.Mvvm;
 
 namespace Prism.Ioc;
 
 public static class NavigationRegistrationExtensions
 {
-    public static IContainerRegistry RegisterForNavigation<TView>(this IContainerRegistry container, string name = null)
+    public static IContainerRegistry RegisterForNavigation<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView>(this IContainerRegistry container, string name = null)
         where TView : Page =>
         container.RegisterForNavigation(typeof(TView), null, name);
 
-    public static IContainerRegistry RegisterForNavigation<TView, TViewModel>(this IContainerRegistry container, string name = null)
+    public static IContainerRegistry RegisterForNavigation<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)] TViewModel>(this IContainerRegistry container, string name = null)
         where TView : Page =>
         container.RegisterForNavigation(typeof(TView), typeof(TViewModel), name);