Merge branch 'master' into ni/android-tests

* master:
  Update to latest core (#2679)
  Bring back the win81 tests (#2682)

# Conflicts:
#	wrappers/realm-core

.github/templates/main.yml

@@ -496,7 +496,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
+        os: [ macos-latest, windows-latest, ubuntu-latest, win81 ]
         targetFramework: [ netcoreapp3.1, net5.0, net6.0 ]
     steps:
       - name: Cleanup Workspace
@@ -507,7 +507,7 @@ jobs:
       - uses: #@ actionSetupDotnet
         if: matrix.targetFramework == 'net6.0'
         with:
-          dotnet-version: '6.0.100-preview.7.21379.14'
+          dotnet-version: '6.0.x'
           include-prerelease: true
       - #@ template.replace(dotnetPublishAndRunTests("Tests/Realm.Tests", "${{ matrix.targetFramework }}", "Realm.Tests --result=TestResults.xml --labels=After"))
       - #@ publishTestsResults("TestResults.xml", ".NET (${{ matrix.os }}, ${{ matrix.targetFramework }})")

.github/workflows/main.yml

@@ -593,6 +593,7 @@ jobs:
         - macos-latest
         - windows-latest
         - ubuntu-latest
+        - win81
         targetFramework:
         - netcoreapp3.1
         - net5.0
@@ -623,7 +624,7 @@ jobs:
     - uses: actions/setup-dotnet@v1
       if: matrix.targetFramework == 'net6.0'
       with:
-        dotnet-version: 6.0.100-preview.7.21379.14
+        dotnet-version: 6.0.x
         include-prerelease: true
     - name: Publish Tests/Realm.Tests
       run: dotnet publish Tests/Realm.Tests -c Release -f ${{ matrix.targetFramework }} -r ${{ (runner.os == 'macOS' && 'osx-x64') || (runner.os == 'Windows' && 'win-x64') || (runner.os == 'Linux' && 'linux-x64') || '???' }} -p:AdditionalFrameworks=${{ matrix.targetFramework }} -p:RestoreConfigFile=Tests/Test.NuGet.Config -p:UseRealmNupkgsWithVersion=${{ needs.build-packages.outputs.package_version }} --no-self-contained

wrappers/src/sync_user_cs.cpp

@@ -26,6 +26,8 @@
 #include <realm/object-store/sync/app.hpp>
 #include "app_cs.hpp"
 
+#include <external/json/json.hpp>
+
 using namespace realm;
 using namespace realm::binding;
 using namespace app;
@@ -228,7 +230,7 @@ extern "C" {
     REALM_EXPORT SharedApp* realm_syncuser_get_app(SharedSyncUser& user, NativeException::Marshallable& ex)
     {
         return handle_errors(ex, [&] {
-            // If the user is detached from the sync manager, we'll hit an assert, so this early check avoids that. 
+            // If the user is detached from the sync manager, we'll hit an assert, so this early check avoids that.
             if (user->state() != SyncUser::State::Removed)
             {
                 if (auto shared_app = user->sync_manager()->app().lock()) {