From d0a4bc0700ab212feae3d352e6d9b0948bada275 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Fri, 3 Mar 2023 18:59:30 +0000
Subject: [PATCH 1/6] Upgrade to supported TFMs and SDK versions

Remove dependency on System.Runtime.InteropServices.WindowsRuntime in netstandard2.0 - this wouldn't work right on net6.0 or later because they use C#/WinRT for interop
---
 Rx.NET/Source/Directory.build.props           |   4 ++
 Rx.NET/Source/Directory.build.targets         |  14 +----
 .../Microsoft.Reactive.Testing.csproj         |   2 +-
 .../System.Reactive.Observable.Aliases.csproj |   2 +-
 .../Internal/ReflectionUtils.cs               |  47 ++++++++++++---
 .../Linq/Observable/FromEventPattern.cs       |  10 ---
 .../System.Reactive/System.Reactive.csproj    |  57 +++---------------
 .../System.Reactive.net5.0-windows.targets    |   9 ---
 .../build/System.Reactive.targets             |  12 ----
 .../Package.appxmanifest                      |   4 +-
 ...ts.System.Reactive.Uwp.DeviceRunner.csproj |  29 ++++++---
 ...Reactive.Uwp.DeviceRunner_TemporaryKey.pfx | Bin 2504 -> 2512 bytes
 .../DispatcherHelpers.cs                      |   2 +-
 .../Tests.System.Reactive.csproj              |   4 +-
 azure-pipelines.rx.yml                        |  33 +++-------
 15 files changed, 92 insertions(+), 137 deletions(-)
 delete mode 100644 Rx.NET/Source/src/System.Reactive/build/System.Reactive.net5.0-windows.targets
 delete mode 100644 Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets

diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props
index 364b42e2..2e16b5d1 100644
--- a/Rx.NET/Source/Directory.build.props
+++ b/Rx.NET/Source/Directory.build.props
@@ -20,6 +20,10 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <LangVersion>latest</LangVersion>
+
+    <!-- Get diagnostics back to the level that the .NET 5.0 SDK had for now. Fix these properly before release. -->
+    <AnalysisLevel>5-Default</AnalysisLevel>
+    <NoWarn>$(NoWarn);CS8600;CS8602;CS8603;CS8604;CS8632;CA1000;CA1003;CA1014;CA1019;CA1033;CA1045;CA1051;CA1052;CA1063;CA1067;CA1068;CA1507;CA1707;CA1711;CA1716;CA1720;CA1806;CA1815;CA1816;CA1822;CA1825;CA1840;CA1845;CA2016;CA2109;CA2201;CA2211;CA2213;CA2249;IDE0003;IDE0016;IDE0017;IDE0018;IDE0019;IDE0020;IDE0031;IDE0032;IDE0034;IDE0037;IDE0038;IDE0039;IDE0040;IDE0044;IDE0051;IDE0052;IDE0056;IDE0057;IDE0059;IDE0060;IDE0062;IDE0063;IDE0071;IDE0074;IDE0075;IDE0076;IDE0077;IDE0079;IDE0083;IDE0090;IDE0180;IDE0270;IDE0280;IDE1006;IDE1056</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets
index 6b2ec3af..4cb6ebee 100644
--- a/Rx.NET/Source/Directory.build.targets
+++ b/Rx.NET/Source/Directory.build.targets
@@ -9,26 +9,18 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
     <DefineConstants>$(DefineConstants);HAS_WINFORMS;HAS_WPF;HAS_WINRT;HAS_DISPATCHER;HAS_REMOTING;DESKTOPCLR;NO_NULLABLE_ATTRIBUTES</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
-    <DefineConstants>$(DefineConstants);HAS_WINRT;NO_CODE_COVERAGE_ATTRIBUTE;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;NO_TRACE;WINDOWS;NO_NULLABLE_ATTRIBUTES</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
     <DefineConstants>$(DefineConstants);HAS_WINRT;WINDOWS;HAS_OS_XAML;LEGACY_WINRT;NO_NULLABLE_ATTRIBUTES</DefineConstants>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <DefineConstants>$(DefineConstants);HAS_WINRT;NO_NULLABLE_ATTRIBUTES</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net5.0-windows'))">
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
     <DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
 
diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj
index dc14fc86..4c22d608 100644
--- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj
+++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net472;uap10.0.16299;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net6.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <Description>Reactive Extensions Testing Library containing interfaces and classes providing functionality to test applications and libraries built using Reactive Extensions.</Description>    
     <AssemblyTitle>Microsoft.Reactive.Testing - Testing Helper Library</AssemblyTitle>    
diff --git a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
index 30ac64cf..8a0ff302 100644
--- a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
+++ b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net5.0</TargetFrameworks>    
+    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net6.0</TargetFrameworks>
     <Title>Reactive Extensions - Aliases</Title>    
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>    
     <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
diff --git a/Rx.NET/Source/src/System.Reactive/Internal/ReflectionUtils.cs b/Rx.NET/Source/src/System.Reactive/Internal/ReflectionUtils.cs
index a98ac7b4..d913ead5 100644
--- a/Rx.NET/Source/src/System.Reactive/Internal/ReflectionUtils.cs
+++ b/Rx.NET/Source/src/System.Reactive/Internal/ReflectionUtils.cs
@@ -5,10 +5,6 @@
 using System.Globalization;
 using System.Reflection;
 
-#if HAS_WINRT
-using System.Runtime.InteropServices.WindowsRuntime;
-#endif
-
 namespace System.Reactive
 {
     internal static class ReflectionUtils
@@ -76,18 +72,16 @@ namespace System.Reactive
 
             isWinRT = false;
 
-#if HAS_WINRT && !CSWINRT
-            if (addMethod.ReturnType == typeof(EventRegistrationToken))
+            if (IsWinRTEventRegistrationTokenType(addMethod.ReturnType))
             {
                 isWinRT = true;
 
                 var pet = psr[0];
-                if (pet.ParameterType != typeof(EventRegistrationToken))
+                if (IsWinRTEventRegistrationTokenType(pet.ParameterType))
                 {
                     throw new InvalidOperationException(Strings_Linq.EVENT_WINRT_REMOVE_METHOD_SHOULD_TAKE_ERT);
                 }
             }
-#endif
 
             delegateType = psa[0].ParameterType;
 
@@ -119,5 +113,42 @@ namespace System.Reactive
 #if (CRIPPLED_REFLECTION && HAS_WINRT)
         public static MethodInfo GetMethod(this Type type, string name) => type.GetTypeInfo().GetDeclaredMethod(name);
 #endif
+
+        /// <summary>
+        /// Determine whether a type represents a WinRT event registration token
+        /// (https://learn.microsoft.com/en-us/uwp/api/windows.foundation.eventregistrationtoken).
+        /// </summary>
+        /// <param name="t">The type to check.</param>
+        /// <returns>True if this represents a WinRT event registration token</returns>
+        /// <remarks>
+        /// <para>
+        /// We used to perform a simple comparison with typeof(EventRegistrationToken), but the
+        /// introduction of C#/WinRT has made this problematic. Before C#/WinRT, the .NET
+        /// projection of WinRT's Windows.Foundation.EventRegistrationToken type was
+        /// System.Runtime.InteropServices.WindowsRuntime.EventRegistrationToken. But that type is
+        /// associated with the old WinRT interop mechanisms in which the CLR works directly with
+        /// WinMD. That was how it worked up as far as .NET Core 3.1, and it's still how .NET
+        /// Framework works, but this direct WinMD support was removed in .NET 5.0.
+        /// </para>
+        /// <para>
+        /// If you're on .NET 5.0 or later, the System.Runtime.InteropServices.WindowsRuntime types
+        /// are no longer supported. While you can still get access to them through the NuGet
+        /// package of the same name (that's how .NET Standard 2.0 libraries are able to use these
+        /// types) they are best avoided, because the types in that library are no longer the types
+        /// you see when any of the WinRT types they are meant to represent are projected into the
+        /// CLR's world.
+        /// </para>
+        /// <para>
+        /// It was therefore necessary for Rx to stop using these types, and to drop its reference
+        /// to the System.Runtime.InteropServices.WindowsRuntime package. We can replicate the
+        /// same logic by looking for the type name. By checking for either the old or new
+        /// namespaces, we can support both the old projection (still used on .NET Framework) and
+        /// also the new C#/WinRT projection.
+        /// </para>
+        /// </remarks>
+        private static bool IsWinRTEventRegistrationTokenType(Type t) =>
+            t.Name == "EventRegistrationToken" &&
+            (t.Namespace == "System.Runtime.InteropServices.WindowsRuntime" ||
+             t.Namespace == "WinRT");
     }
 }
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEventPattern.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEventPattern.cs
index 16ee7bb9..f5b6110a 100644
--- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEventPattern.cs
+++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEventPattern.cs
@@ -69,18 +69,12 @@ namespace System.Reactive.Linq.ObservableImpl
             private readonly MethodInfo _addMethod;
             private readonly MethodInfo _removeMethod;
             private readonly Func<TSender, TEventArgs, TResult> _getResult;
