Skip to content

Commit 1b13eef

Browse files
committed
chore: Add windows net8 targets
1 parent 944f1b8 commit 1b13eef

File tree

5 files changed

+18
-3
lines changed

5 files changed

+18
-3
lines changed

src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<!-- Platform-specific targets - always defined but only used on supported platforms -->
4747
<ReactiveUIFrameworkTargets Condition="$([MSBuild]::IsOsPlatform('Windows'))">net462;net472</ReactiveUIFrameworkTargets>
4848
<ReactiveUIMauiWindowsTargets>net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIMauiWindowsTargets>
49-
<ReactiveUIWindowsTargets>net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIWindowsTargets>
50-
<ReactiveUIWinUITargets>net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIWinUITargets>
49+
<ReactiveUIWindowsTargets>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIWindowsTargets>
50+
<ReactiveUIWinUITargets>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</ReactiveUIWinUITargets>
5151
<ReactiveUIAppleTargets>net9.0-ios;net9.0-tvos;net9.0-macos;net9.0-maccatalyst;net10.0-ios;net10.0-tvos;net10.0-macos;net10.0-maccatalyst</ReactiveUIAppleTargets>
5252
<ReactiveUIAndroidTargets>net9.0-android;net10.0-android</ReactiveUIAndroidTargets>
5353

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<PropertyGroup>
7-
<SplatVersion>17.0.1</SplatVersion>
7+
<SplatVersion>17.1.1</SplatVersion>
88
<XamarinAndroidXCoreVersion>1.17.0</XamarinAndroidXCoreVersion>
99
<XamarinAndroidXLifecycleLiveDataVersion>2.9.2.1</XamarinAndroidXLifecycleLiveDataVersion>
1010
<MauiVersion Condition="$(TargetFramework.StartsWith('net10'))">10.0.0-rc.1.25452.6</MauiVersion>

src/ReactiveUI/Builder/IReactiveUIBuilder.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ IReactiveUIBuilder WithPlatformModule<T>()
116116
/// Withes the platform services.
117117
/// </summary>
118118
/// <returns>The builder instance for chaining.</returns>
119+
#if NET6_0_OR_GREATER
120+
[RequiresUnreferencedCode("ProcessRegistrationForNamespace uses reflection to locate types which may be trimmed.")]
121+
[RequiresDynamicCode("Calls ReactiveUI.IWantsToRegisterStuff.Register(Action<Func<Object>, Type>)")]
122+
#endif
119123
IReactiveUIBuilder WithPlatformServices();
120124

121125
/// <summary>

src/ReactiveUI/Builder/ReactiveUIBuilder.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ public IReactiveUIBuilder WithRegistration(Action<IMutableDependencyResolver> co
104104
/// Registers the platform-specific ReactiveUI services.
105105
/// </summary>
106106
/// <returns>The builder instance for method chaining.</returns>
107+
#if NET6_0_OR_GREATER
108+
[RequiresUnreferencedCode("ProcessRegistrationForNamespace uses reflection to locate types which may be trimmed.")]
109+
[RequiresDynamicCode("Calls ReactiveUI.IWantsToRegisterStuff.Register(Action<Func<Object>, Type>)")]
110+
#endif
107111
public IReactiveUIBuilder WithPlatformServices()
108112
{
109113
if (_platformRegistered)
@@ -122,6 +126,12 @@ public IReactiveUIBuilder WithPlatformServices()
122126
/// Registers the core ReactiveUI services in an AOT-compatible manner.
123127
/// </summary>
124128
/// <returns>The builder instance for chaining.</returns>
129+
#if NET6_0_OR_GREATER
130+
[RequiresUnreferencedCode("ProcessRegistrationForNamespace uses reflection to locate types which may be trimmed.")]
131+
[RequiresDynamicCode("Calls ReactiveUI.IWantsToRegisterStuff.Register(Action<Func<Object>, Type>)")]
132+
[SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "In Splat")]
133+
[SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "In Splat")]
134+
#endif
125135
public override IAppBuilder WithCoreServices()
126136
{
127137
if (!_coreRegistered)

src/ReactiveUI/Mixins/DependencyResolverMixins.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ private static Func<object> TypeFactory(
157157

158158
#if NET6_0_OR_GREATER
159159
[RequiresUnreferencedCode("ProcessRegistrationForNamespace uses reflection to locate types which may be trimmed.")]
160+
[RequiresDynamicCode("Calls ReactiveUI.IWantsToRegisterStuff.Register(Action<Func<Object>, Type>)")]
160161
#endif
161162
private static void ProcessRegistrationForNamespace(string namespaceName, AssemblyName assemblyName, IMutableDependencyResolver resolver)
162163
{

0 commit comments

Comments
 (0)