|
|
@@ -1,7 +1,7 @@
|
|
|
<Project Sdk="Microsoft.NET.Sdk">
|
|
|
|
|
|
<PropertyGroup>
|
|
|
- <TargetFrameworks>netstandard2.0;net472;uap10.0.18362;net6.0;net6.0-windows10.0.19041</TargetFrameworks>
|
|
|
+ <TargetFrameworks>netstandard2.0;net472;uap10.0.18362;net8.0;net8.0-windows10.0.19041</TargetFrameworks>
|
|
|
<Nullable>enable</Nullable>
|
|
|
|
|
|
<DefineConstants>$(DefineConstants);LEGACY_SYSTEM_REACTIVE_FACADE</DefineConstants>
|
|
|
@@ -72,7 +72,7 @@
|
|
|
|
|
|
|
|
|
<!-- WindowsRuntime (netX.0-windows and UWP) -->
|
|
|
- <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
|
|
|
+ <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows'))">
|
|
|
<EmbeddedResource Include="Obsolete\UWP\Strings_PlatformServices.resx" />
|
|
|
<Compile Update="Obsolete\UWP\Strings_PlatformServices.Designer.cs">
|
|
|
<DependentUpon>Obsolete\UWP\Strings_PlatformServices.resx</DependentUpon>
|
|
|
@@ -85,13 +85,13 @@
|
|
|
</ItemGroup>
|
|
|
|
|
|
<!-- Windows Forms and WPF -->
|
|
|
- <ItemGroup Condition="('$(TargetFramework)' == 'net472') or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows'))">
|
|
|
+ <ItemGroup Condition="('$(TargetFramework)' == 'net472') or $(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows'))">
|
|
|
<ProjectReference Include="..\..\src\System.Reactive.For.WindowsForms\System.Reactive.For.WindowsForms.csproj" />
|
|
|
<ProjectReference Include="..\..\src\System.Reactive.For.Wpf\System.Reactive.For.Wpf.csproj" />
|
|
|
</ItemGroup>
|
|
|
|
|
|
<!-- Windows includes for Desktop and UWP -->
|
|
|
- <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
|
|
|
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows'))">
|
|
|
<Compile Include="Obsolete\Windows\**\*.cs" />
|
|
|
<EmbeddedResource Include="Obsolete\Windows\**\*.resx" />
|
|
|
</ItemGroup>
|
|
|
@@ -105,7 +105,7 @@
|
|
|
<Compile Include="Obsolete\Remoting\**\*.cs" />
|
|
|
</ItemGroup>
|
|
|
|
|
|
- <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
|
|
|
+ <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows'))">
|
|
|
<Compile Include="Obsolete\Desktop\**\*.cs" />
|
|
|
</ItemGroup>
|
|
|
|