-#if HAS_WINRT
             private readonly bool _isWinRT;
-#endif
 
             public Handler(object? target, Type delegateType, MethodInfo addMethod, MethodInfo removeMethod, Func<TSender, TEventArgs, TResult> getResult, bool isWinRT, IScheduler scheduler)
                 : base(scheduler)
             {
-#if HAS_WINRT
                 _isWinRT = isWinRT;
-#else
-                System.Diagnostics.Debug.Assert(!isWinRT);
-#endif
                 _target = target;
                 _delegateType = delegateType;
                 _addMethod = addMethod;
@@ -100,13 +94,11 @@ namespace System.Reactive.Linq.ObservableImpl
 
                 try
                 {
-#if HAS_WINRT
                     if (_isWinRT)
                     {
                         removeHandler = AddHandlerCoreWinRT(handler);
                     }
                     else
-#endif
                     {
                         removeHandler = AddHandlerCore(handler);
                     }
@@ -147,13 +139,11 @@ namespace System.Reactive.Linq.ObservableImpl
                 return () => _removeMethod.Invoke(_target, new object[] { handler });
             }
 
-#if HAS_WINRT
             private Action AddHandlerCoreWinRT(Delegate handler)
             {
                 var token = _addMethod.Invoke(_target, new object[] { handler });
                 return () => _removeMethod.Invoke(_target, new[] { token });
             }
-#endif
         }
     }
 }
diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
index dac82bde..6d98592b 100644
--- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
+++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netstandard2.0;net472;uap10.0.16299;net5.0;net5.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net6.0;net6.0-windows10.0.19041</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
     <Description>Reactive Extensions (Rx) for .NET</Description>
@@ -10,16 +10,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or $(TargetFramework.StartsWith('net5.0-windows'))">
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
-    <IncludeBuildOutput Condition="'$(TargetFramework)' == 'netcoreapp3.1'">false</IncludeBuildOutput>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <FrameworkReference Update="Microsoft.WindowsDesktop.App" PrivateAssets="all" />
-  </ItemGroup>
-
 
   <ItemGroup>
     <Compile Remove="Platforms\**\*.*" />
@@ -36,23 +31,13 @@
   </ItemGroup>
 
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
-  </ItemGroup>
-
   <!-- UWP -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="System.ComponentModel" Version="4.3.0" />
-    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net5.0-windows'))">
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
     <Compile Include="Platforms\UWP\**\*.cs" />
   </ItemGroup>
 
   <!-- Windows includes for Desktop and UWP -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('uap10.0')) or '$(TargetFramework)' == 'netcoreapp3.1' or $(TargetFramework.StartsWith('net5.0-windows'))">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('uap10.0')) or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
     <Compile Include="Platforms\Windows\**\*.cs" />
     <EmbeddedResource Include="Platforms\Windows\**\*.resx" />
   </ItemGroup>
@@ -64,7 +49,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'netcoreapp3.1' or $(TargetFramework.StartsWith('net5.0-windows'))">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
     <Compile Include="Platforms\Desktop\**\*.cs" />
   </ItemGroup>
 
