Skip to content

Commit

Permalink
Fix exception on published package
Browse files Browse the repository at this point in the history
MICROSOFTTTTTTTTTTTTT
this fixes this cursed error caused by Xaml Interactivity in App.xaml L638
```
[Erro]  [XAML_OTHER] System.ArgumentException: Cannot find a property named Microsoft.UI.Xaml.PropertyPath on type Popup.
   at Microsoft.Xaml.Interactions.Core.ChangePropertyAction.ValidateProperty(String targetTypeName, PropertyInfo propertyInfo)
   at Microsoft.Xaml.Interactions.Core.ChangePropertyAction.UpdatePropertyValue(Object targetObject)
   at Microsoft.Xaml.Interactions.Core.ChangePropertyAction.Execute(Object sender, Object parameter)
   at Microsoft.Xaml.Interactivity.Interaction.ExecuteActions(Object sender, ActionCollection actions, Object parameter)
   at Microsoft.Xaml.Interactions.Core.DataTriggerBehavior.OnValueChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args)
   at ABI.Microsoft.UI.Xaml.PropertyChangedCallback.Do_Abi_Invoke(IntPtr thisPtr, IntPtr d, IntPtr e)
--- End of stack trace from previous location ---
   at WinRT.ExceptionHelpers.<ThrowExceptionForHR>g__Throw|39_0(Int32)
   at ABI.Microsoft.UI.Xaml.IFrameworkElementOverridesMethods.MeasureOverride(IObjectReference, Size)
   at Microsoft.UI.Xaml.FrameworkElement.Microsoft.UI.Xaml.IFrameworkElementOverrides.MeasureOverride(Size)
   at ABI.Microsoft.UI.Xaml.IFrameworkElementOverrides.Do_Abi_MeasureOverride_0(IntPtr thisPtr, Size availableSize, Size* result)
```
Also in an attempt to track which assemblies are fine to be trimmed
  • Loading branch information
bagusnl committed Nov 13, 2023
1 parent 849f691 commit bb173c4
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 0 deletions.
67 changes: 67 additions & 0 deletions CollapseLauncher/CollapseLauncher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,78 @@

<Target Name="ConfigureTrimming" BeforeTargets="PrepareForILLink">
<ItemGroup>
<!-- Trimmable submodule assemblies -->
<TrimmableAssembly Include="ColorThief" />
<TrimmableAssembly Include="Hi3Helper.Core" />
<TrimmableAssembly Include="Hi3Helper.EncTool" />
<TrimmableAssembly Include="Hi3Helper.Http" />
<TrimmableAssembly Include="Hi3Helper.SharpHDiffPatch" />
<TrimmableAssembly Include="SevenZipExtractor" />

<!-- Additional assemblies -->
<TrimmableAssembly Include="ColorCode.Core" />
<TrimmableAssembly Include="ColorCode.WinUI" />
<TrimmableAssembly Include="CommunityToolkit.Common" />
<TrimmableAssembly Include="CommunityToolkit.Mvvm" />
<TrimmableAssembly Include="CommunityToolkit.WinUI.Animations" />
<TrimmableAssembly Include="CommunityToolkit.WinUI.Controls.Primitives" />
<TrimmableAssembly Include="CommunityToolkit.WinUI.Media" />
<TrimmableAssembly Include="CommunityToolkit.WinUI.UI.Controls.Primitives" />
<TrimmableAssembly Include="Google.Protobuf" />
<TrimmableAssembly Include="H.GeneratedIcons.System.Drawing" />
<TrimmableAssembly Include="H.NotifyIcon" />
<TrimmableAssembly Include="H.NotifyIcon.WinUI" />
<TrimmableAssembly Include="Microsoft.DirectManipulation" />
<TrimmableAssembly Include="Microsoft.Graphics.Canvas" />
<TrimmableAssembly Include="Microsoft.Graphics.Canvas.Interop" />
<TrimmableAssembly Include="Microsoft.Graphics.Display" />
<TrimmableAssembly Include="Microsoft.InputStateManager" />
<TrimmableAssembly Include="Microsoft.InteractiveExperiences.Projection" />
<TrimmableAssembly Include="Microsoft.Internal.FrameworkUdk" />
<TrimmableAssembly Include="Microsoft.UI.Composition.OSSupport" />
<TrimmableAssembly Include="Microsoft.UI" />
<TrimmableAssembly Include="Microsoft.UI.Windowing.Core" />
<TrimmableAssembly Include="Microsoft.UI.Windowing" />
<TrimmableAssembly Include="Microsoft.Web.WebView2.Core" />
<TrimmableAssembly Include="Microsoft.Windows.Widgets" />
<TrimmableAssembly Include="Microsoft.WindowsAppRuntime.Bootstrap" />
<TrimmableAssembly Include="Microsoft.WindowsAppRuntime" />
<TrimmableAssembly Include="PhotoSauce.MagicScaler" />
<TrimmableAssembly Include="System.CommandLine" />
<TrimmableAssembly Include="System.Drawing.Common" />
<TrimmableAssembly Include="WinUIEdit" />

<!-- Explicitly tell ILTrimmer to not trim these assemblies (all assemblies that gives ILTrim warnings -->
<TrimmerRootAssembly Include="Microsoft.WinUI" />

<!--
<TrimmerRootAssembly Include="CommunityToolkit.WinUI" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.Extensions" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.Core" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.Input" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.Layout" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
<TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.Media" />
<TrimmerRootAssembly Include="ImageEx" />
<TrimmerRootAssembly Include="Microsoft.Windows.AppLifecycle.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.AppNotifications.Builder.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.AppNotifications.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.ApplicationModel.DynamicDependency.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.ApplicationModel.Resources.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.ApplicationModel.WindowsAppRuntime.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.PushNotifications.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.SDK.NET" />
<TrimmerRootAssembly Include="Microsoft.Windows.Security.AccessControl.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.System.Power.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.System.Projection" />
<TrimmerRootAssembly Include="Microsoft.Windows.Widgets.Providers.Projection" />
<TrimmerRootAssembly Include="SquirrelLib" />
<TrimmerRootAssembly Include="System.CommandLine.NamingConventionBinder" />
<TrimmerRootAssembly Include="WinRT.Runtime" />
-->
</ItemGroup>
</Target>

Expand Down
6 changes: 6 additions & 0 deletions CollapseLauncher/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
"Microsoft.WindowsAppSDK": "1.4.230913002"
}
},
"Microsoft.NET.ILLink.Tasks": {
"type": "Direct",
"requested": "[8.0.0-rc.2.23479.6, )",
"resolved": "8.0.0-rc.2.23479.6",
"contentHash": "neRDuxVI/tdf5yz/rLyD1kP3DkWx8uHTvb1wcqbjDn4QQDHmYHwcuHBnVVPYtBzMFmlVNmJMa91weUEhHx2z5A=="
},
"Microsoft.NETCore.Platforms": {
"type": "Direct",
"requested": "[8.0.0-preview.7.23375.6, )",
Expand Down

0 comments on commit bb173c4

Please sign in to comment.