Skip to content

fix: make view WhenActivated trim and AOT safe; build without runtime-async #4532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glennawatson merged 1 commit into from
Oct 3, 2026
Merged

fix: make view WhenActivated trim and AOT safe; build without runtime-async #4532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net11.0'))">
<Features>$(Features);runtime-async=on</Features>
</PropertyGroup>
<!-- Alias Lock to the dedicated System.Threading.Lock on .NET 9+ (faster EnterScope fast path),
and to a plain object elsewhere (the lock statement falls back to Monitor). -->
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
Expand Down
6 changes: 3 additions & 3 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<PropertyGroup Label="Shared Version Variables">
<SplatVersion>21.0.0</SplatVersion>
<PrimitivesVersion>8.4.0</PrimitivesVersion>
<BindingVersion>8.8.0</BindingVersion>
<TUnitVersion>1.69.16</TUnitVersion>
<BindingVersion>9.0.0</BindingVersion>
<TUnitVersion>1.72.16</TUnitVersion>
<!-- StyleSharp.Analyzers, PerformanceSharp.Analyzers and SecuritySharp.Analyzers ship from the
same release pipeline and always share a version. -->
<RoslynCommonAnalyzersVersion>5.1.2</RoslynCommonAnalyzersVersion>
Expand Down Expand Up @@ -102,7 +102,7 @@
<PackageVersion Include="PerformanceSharp.Analyzers" Version="$(RoslynCommonAnalyzersVersion)"/>
<PackageVersion Include="SecuritySharp.Analyzers" Version="$(RoslynCommonAnalyzersVersion)"/>
<PackageVersion Include="Roslynator.Analyzers" Version="5.0.0"/>
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.34.0.3385"/>
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.35.0.4138"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.9.0"/>
<PackageVersion Include="PublicApiSharp.Analyzers" Version="2.1.0"/>
Expand Down
121 changes: 55 additions & 66 deletions src/ReactiveUI.Shared/Activation/ViewForMixins.cs
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net10.0-windows/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net10.0-windows10.0.19041.0/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net11.0-windows/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net11.0-windows10.0.19041.0/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net8.0-windows/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net8.0-windows10.0.19041.0/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
7 changes: 0 additions & 7 deletions src/ReactiveUI.Wpf.Reactive/PublicAPI/net9.0-windows/PublicAPI.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,13 @@ namespace ReactiveUI.Reactive
extension<TView>(TView item) where TView : System.Windows.FrameworkElement, ReactiveUI.Binding.Reactive.IActivatableView
{
public bool GetIsDesignMode() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated() { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<ReactiveUI.Primitives.Reactive.Disposables.ContainerDisposable> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Action<System.Action<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor view) { }
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Evaluates expression-based member chains via reflection; members may be trimmed.")]
public System.IDisposable WhenActivated(System.Func<System.Collections.Generic.IEnumerable<System.IDisposable>> block, ReactiveUI.Binding.Reactive.IViewFor? view) { }
}
}
Expand Down
Loading
Loading