@@ -159,36 +144,10 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);RemoveNetCoreApp3FromNuGet</TargetsForTfmSpecificBuildOutput>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddNetCore3ToNuGet</TargetsForTfmSpecificContentInPackage>
-  </PropertyGroup>
-
-  <!-- We remove the output from the nuget so it doesn't wind up in the \lib folder -->
-  <Target Name="RemoveNetCoreApp3FromNuGet" DependsOnTargets="BuiltProjectOutputGroup;DocumentationProjectOutputGroup" Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <ItemGroup>
-      <!-- Before clearing the output groups, add them to None for packing -->
-      <ItemsToAddToNuGet Include="@(BuiltProjectOutputGroupOutput);@(DocumentationProjectOutputGroupOutput)" PackagePath="build\netcoreapp3.1" />
-
-      <BuiltProjectOutputGroupOutput Remove="@(BuiltProjectOutputGroupOutput)" />
-      <DocumentationProjectOutputGroupOutput Remove="@(DocumentationProjectOutputGroupOutput)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="AddNetCore3ToNuGet" Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <ItemGroup>
-      <!-- Add the removed build output to the build\netcoreapp3.0 folder -->
-      <TfmSpecificPackageFileWithRecursiveDir Include="@(ItemsToAddToNuGet)" PackagePath="build\netcoreapp3.1" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
-    <None Include="build\_._" PackagePath="lib\netcoreapp3.1" Pack="true" />
-    <None Include="build\_._" PackagePath="build\net5.0;build\net5.0-windows10.0.19041" Pack="true" />
-    <None Include="build\_._" PackagePath="buildTransitive\net5.0;buildTransitive\net5.0-windows10.0.19041" Pack="true" />
-    <None Include="build\System.Reactive.targets" PackagePath="buildTransitive\netcoreapp3.1" Pack="true" />
-    <None Include="build\System.Reactive.targets" PackagePath="build\netcoreapp3.1" Pack="true" />
-	<None Include="build\System.Reactive.net5.0-windows.targets" PackagePath="build\net5.0-windows7\$(PackageId).targets;buildTransitive\net5.0-windows7\$(PackageId).targets" Pack="true" />
+    <None Include="build\_._" PackagePath="build\net6.0;build\net6.0-windows10.0.19041" Pack="true" />
+    <None Include="build\_._" PackagePath="buildTransitive\net6.0;buildTransitive\net6.0-windows10.0.19041" Pack="true" />
+    <None Include="build\System.Reactive.net6.0-windows.targets" PackagePath="build\net6.0-windows7\$(PackageId).targets;buildTransitive\net6.0-windows7\$(PackageId).targets" Pack="true" />
     <None Include="Linq\QbservableEx.NAry.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net5.0-windows.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net5.0-windows.targets
deleted file mode 100644
index b3e5a9dc..00000000
--- a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net5.0-windows.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   
-  <Target Name="_RXNETWindowsTFMCheck" BeforeTargets="ResolveAssemblyReferences;Build;Rebuild">
-    <Error 
-        Text = "The 'System.Reactive' nuget package cannot be used to target '$(TargetFramework)'. Target 'net5.0-windows10.0.19041' or later instead." />
-  </Target>
-  
-</Project>
diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets
deleted file mode 100644
index 2452a8e5..00000000
--- a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.targets
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <UseWindowsRxVersion Condition="'$(UseWpf)' == 'true' OR '$(UseWindowsForms)' == 'true'" >true</UseWindowsRxVersion>
-    <UseWindowsRxVersion Condition="'$(UseWindowsRxVersion)' == '' " >false</UseWindowsRxVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Condition="'$(UseWindowsRxVersion)' == 'true' "  Include="$(MSBuildThisFileDirectory)..\..\build\netcoreapp3.1\System.Reactive.dll" />
-    <Reference Condition="'$(UseWindowsRxVersion)' != 'true' "  Include="$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\System.Reactive.dll" />
-
-    <FrameworkReference Include="Microsoft.WindowsDesktop.App" Condition="'$(UseWindowsRxVersion)' == 'true' and !@(FrameworkReference->AnyHaveMetadataValue('Identity', 'Microsoft.WindowsDesktop.App'))" />
-  </ItemGroup>
-</Project>
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Package.appxmanifest b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Package.appxmanifest
index 98821d77..feaffe20 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Package.appxmanifest
+++ b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Package.appxmanifest
@@ -8,14 +8,14 @@
 
   <Identity
     Name="ce55b747-4cb1-4fd7-b7f8-9f9e55115229"
-    Publisher="CN=oren"
+    Publisher="CN=ian"
     Version="1.0.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="ce55b747-4cb1-4fd7-b7f8-9f9e55115229" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>Tests.System.Reactive.Uwp.DeviceRunner</DisplayName>
-    <PublisherDisplayName>oren</PublisherDisplayName>
+    <PublisherDisplayName>ian</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
 
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj
index cdddd895..958a2f07 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj
+++ b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,19 +11,21 @@
     <AssemblyName>Tests.System.Reactive.Uwp.DeviceRunner</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>17</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
     <PackageCertificateKeyFile>Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>2BD466C3AB205824BF42514FF6A6F268A0B60966</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>8570A5641EDE61A2AB21E12809E9E0376A041E8C</PackageCertificateThumbprint>
     <SignAssembly>false</SignAssembly>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;HAS_APTCA;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;WINDOWS;USE_TIMER_SELF_ROOT</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;HAS_APTCA;HAS_TPL46;NO_REMOTING;NO_THREAD;WINDOWS;USE_TIMER_SELF_ROOT</DefineConstants>
     <NoWarn>;2008;0618</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -33,7 +35,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;HAS_APTCA;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;WINDOWS;USE_TIMER_SELF_ROOT</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;HAS_APTCA;HAS_TPL46;NO_REMOTING;NO_THREAD;WINDOWS;USE_TIMER_SELF_ROOT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008;0618</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -89,6 +91,9 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);IDE0003;IDE0016;IDE0017;IDE0018;IDE0019;IDE0020;IDE0031;IDE0032;IDE0034;IDE0037;IDE0038;IDE0039;IDE0040;IDE0044;IDE0051;IDE0052;IDE0056;IDE0057;IDE0059;IDE0060;IDE0062;IDE0063;IDE0071;IDE0074;IDE0075;IDE0076;IDE0077;IDE0079;IDE0083;IDE0090;IDE0180;IDE1006;IDE1056</NoWarn>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
     <PackageReference Include="xunit" Version="2.4.1" />
@@ -160,6 +165,16 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\..\ReactiveX.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <!--
+      The Coverlet targets will be imported as part of the Import after this PropertyGroup, and
+      they seem to presume that the NETCoreSdkVersion property will have been set. It does not
+      appear to get set for old-style projects such as we are required to use for UWP projects
+      so we need to set it ourselves.
+      Note that it doesn't seem to be critical that this exactly matches the SDK version in use.
+    -->
+    <NETCoreSdkVersion>7.0.103</NETCoreSdkVersion>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx b/Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx
index ed4b64ba13a27a7405ec39051a36debdb4f70472..a4c63c9046e6dc55f5681485bda03d4a1904d5d4 100644
GIT binary patch
delta 2326
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

delta 2318
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

diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/DispatcherHelpers.cs b/Rx.NET/Source/tests/Tests.System.Reactive/DispatcherHelpers.cs
index 3d94336c..4b95635c 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive/DispatcherHelpers.cs
+++ b/Rx.NET/Source/tests/Tests.System.Reactive/DispatcherHelpers.cs
@@ -4,7 +4,7 @@
 
 using System.Reactive.Disposables;
 
-#if NETCOREAPP2_1 || NET472 || NETCOREAPP3_1 || CSWINRT
+#if NET472 || CSWINRT
 using System.Threading;
 #endif
 #if HAS_DISPATCHER
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
index 565d4a20..c4e6ca65 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
+++ b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net472;netcoreapp2.1;net5.0;net5.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0;net7.0;net6.0-windows10.0.19041</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net472'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index 36ccd541..270f5746 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -33,10 +33,9 @@ stages:
 
     steps:
     - task: UseDotNet@2
-      displayName: Use .NET Core 5.0.x SDK
+      displayName: Use .NET Core 7.0.x SDK
       inputs:
-        version: 5.0.x
-        includePreviewVersions: true
+        version: 7.0.x
         performMultiLevelLookup: true
 
     - task: DotNetCoreCLI@2
@@ -120,17 +119,11 @@ stages:
     steps:
     - task: UseDotNet@2
       inputs:
-        version: 5.0.x
-        includePreviewVersions: true
+        version: 7.0.x
 
     - task: UseDotNet@2
       inputs:
-        version: '3.1.x'
-        packageType: runtime
-
-    - task: UseDotNet@2
-      inputs:
-        version: '2.2.x'
+        version: '6.0.x'
         packageType: runtime
 
     - task: DotNetCoreCLI@2
@@ -161,22 +154,15 @@ stages:
       inputs:
         command: test
         projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-        arguments: -c $(BuildConfiguration) -f net5.0 --filter "SkipCI!=true"
-      displayName: Run 5.0 Tests on Linux
+        arguments: -c $(BuildConfiguration) -f net7.0 --filter "SkipCI!=true"
+      displayName: Run 7.0 Tests on Linux
 
     - task: DotNetCoreCLI@2
       inputs:
         command: test
         projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-        arguments: -c $(BuildConfiguration) -f netcoreapp3.1 --filter "SkipCI!=true"
-      displayName: Run 3.1 Tests on Linux
-
-    - task: DotNetCoreCLI@2
-      inputs:
-        command: test
-        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-        arguments: -c $(BuildConfiguration) -f netcoreapp2.1 --filter "SkipCI!=true" 
-      displayName: Run 2.1 Tests on Linux
+        arguments: -c $(BuildConfiguration) -f net6.0 --filter "SkipCI!=true"
+      displayName: Run 6.0 Tests on Linux
 
   - job: WindowsDesktop    
     pool:
@@ -190,8 +176,7 @@ stages:
     steps:
     - task: UseDotNet@2
       inputs:
-        version: 5.0.x
-        includePreviewVersions: true
+        version: 7.0.x
         performMultiLevelLookup: true
 
     - task: DotNetCoreCLI@2

From 8b1ae3f7d5e2af6ff375a02de5d02a87699e6329 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Sat, 4 Mar 2023 09:55:50 +0000
Subject: [PATCH 2/6] Change build agent pool to windows-latest

---
 azure-pipelines.rx.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index 270f5746..1512e241 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -24,7 +24,7 @@ stages:
 - stage: Build
   jobs:
   - job: Build
-    pool: vs2019-preview
+    pool: windows-latest
 
     variables:
       BuildConfiguration: Release

From 2841dd972142dd43f0028bd4aeb503a0333b3cf0 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Sat, 4 Mar 2023 10:10:15 +0000
Subject: [PATCH 3/6] Put pipeline VM image name under correct property

---
 azure-pipelines.rx.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index 1512e241..69dc7c8a 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -24,7 +24,8 @@ stages:
 - stage: Build
   jobs:
   - job: Build
-    pool: windows-latest
+    pool:
+      vmImage: windows-latest
 
     variables:
       BuildConfiguration: Release

From 7da058d060192f5c42ad74a8c33e073ad9ba6fd2 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Sat, 4 Mar 2023 10:27:44 +0000
Subject: [PATCH 4/6] Add missing file from System.Reactive/build

---
 .../build/System.Reactive.net6.0-windows.targets         | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Rx.NET/Source/src/System.Reactive/build/System.Reactive.net6.0-windows.targets

diff --git a/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net6.0-windows.targets b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net6.0-windows.targets
new file mode 100644
index 00000000..f8dce4a3
--- /dev/null
+++ b/Rx.NET/Source/src/System.Reactive/build/System.Reactive.net6.0-windows.targets
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+   
+  <Target Name="_RXNETWindowsTFMCheck" BeforeTargets="ResolveAssemblyReferences;Build;Rebuild">
+    <Error 
+        Text = "The 'System.Reactive' nuget package cannot be used to target '$(TargetFramework)'. Target 'net6.0-windows10.0.19041' or later instead." />
+  </Target>
+  
+</Project>

From cc634d5ba28eb03ea5a8ee562d33da3e6c69d354 Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Sat, 4 Mar 2023 10:52:00 +0000
Subject: [PATCH 5/6] Set net6.0 and net7.0 TFMs in integration tests

---
 Rx.NET/Integration/LinuxTests/LinuxTests.csproj       |  6 +++---
 .../WindowsDesktopTests/WindowsDesktopTests.csproj    | 11 +++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
index 585b989f..a898655e 100644
--- a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+++ b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
     <LangVersion>latest</LangVersion>
     <AssemblyName>Tests.System.Reactive</AssemblyName>
@@ -9,10 +9,10 @@
     <AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.1'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <DefineConstants>$(DefineConstants);</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' ">
     <DefineConstants>$(DefineConstants);LINUX</DefineConstants>
   </PropertyGroup>
 
diff --git a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
index 3cab48ab..60e8782a 100644
--- a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+++ b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net5.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>net6.0;net6.0-windows10.0.19041;net7.0;net7.0-windows10.0.19041</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
     <LangVersion>latest</LangVersion>
     <AssemblyName>Tests.System.Reactive</AssemblyName>
@@ -9,13 +9,8 @@
     <AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <UseWPF >true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
-    <DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net5.0-windows'))">
-    <UseWPF >true</UseWPF>
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows'))">
+    <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
   </PropertyGroup>

From fd5b65ff89114068f77932e6e16195a900fa939c Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Mon, 6 Mar 2023 06:32:32 +0000
Subject: [PATCH 6/6] Change uap10.0.16299 to uap10.0.18362

Visual Studio 2022 doesn't support Windows SDK 10.0.16299 - the oldest
it supports is 10.0.18362. The last version of Windows for which the
latest available surface area was 16299 (Windows 10 1709) went out of
support in April 2019. SDK 18362 started with Windows 10 1903 in May
2019 (and 1903 itself went out of support in November 2020), so this is
still a fairly old API version, accommodating some long-out-of-date
versions of Windows. This was the smallest increment that would bring us
to SDK versions supported by the current tooling.
---
 Rx.NET/Source/Directory.build.targets                         | 4 ++--
 .../facades/System.Reactive.Core/System.Reactive.Core.csproj  | 2 +-
 .../System.Reactive.Interfaces.csproj                         | 2 +-
 .../facades/System.Reactive.Linq/System.Reactive.Linq.csproj  | 2 +-
 .../System.Reactive.PlatformServices.csproj                   | 2 +-
 .../System.Reactive.Providers.csproj                          | 2 +-
 .../System.Reactive.Windows.Threading.csproj                  | 2 +-
 .../System.Reactive.WindowsRuntime.csproj                     | 2 +-
 .../Microsoft.Reactive.Testing.csproj                         | 2 +-
 .../System.Reactive.Observable.Aliases.csproj                 | 2 +-
 Rx.NET/Source/src/System.Reactive/System.Reactive.csproj      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets
index 4cb6ebee..268dcf92 100644
--- a/Rx.NET/Source/Directory.build.targets
+++ b/Rx.NET/Source/Directory.build.targets
@@ -9,7 +9,7 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
     <DefineConstants>$(DefineConstants);HAS_WINFORMS;HAS_WPF;HAS_WINRT;HAS_DISPATCHER;HAS_REMOTING;DESKTOPCLR;NO_NULLABLE_ATTRIBUTES</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.18362'">
     <DefineConstants>$(DefineConstants);HAS_WINRT;WINDOWS;HAS_OS_XAML;LEGACY_WINRT;NO_NULLABLE_ATTRIBUTES</DefineConstants>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
   </PropertyGroup>
@@ -20,7 +20,7 @@
     <DefineConstants>$(DefineConstants);HAS_WINRT;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'uap10.0.18362' or '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
 
diff --git a/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj b/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj
index cdc41a17..b6f620e6 100644
--- a/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.Core/System.Reactive.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;uap10.0.18362</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj b/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
index cdc41a17..b6f620e6 100644
--- a/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;uap10.0.18362</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.csproj b/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.csproj
index cdc41a17..b6f620e6 100644
--- a/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.Linq/System.Reactive.Linq.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;uap10.0.18362</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj b/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
index cdc41a17..b6f620e6 100644
--- a/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;uap10.0.18362</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.csproj b/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.csproj
index cdc41a17..b6f620e6 100644
--- a/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.Providers/System.Reactive.Providers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.0;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0;uap10.0.18362</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj b/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
index eadbee95..366145a8 100644
--- a/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>net472;uap10.0.18362</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj b/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj
index b0cba99d..0be1f2b0 100644
--- a/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj
+++ b/Rx.NET/Source/facades/System.Reactive.WindowsRuntime/System.Reactive.WindowsRuntime.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.18362</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj
index 4c22d608..f735fad7 100644
--- a/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj
+++ b/Rx.NET/Source/src/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472;uap10.0.18362;net6.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <Description>Reactive Extensions Testing Library containing interfaces and classes providing functionality to test applications and libraries built using Reactive Extensions.</Description>    
     <AssemblyTitle>Microsoft.Reactive.Testing - Testing Helper Library</AssemblyTitle>    
diff --git a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
index 8a0ff302..e88c1362 100644
--- a/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
+++ b/Rx.NET/Source/src/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472;uap10.0.18362;net6.0</TargetFrameworks>
     <Title>Reactive Extensions - Aliases</Title>    
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>    
     <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
index 6d98592b..7f52ed30 100644
--- a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
+++ b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net472;uap10.0.16299;net6.0;net6.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472;uap10.0.18362;net6.0;net6.0-windows10.0.19041</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
     <Description>Reactive Extensions (Rx) for .NET</Description>